From 41214cc4618c31c6efb4d525d956db23c1b5c157 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 12 Apr 2006 16:55:09 +0000 Subject: [PATCH] Makefile changes to fix the clean option --- dlls/csx/source/Makefile | 18 +++++++++++------- dlls/dod2/dodfun/Makefile | 18 +++++++++++------- dlls/dod2/dodx/Makefile | 18 +++++++++++------- dlls/engine/Makefile | 18 +++++++++++------- dlls/fakemeta/Makefile | 21 ++++++++++++--------- dlls/fun/Makefile | 18 +++++++++++------- dlls/ns/ns/Makefile | 19 ++++++++++++------- dlls/nvault/Makefile | 23 +++++++++++++---------- dlls/regex/Makefile | 19 ++++++++++++------- dlls/sockets/Makefile | 19 ++++++++++++------- dlls/tfc/tfcx/Makefile | 18 +++++++++++------- dlls/ts/tsfun/Makefile | 18 +++++++++++------- dlls/ts/tsx/Makefile | 18 +++++++++++------- 13 files changed, 149 insertions(+), 96 deletions(-) diff --git a/dlls/csx/source/Makefile b/dlls/csx/source/Makefile index e12fed0b..1f944f6f 100755 --- a/dlls/csx/source/Makefile +++ b/dlls/csx/source/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = csx_amxx +NAME = csx + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp meta_api.cpp rank.cpp usermsg.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/dod2/dodfun/Makefile b/dlls/dod2/dodfun/Makefile index b4aea962..fd5f5b08 100755 --- a/dlls/dod2/dodfun/Makefile +++ b/dlls/dod2/dodfun/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = dodfun_amxx +NAME = dodfun + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp NBase.cpp CMisc.cpp NPD.cpp Utils.cpp usermsg.cpp moduleconfig.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/dod2/dodx/Makefile b/dlls/dod2/dodx/Makefile index 65fb0c67..96985ec4 100755 --- a/dlls/dod2/dodx/Makefile +++ b/dlls/dod2/dodx/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = dodx_amxx +NAME = dodx + +BIN_SUFFIX_32 = 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 LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile index 79f42d25..be1fb2d3 100755 --- a/dlls/engine/Makefile +++ b/dlls/engine/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../metamod/metamod OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = engine_amxx +NAME = engine + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp amxxapi.cpp engine.cpp entity.cpp globals.cpp forwards.cpp messages.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/fakemeta/Makefile b/dlls/fakemeta/Makefile index c533e0e3..578f7e68 100755 --- a/dlls/fakemeta/Makefile +++ b/dlls/fakemeta/Makefile @@ -9,7 +9,10 @@ MM_ROOT = ../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = fakemeta_amxx +NAME = fakemeta + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = sdk/amxxmodule.cpp dllfunc.cpp engfunc.cpp fakemeta_amxx.cpp pdata.cpp forward.cpp \ fm_tr.cpp pev.cpp glb.cpp fm_tr2.cpp @@ -17,7 +20,7 @@ OBJECTS = sdk/amxxmodule.cpp dllfunc.cpp engfunc.cpp fakemeta_amxx.cpp pdata.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -30,10 +33,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -60,10 +63,10 @@ debug: default: all clean: - rm -rf Release/sdk/*.o rm -rf Release/*.o - rm -rf Release/$(BINARY) - rm -rf Debug/sdk/*.o + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) + \ No newline at end of file diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index e9c6d76d..1a665aa3 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../metamod/metamod OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = fun_amxx +NAME = fun + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp fun.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/ns/ns/Makefile b/dlls/ns/ns/Makefile index e49a935a..e285f6f9 100755 --- a/dlls/ns/ns/Makefile +++ b/dlls/ns/ns/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = ns_amxx +NAME = ns + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common -I$(HLSDK)/pm_shared + -I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -60,7 +63,9 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) + \ No newline at end of file diff --git a/dlls/nvault/Makefile b/dlls/nvault/Makefile index f87cf06a..8320430a 100755 --- a/dlls/nvault/Makefile +++ b/dlls/nvault/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = nvault_amxx +NAME = nvault + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp amxxapi.cpp Binary.cpp Journal.cpp NVault.cpp -LINK = +LINK = /lib/libgcc_eh.a /lib/libstdc++.a INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,14 +32,12 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fexceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 - LINK += /lib/libgcc_eh.a /lib/libstdc++.a else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 - LINK += /lib/libgcc_eh.a /lib/libstdc++.a endif OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) @@ -62,7 +63,9 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) + \ No newline at end of file diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile index efe0c9f6..505ab14d 100755 --- a/dlls/regex/Makefile +++ b/dlls/regex/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = regex_amxx +NAME = regex + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp module.cpp CRegEx.cpp LINK = -lpcre INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,11 +32,11 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 INCLUDE += -Llib_linux64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 INCLUDE += -Llib_linux @@ -62,7 +65,9 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) + \ No newline at end of file diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile index 905854ea..79a4675f 100755 --- a/dlls/sockets/Makefile +++ b/dlls/sockets/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../metamod/metamod OPT_FLAGS = -O2 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = sockets_amxx +NAME = sockets + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp sockets.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -60,7 +63,9 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) + \ No newline at end of file diff --git a/dlls/tfc/tfcx/Makefile b/dlls/tfc/tfcx/Makefile index 695d3e4b..856aa97d 100755 --- a/dlls/tfc/tfcx/Makefile +++ b/dlls/tfc/tfcx/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = tfcx_amxx +NAME = tfcx + +BIN_SUFFIX_32 = 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 LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,11 +32,11 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 LINK += -lstdc++ else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -60,7 +63,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile index 474dcac5..8dcaf926 100755 --- a/dlls/ts/tsfun/Makefile +++ b/dlls/ts/tsfun/Makefile @@ -9,14 +9,17 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O3 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = tsfun_amxx +NAME = tsfun + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = amxxmodule.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -29,10 +32,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -59,7 +62,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile index 6271ab05..b149a40f 100755 --- a/dlls/ts/tsx/Makefile +++ b/dlls/ts/tsx/Makefile @@ -9,7 +9,10 @@ MM_ROOT = ../../../metamod/metamod OPT_FLAGS = -O2 -funroll-loops -s -pipe DEBUG_FLAGS = -g -ggdb3 CPP = gcc -NAME = tsx_amxx +NAME = tsx + +BIN_SUFFIX_32 = amxx_i386.so +BIN_SUFFIX_64 = amxx_amd64.so OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.cpp \ Utils.cpp amxxmodule.cpp moduleconfig.cpp \ @@ -18,7 +21,7 @@ OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.cpp \ LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -Lzlib -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common ifeq "$(DEBUG)" "true" BIN_DIR = Debug @@ -31,10 +34,10 @@ endif CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti ifeq "$(AMD64)" "true" - BINARY = $(NAME)_amd64.so + BINARY = $(NAME)_$(BIN_SUFFIX_64) CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 else - BINARY = $(NAME)_i386.so + BINARY = $(NAME)_$(BIN_SUFFIX_32) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif @@ -61,7 +64,8 @@ default: all clean: rm -rf Release/*.o - rm -rf Release/$(BINARY) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) rm -rf Debug/*.o - rm -rf Debug/$(BINARY) - + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) + rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)