Removed amd64 stuff from makefiles for projects that don't need it

This commit is contained in:
Scott Ehlert 2006-08-21 15:32:07 +00:00
parent 74d3d23f13
commit 0cb316c764
6 changed files with 36 additions and 103 deletions

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = dodfun NAME = dodfun
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = amxxmodule.cpp NBase.cpp CMisc.cpp NPD.cpp Utils.cpp usermsg.cpp moduleconfig.cpp OBJECTS = amxxmodule.cpp NBase.cpp CMisc.cpp NPD.cpp Utils.cpp usermsg.cpp moduleconfig.cpp
@ -31,14 +30,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -49,9 +43,6 @@ all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) dodfun $(MAKE) dodfun
amd64:
$(MAKE) all AMD64=true
dodfun: $(OBJ_LINUX) dodfun: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -62,8 +53,6 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = dodx NAME = dodx
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp
@ -31,14 +30,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -49,9 +43,6 @@ all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) dodx $(MAKE) dodx
amd64:
$(MAKE) all AMD64=true
dodx: $(OBJ_LINUX) dodx: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -62,8 +53,6 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = ns NAME = ns
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp OBJECTS = amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp
@ -31,14 +30,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -50,9 +44,6 @@ all:
mkdir -p $(BIN_DIR)/sdk mkdir -p $(BIN_DIR)/sdk
$(MAKE) ns $(MAKE) ns
amd64:
$(MAKE) all AMD64=true
ns: $(OBJ_LINUX) ns: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -63,9 +54,7 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = tfcx NAME = tfcx
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp
@ -31,15 +30,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
LINK += -lstdc++
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -50,9 +43,6 @@ all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) tfcx $(MAKE) tfcx
amd64:
$(MAKE) all AMD64=true
tfcx: $(OBJ_LINUX) tfcx: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -63,8 +53,6 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = tsfun NAME = tsfun
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = amxxmodule.cpp OBJECTS = amxxmodule.cpp
@ -31,14 +30,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -49,9 +43,6 @@ all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) tsfun $(MAKE) tsfun
amd64:
$(MAKE) all AMD64=true
tsfun: $(OBJ_LINUX) tsfun: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -62,8 +53,6 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)

View File

@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
CPP = gcc CPP = gcc
NAME = tsx NAME = tsx
BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.cpp \ OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.cpp \
Utils.cpp amxxmodule.cpp moduleconfig.cpp \ Utils.cpp amxxmodule.cpp moduleconfig.cpp \
@ -33,14 +32,9 @@ endif
CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti
ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX)
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586 OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@ -51,9 +45,6 @@ all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) tsx $(MAKE) tsx
amd64:
$(MAKE) all AMD64=true
tsx: $(OBJ_LINUX) tsx: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@ -64,8 +55,6 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)