From 0cb316c764defcb87150c95b1634e5bd67385b6a Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Mon, 21 Aug 2006 15:32:07 +0000
Subject: [PATCH] Removed amd64 stuff from makefiles for projects that don't
 need it

---
 dlls/dod2/dodfun/Makefile | 23 ++++++-----------------
 dlls/dod2/dodx/Makefile   | 23 ++++++-----------------
 dlls/ns/ns/Makefile       | 23 ++++++-----------------
 dlls/tfc/tfcx/Makefile    | 24 ++++++------------------
 dlls/ts/tsfun/Makefile    | 23 ++++++-----------------
 dlls/ts/tsx/Makefile      | 23 ++++++-----------------
 6 files changed, 36 insertions(+), 103 deletions(-)

diff --git a/dlls/dod2/dodfun/Makefile b/dlls/dod2/dodfun/Makefile
index fd5f5b08..1ea4c66c 100755
--- a/dlls/dod2/dodfun/Makefile
+++ b/dlls/dod2/dodfun/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = dodfun
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 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
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -49,9 +43,6 @@ all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) dodfun
 
-amd64:
-	$(MAKE) all AMD64=true
-
 dodfun: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -62,8 +53,6 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
diff --git a/dlls/dod2/dodx/Makefile b/dlls/dod2/dodx/Makefile
index 96985ec4..b7247b0a 100755
--- a/dlls/dod2/dodx/Makefile
+++ b/dlls/dod2/dodx/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = dodx
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 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
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -49,9 +43,6 @@ all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) dodx
 
-amd64:
-	$(MAKE) all AMD64=true
-
 dodx: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -62,8 +53,6 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
diff --git a/dlls/ns/ns/Makefile b/dlls/ns/ns/Makefile
index e285f6f9..85646a76 100755
--- a/dlls/ns/ns/Makefile
+++ b/dlls/ns/ns/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = ns
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 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
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -50,9 +44,6 @@ all:
 	mkdir -p $(BIN_DIR)/sdk
 	$(MAKE) ns
 
-amd64:
-	$(MAKE) all AMD64=true
-
 ns: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -63,9 +54,7 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
 	
\ No newline at end of file
diff --git a/dlls/tfc/tfcx/Makefile b/dlls/tfc/tfcx/Makefile
index 856aa97d..b1176355 100755
--- a/dlls/tfc/tfcx/Makefile
+++ b/dlls/tfc/tfcx/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = tfcx
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 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
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -50,9 +43,6 @@ all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) tfcx
 
-amd64:
-	$(MAKE) all AMD64=true
-
 tfcx: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -63,8 +53,6 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile
index 8dcaf926..7b96b2d8 100755
--- a/dlls/ts/tsfun/Makefile
+++ b/dlls/ts/tsfun/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = tsfun
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 OBJECTS = amxxmodule.cpp 
 
@@ -31,14 +30,9 @@ endif
 
 CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H  -static-libgcc -fno-rtti
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -49,9 +43,6 @@ all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) tsfun
 
-amd64:
-	$(MAKE) all AMD64=true
-
 tsfun: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -62,8 +53,6 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile
index b149a40f..bef87582 100755
--- a/dlls/ts/tsx/Makefile
+++ b/dlls/ts/tsx/Makefile
@@ -11,8 +11,7 @@ DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = tsx
 
-BIN_SUFFIX_32 = amxx_i386.so
-BIN_SUFFIX_64 = amxx_amd64.so
+BIN_SUFFIX = amxx_i386.so
 
 OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.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
 
-ifeq "$(AMD64)" "true"
-	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
-	OPT_FLAGS += -march=i586
-endif
+BINARY = $(NAME)_$(BIN_SUFFIX)
+CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+OPT_FLAGS += -march=i586
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
@@ -51,9 +45,6 @@ all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) tsx
 
-amd64:
-	$(MAKE) all AMD64=true
-
 tsx: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
@@ -64,8 +55,6 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)