1.1 --- a/extensions/regex/msvc8/regex.vcproj Tue Apr 01 00:51:21 2008 +0000
1.2 +++ b/extensions/regex/msvc8/regex.vcproj Tue Apr 01 04:22:47 2008 +0000
1.3 @@ -64,7 +64,7 @@
1.4 <Tool
1.5 Name="VCLinkerTool"
1.6 AdditionalDependencies="../lib_win/pcre.lib"
1.7 - OutputFile="$(OutDir)\sample.ext.dll"
1.8 + OutputFile="$(OutDir)\regex.ext.dll"
1.9 LinkIncremental="2"
1.10 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
1.11 GenerateDebugInformation="true"
1.12 @@ -144,7 +144,7 @@
1.13 <Tool
1.14 Name="VCLinkerTool"
1.15 AdditionalDependencies="../lib_win/pcre.lib"
1.16 - OutputFile="$(OutDir)\sample.ext.dll"
1.17 + OutputFile="$(OutDir)\regex.ext.dll"
1.18 LinkIncremental="1"
1.19 IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
1.20 GenerateDebugInformation="true"
2.1 --- a/public/sample_ext/Makefile Tue Apr 01 00:51:21 2008 +0000
2.2 +++ b/public/sample_ext/Makefile Tue Apr 01 04:22:47 2008 +0000
2.3 @@ -14,17 +14,21 @@
2.4
2.5 PROJECT = sample
2.6
2.7 +#Uncomment for Metamod: Source enabled extension
2.8 +#USEMETA = true
2.9 +
2.10 OBJECTS = sdk/smsdk_ext.cpp extension.cpp
2.11
2.12 ##############################################
2.13 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
2.14 ##############################################
2.15
2.16 -C_OPT_FLAGS = -O3 -funroll-loops -s -pipe -fno-strict-aliasing
2.17 -C_DEBUG_FLAGS = -g -ggdb3
2.18 +C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
2.19 +C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
2.20 CPP_GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
2.21 CPP = gcc-4.1
2.22
2.23 +override ENGSET = false
2.24 ifeq "$(ENGINE)" "original"
2.25 HL2SDK = $(HL2SDK_ORIG)
2.26 HL2PUB = $(HL2SDK_ORIG)/public
2.27 @@ -32,6 +36,7 @@
2.28 METAMOD = $(SOURCEMM14)
2.29 INCLUDE += -I$(HL2SDK)/public/dlls
2.30 SRCDS = $(SRCDS_BASE)
2.31 + override ENGSET = true
2.32 endif
2.33 ifeq "$(ENGINE)" "orangebox"
2.34 HL2SDK = $(HL2SDK_OB)
2.35 @@ -41,21 +46,24 @@
2.36 METAMOD = $(SOURCEMM16)
2.37 INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common
2.38 SRCDS = $(SRCDS_BASE)/orangebox
2.39 -endif
2.40 -ifeq "$(ENGINE)" ""
2.41 - echo "You must supply ENGINE=orangebox or ENGINE=original"
2.42 - false
2.43 + override ENGSET = true
2.44 endif
2.45
2.46 -LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so tier0_i486.so
2.47 +ifeq "$(USEMETA)" "true"
2.48 + LINK_HL2 = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so
2.49
2.50 -LINK += $(LINK_HL2) -static-libgcc
2.51 + LINK += $(LINK_HL2)
2.52
2.53 -INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
2.54 - -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm \
2.55 - -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
2.56 + INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
2.57 + -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm \
2.58 + -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions
2.59 +else
2.60 + INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions
2.61 +endif
2.62
2.63 -CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
2.64 +LINK += -static-libgcc
2.65 +
2.66 +CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
2.67 -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -Wno-switch \
2.68 -Wno-unused -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
2.69 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-threadsafe-statics
2.70 @@ -65,13 +73,17 @@
2.71 ################################################
2.72
2.73 ifeq "$(DEBUG)" "true"
2.74 - BIN_DIR = Debug.$(ENGINE)
2.75 + BIN_DIR = Debug
2.76 CFLAGS += $(C_DEBUG_FLAGS)
2.77 else
2.78 - BIN_DIR = Release.$(ENGINE)
2.79 + BIN_DIR = Release
2.80 CFLAGS += $(C_OPT_FLAGS)
2.81 endif
2.82
2.83 +ifeq "$(USEMETA)" "true"
2.84 + BIN_DIR := $(BIN_DIR).$(ENGINE)
2.85 +endif
2.86 +
2.87 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
2.88 ifeq "$(GCC_VERSION)" "4"
2.89 CPPFLAGS += $(CPP_GCC4_FLAGS)
2.90 @@ -84,13 +96,21 @@
2.91 $(BIN_DIR)/%.o: %.cpp
2.92 $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
2.93
2.94 -all:
2.95 +all: check
2.96 mkdir -p $(BIN_DIR)/sdk
2.97 - ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
2.98 - ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
2.99 + if [ "$(USEMETA)" == "true" ]; then \
2.100 + ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so; \
2.101 + ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so; \
2.102 + fi
2.103 $(MAKE) -f Makefile extension
2.104
2.105 -extension: $(OBJ_LINUX)
2.106 +check:
2.107 + if [ "$(USEMETA)" == "true" ] && [ "$(ENGSET)" == "false" ]; then \
2.108 + echo "You must supply ENGINE=orangebox or ENGINE=original"; \
2.109 + exit 1; \
2.110 + fi
2.111 +
2.112 +extension: check $(OBJ_LINUX)
2.113 $(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
2.114
2.115 debug:
2.116 @@ -98,7 +118,7 @@
2.117
2.118 default: all
2.119
2.120 -clean:
2.121 +clean: check
2.122 rm -rf $(BIN_DIR)/*.o
2.123 rm -rf $(BIN_DIR)/sdk/*.o
2.124 rm -rf $(BIN_DIR)/$(BINARY)
