1.1 --- a/extensions/bintools/Makefile Sun Dec 28 03:15:15 2008 -0500
1.2 +++ b/extensions/bintools/Makefile Sun Dec 28 03:23:45 2008 -0500
1.3 @@ -27,7 +27,7 @@
1.4 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
1.5 C_GCC4_FLAGS = -fvisibility=hidden
1.6 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
1.7 -CPP = gcc-4.1
1.8 +CPP = gcc
1.9
1.10 override ENGSET = false
1.11 ifeq "$(ENGINE)" "original"
1.12 @@ -75,7 +75,7 @@
1.13 -I$(SMSDK)/public/jit/x86 -I$(SMSDK)/public/sourcepawn
1.14 endif
1.15
1.16 -LINK += -static-libgcc
1.17 +LINK += -m32 -ldl -lm
1.18
1.19 CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
1.20 -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -mfpmath=sse \
1.21 @@ -98,14 +98,21 @@
1.22 BIN_DIR := $(BIN_DIR).$(ENGINE)
1.23 endif
1.24
1.25 +OS := $(shell uname -s)
1.26 +ifeq "$(OS)" "Darwin"
1.27 + LINK += -dynamiclib
1.28 + BINARY = $(PROJECT).ext.dylib
1.29 +else
1.30 + LINK += -static-libgcc -shared
1.31 + BINARY = $(PROJECT).ext.so
1.32 +endif
1.33 +
1.34 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
1.35 ifeq "$(GCC_VERSION)" "4"
1.36 CFLAGS += $(C_GCC4_FLAGS)
1.37 CPPFLAGS += $(CPP_GCC4_FLAGS)
1.38 endif
1.39
1.40 -BINARY = $(PROJECT).ext.so
1.41 -
1.42 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
1.43
1.44 $(BIN_DIR)/%.o: %.cpp
1.45 @@ -126,7 +133,7 @@
1.46 fi
1.47
1.48 extension: check $(OBJ_LINUX)
1.49 - $(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
1.50 + $(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -o $(BIN_DIR)/$(BINARY)
1.51
1.52 debug:
1.53 $(MAKE) -f Makefile all DEBUG=true
1.54 @@ -137,3 +144,4 @@
1.55 rm -rf $(BIN_DIR)/*.o
1.56 rm -rf $(BIN_DIR)/sdk/*.o
1.57 rm -rf $(BIN_DIR)/$(BINARY)
1.58 +
