From 44e078c7c0f2e3bc8408244c8776a163cc095e43 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 15 Apr 2008 23:26:54 +0000 Subject: [PATCH] added support for building 32-bit on 64-bit machines --- dlls/cstrike/cstrike/Makefile | 2 +- dlls/cstrike/csx/Makefile | 2 +- dlls/dod/dodfun/Makefile | 2 +- dlls/dod/dodx/Makefile | 2 +- dlls/engine/Makefile | 2 +- dlls/fun/Makefile | 2 +- dlls/geoip/Makefile | 2 +- dlls/hamsandwich/Makefile | 2 +- dlls/mysqlx/Makefile | 2 +- dlls/ns/Makefile | 2 +- dlls/nvault/Makefile | 2 +- dlls/regex/Makefile | 2 +- dlls/sockets/Makefile | 2 +- dlls/sqlite/Makefile | 4 ++-- dlls/tfcx/Makefile | 2 +- dlls/ts/tsfun/Makefile | 2 +- dlls/ts/tsx/Makefile | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/cstrike/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile index a6ebcad2..e9dfcb9c 100755 --- a/dlls/cstrike/cstrike/Makefile +++ b/dlls/cstrike/cstrike/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/cstrike/csx/Makefile b/dlls/cstrike/csx/Makefile index 8d946e25..34d46412 100755 --- a/dlls/cstrike/csx/Makefile +++ b/dlls/cstrike/csx/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/dod/dodfun/Makefile b/dlls/dod/dodfun/Makefile index 9d09510d..7d031da6 100755 --- a/dlls/dod/dodfun/Makefile +++ b/dlls/dod/dodfun/Makefile @@ -34,7 +34,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/dod/dodx/Makefile b/dlls/dod/dodx/Makefile index 6a4909e4..47654beb 100755 --- a/dlls/dod/dodx/Makefile +++ b/dlls/dod/dodx/Makefile @@ -34,7 +34,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile index 1c6fd681..d432eb1f 100755 --- a/dlls/engine/Makefile +++ b/dlls/engine/Makefile @@ -36,7 +36,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index 532f306c..5133e3bb 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile index 1c1700e7..fa82679e 100755 --- a/dlls/geoip/Makefile +++ b/dlls/geoip/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 # Strip C++ options for compiling *.c files C_CFLAGS := $(shell echo $(CFLAGS) | sed -e 's/-fvisibility-inlines-hidden//' | sed -e 's/-fno-rtti//') diff --git a/dlls/hamsandwich/Makefile b/dlls/hamsandwich/Makefile index eb3406e3..60e7ae6c 100644 --- a/dlls/hamsandwich/Makefile +++ b/dlls/hamsandwich/Makefile @@ -40,7 +40,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror +CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/mysqlx/Makefile b/dlls/mysqlx/Makefile index 6d933969..c56c4b9e 100755 --- a/dlls/mysqlx/Makefile +++ b/dlls/mysqlx/Makefile @@ -41,7 +41,7 @@ else endif CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -Dstricmp=strcasecmp -fno-rtti -static-libgcc -CFLAGS += -DSM_DEFAULT_THREADER +CFLAGS += -DSM_DEFAULT_THREADER -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/ns/Makefile b/dlls/ns/Makefile index c8afed68..087baf98 100755 --- a/dlls/ns/Makefile +++ b/dlls/ns/Makefile @@ -54,7 +54,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/nvault/Makefile b/dlls/nvault/Makefile index 92526f83..7e2c9ce2 100755 --- a/dlls/nvault/Makefile +++ b/dlls/nvault/Makefile @@ -36,7 +36,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -DHAVE_STDINT_H -fno-rtti -static-libgcc -fno-exceptions +CFLAGS += -DNDEBUG -fPIC -Wall -Werror -DHAVE_STDINT_H -fno-rtti -static-libgcc -fno-exceptions -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile index 9618844a..18e0fcda 100755 --- a/dlls/regex/Makefile +++ b/dlls/regex/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile index 65e61685..ac913633 100755 --- a/dlls/sockets/Makefile +++ b/dlls/sockets/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile index 57d14c51..11317643 100755 --- a/dlls/sqlite/Makefile +++ b/dlls/sqlite/Makefile @@ -28,8 +28,8 @@ C_OBJECTS = $(SQL)/alter.c $(SQL)/analyze.c $(SQL)/attach.c $(SQL)/auth.c $(SQL) $(SQL)/update.c $(SQL)/utf.c $(SQL)/util.c $(SQL)/vacuum.c $(SQL)/vdbe.c $(SQL)/vdbeapi.c \ $(SQL)/vdbeaux.c $(SQL)/vdbefifo.c $(SQL)/vdbemem.c $(SQL)/vtab.c $(SQL)/where.c \ -CFLAGS = -Wall -Werror -CPPFLAGS = -Wall -Wno-non-virtual-dtor -Werror +CFLAGS = -Wall -Werror -m32 +CPPFLAGS = -Wall -Wno-non-virtual-dtor -Werror -m32 LINK = -lgcc -static-libgcc -lpthread diff --git a/dlls/tfcx/Makefile b/dlls/tfcx/Makefile index ec951116..9c657f76 100755 --- a/dlls/tfcx/Makefile +++ b/dlls/tfcx/Makefile @@ -34,7 +34,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile index 062eb69a..40a35f73 100755 --- a/dlls/ts/tsfun/Makefile +++ b/dlls/ts/tsfun/Makefile @@ -34,7 +34,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile index 7cf75b3b..1ec2859a 100755 --- a/dlls/ts/tsx/Makefile +++ b/dlls/ts/tsx/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti +CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32