From 8b8113880000d714ffd1148cd6c37fbc48c29605 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 14 Mar 2004 20:14:51 +0000 Subject: [PATCH] *** empty log message *** --- dlls/cstrike/Makefile | 8 ++++---- dlls/cstrike/cstrike.h | 8 ++++---- dlls/fun/Makefile | 8 ++++---- dlls/fun/fun.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/cstrike/Makefile b/dlls/cstrike/Makefile index dafc1cde..7997fb6e 100755 --- a/dlls/cstrike/Makefile +++ b/dlls/cstrike/Makefile @@ -1,4 +1,4 @@ -MODNAME = cstrike_mm +MODNAME = cstrike_amx SRCFILES = cstrike.cpp CstrikePlayer.cpp EXTRA_LIBS_LINUX = @@ -25,7 +25,7 @@ else OS=LINUX endif -CC_LINUX=gcc +CC_LINUX=gcc-2.95 ifeq "$(OS)" "WIN32" CC_WIN32=gcc LD_WINDLL=dllwrap @@ -40,7 +40,7 @@ endif -LIBFILE_LINUX = $(MODNAME)_i386.so +LIBFILE_LINUX = $(MODNAME)_i686.so LIBFILE_WIN32 = $(MODNAME).dll TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX) TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32) @@ -57,7 +57,7 @@ OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o) OBJC_WIN32 := $(CSRCFILES:%.c=$(OBJDIR_WIN32)/%.o) -CCOPT = -march=i586 -O6 -ffast-math -funroll-loops \ +CCOPT = -march=i686 -O2 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ -malign-jumps=2 -malign-functions=2 -s -DNDEBUG -lstdc++ diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike.h index 04c58bd9..0412e12b 100755 --- a/dlls/cstrike/cstrike.h +++ b/dlls/cstrike/cstrike.h @@ -1,5 +1,5 @@ -#define __cswonbuild__ // comment when compiling for STEAM -#define CS_WON_BUILD +//#define __cswonbuild__ // comment when compiling for STEAM +//#define CS_WON_BUILD /* AMX Mod X * Counter-Strike Module @@ -68,9 +68,9 @@ pfnmodule_engine_g* g_engModuleFunc; #define NAME "Counter-Strike" #define AUTHOR "AMX Mod X Dev Team" #if defined __cswonbuild__ -#define VERSION "0.1 WON" // change both these versions +#define VERSION "0.15 WON" // change both these versions #else -#define VERSION "0.1 STEAM" // change both these versions +#define VERSION "0.15 STEAM" // change both these versions #endif // defined __cswonbuild__ #define URL "http://www.amxmodx.org" #define LOGTAG "AMXCS" diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index 4a7050c3..07129167 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -1,4 +1,4 @@ -MODNAME = fun_mm +MODNAME = fun_amx SRCFILES = fun.cpp EXTRA_LIBS_LINUX = @@ -12,7 +12,7 @@ EXTRA_FLAGS = -Dstrcmpi=strcasecmp AMXDIR=../amxmodx SDKTOP=../hlsdk -METADIR=../metamod/metamod +METADIR=../metamodx SDKSRC=$(SDKTOP)/SourceCode @@ -26,7 +26,7 @@ else OS=LINUX endif -CC_LINUX=gcc +CC_LINUX=gcc-2.95 ifeq "$(OS)" "WIN32" CC_WIN32=gcc LD_WINDLL=dllwrap @@ -55,7 +55,7 @@ endif OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o) OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o) -CCOPT = -march=i586 -O6 -ffast-math -funroll-loops \ +CCOPT = -march=i686 -O6 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ -malign-jumps=2 -malign-functions=2 -s -DNDEBUG -lstdc++ diff --git a/dlls/fun/fun.h b/dlls/fun/fun.h index a5c8ad5c..371cb9bb 100755 --- a/dlls/fun/fun.h +++ b/dlls/fun/fun.h @@ -59,7 +59,7 @@ pfnmodule_engine_g* g_engModuleFunc; // These seem to be meta/amxmod related #define NAME "Fun" #define AUTHOR "AMX Mod X Dev Team" -#define VERSION "0.1" +#define VERSION "0.15" #define URL "http://www.amxmodx.org" #define LOGTAG "FUN" #define DATE __DATE__