From 32d2d4107da5d9dea480bf89be12d5ae10882e7c Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 18 Feb 2009 02:58:03 -0600 Subject: [PATCH] Fixed Linux build. --- core/Makefile | 2 +- extensions/bintools/Makefile | 3 +-- extensions/clientprefs/Makefile | 3 +-- extensions/cstrike/Makefile | 3 +-- extensions/curl/Makefile | 4 ++-- extensions/geoip/Makefile | 3 +-- extensions/mysql/Makefile | 3 +-- extensions/regex/Makefile | 2 +- extensions/sdktools/Makefile | 3 +-- extensions/sqlite/Makefile | 2 +- extensions/structs/Makefile | 4 ++-- extensions/tf2/Makefile | 3 +-- extensions/topmenus/Makefile | 2 +- extensions/updater/Makefile | 2 +- public/mms_sample_ext/Makefile | 2 +- public/sample_ext/Makefile | 2 +- 16 files changed, 18 insertions(+), 25 deletions(-) diff --git a/core/Makefile b/core/Makefile index eb4396271..8b865555e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -82,7 +82,7 @@ ifeq "$(ENGINE)" "left4dead" override ENGSET = true endif -CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 +CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \ tier0_i486.so -lpthread -static-libgcc diff --git a/extensions/bintools/Makefile b/extensions/bintools/Makefile index 04799a023..00c69967b 100644 --- a/extensions/bintools/Makefile +++ b/extensions/bintools/Makefile @@ -71,8 +71,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn \ -I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit -I$(SMSDK)/public/jit/x86 - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit \ -I$(SMSDK)/public/jit/x86 -I$(SMSDK)/public/sourcepawn diff --git a/extensions/clientprefs/Makefile b/extensions/clientprefs/Makefile index 623a665a7..5a3283092 100644 --- a/extensions/clientprefs/Makefile +++ b/extensions/clientprefs/Makefile @@ -68,8 +68,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -I$(MMSOURCE17)/core/sourcehook diff --git a/extensions/cstrike/Makefile b/extensions/cstrike/Makefile index 946283343..ca885f1d0 100644 --- a/extensions/cstrike/Makefile +++ b/extensions/cstrike/Makefile @@ -69,8 +69,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \ -I$(SMSDK)/public/sourcepawn - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/curl/Makefile b/extensions/curl/Makefile index 2579a8f71..fea9f3a1e 100644 --- a/extensions/curl/Makefile +++ b/extensions/curl/Makefile @@ -70,8 +70,8 @@ ifeq "$(USEMETA)" "true" LINK += $(LINK_HL2) INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ - -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/geoip/Makefile b/extensions/geoip/Makefile index c37579ebe..fcb25a560 100644 --- a/extensions/geoip/Makefile +++ b/extensions/geoip/Makefile @@ -68,8 +68,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/mysql/Makefile b/extensions/mysql/Makefile index 505fedfed..a1ee185a1 100644 --- a/extensions/mysql/Makefile +++ b/extensions/mysql/Makefile @@ -75,8 +75,7 @@ ifeq "$(USEMETA)" "true" else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook \ -I$(MYSQL)/include - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 endif LINK += $(MYSQL)/lib/libmysqlclient_r.a -lz -lpthread diff --git a/extensions/regex/Makefile b/extensions/regex/Makefile index 651ee39b5..7f7aaa963 100644 --- a/extensions/regex/Makefile +++ b/extensions/regex/Makefile @@ -68,7 +68,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook endif diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile index a57a76d82..1040f1980 100644 --- a/extensions/sdktools/Makefile +++ b/extensions/sdktools/Makefile @@ -72,8 +72,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/tier0 \ -I$(HL2PUB)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \ -I$(SMSDK)/public/sourcepawn - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile index c78ecf471..c45c46330 100644 --- a/extensions/sqlite/Makefile +++ b/extensions/sqlite/Makefile @@ -88,7 +88,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook endif diff --git a/extensions/structs/Makefile b/extensions/structs/Makefile index 3e0a30e3e..e6f0c0395 100644 --- a/extensions/structs/Makefile +++ b/extensions/structs/Makefile @@ -67,8 +67,8 @@ ifeq "$(USEMETA)" "true" LINK += $(LINK_HL2) INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/tier0 \ - -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm -I$(SMSDK)/public \ - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm -I$(SMSDK)/public + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/tf2/Makefile b/extensions/tf2/Makefile index 190aa2577..30260c568 100644 --- a/extensions/tf2/Makefile +++ b/extensions/tf2/Makefile @@ -70,8 +70,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \ -I$(SMSDK)/public/sourcepawn - - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif diff --git a/extensions/topmenus/Makefile b/extensions/topmenus/Makefile index 3240d518f..bbad58277 100644 --- a/extensions/topmenus/Makefile +++ b/extensions/topmenus/Makefile @@ -69,7 +69,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -I$(MMSOURCE17)/core/sourcehook diff --git a/extensions/updater/Makefile b/extensions/updater/Makefile index c4adab46a..008608b75 100644 --- a/extensions/updater/Makefile +++ b/extensions/updater/Makefile @@ -73,7 +73,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn \ -I$(SMSDK)/public/extensions diff --git a/public/mms_sample_ext/Makefile b/public/mms_sample_ext/Makefile index aa546120a..b5b103047 100644 --- a/public/mms_sample_ext/Makefile +++ b/public/mms_sample_ext/Makefile @@ -58,7 +58,7 @@ ifeq "$(ENGINE)" "left4dead" override ENGSET = true endif -CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 +CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 LINK = vstdlib_i486.so tier0_i486.so -m32 -ldl -lm diff --git a/public/sample_ext/Makefile b/public/sample_ext/Makefile index 78174cc85..7eff0a270 100644 --- a/public/sample_ext/Makefile +++ b/public/sample_ext/Makefile @@ -68,7 +68,7 @@ ifeq "$(USEMETA)" "true" INCLUDE += -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn - CFLAGS += -DSE_EPISODEONE=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 + CFLAGS += -DSE_EPISODEONE=1 -D_SE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4 else INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn endif