new makefile

This commit is contained in:
David Anderson 2004-08-22 12:41:00 +00:00
parent d966983354
commit ae01b71078
4 changed files with 8 additions and 6 deletions

View File

@ -26,7 +26,7 @@ else
OS=LINUX OS=LINUX
endif endif
CC_LINUX=gcc-2.95 CC_LINUX=gcc
ifeq "$(OS)" "WIN32" ifeq "$(OS)" "WIN32"
CC_WIN32=gcc CC_WIN32=gcc
LD_WINDLL=dllwrap LD_WINDLL=dllwrap
@ -41,7 +41,7 @@ endif
LIBFILE_LINUX = $(MODNAME)_i386.so LIBFILE_LINUX = $(MODNAME)_amd64.so
LIBFILE_WIN32 = $(MODNAME).dll LIBFILE_WIN32 = $(MODNAME).dll
TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX) TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX)
TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32) TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32)
@ -55,7 +55,7 @@ endif
OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o) OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o)
OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o) OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
CCOPT = -march=i386 -O2 -ffast-math -funroll-loops \ CCOPT = -m64 -O2 -ffast-math -funroll-loops \
-s -DNDEBUG -s -DNDEBUG
INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(AMXDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS) INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(AMXDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS)

View File

@ -72,7 +72,7 @@ if ($OPTIONS{"debug"})
if ($OPTIONS{"amd64"}) if ($OPTIONS{"amd64"})
{ {
$cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags"; $cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags";
} }
if ($OPTIONS{"debug"}) if ($OPTIONS{"debug"})

View File

@ -192,6 +192,7 @@ static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params) // native give_ite
// Check index. // Check index.
if (params[1] < 1 || params[1] > gpGlobals->maxClients) if (params[1] < 1 || params[1] > gpGlobals->maxClients)
{ {
MF_Log("Failed at first check. Param: %d", params[1]);
MF_RaiseAmxError(amx, AMX_ERR_NATIVE); MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
return 0; return 0;
} }
@ -201,6 +202,7 @@ static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params) // native give_ite
// Check entity validity // Check entity validity
if (FNullEnt(pPlayer)) { if (FNullEnt(pPlayer)) {
MF_Log("Failed at second check. Param: %p", pPlayer);
MF_RaiseAmxError(amx, AMX_ERR_NATIVE); MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
return 0; return 0;
} }
@ -912,4 +914,4 @@ void ClientConnectFakeBot(int index)
//MF_Log("A bot connects, forwarded to fun! The bot is %d!", index); //MF_Log("A bot connects, forwarded to fun! The bot is %d!", index);
//CPlayer* player; //CPlayer* player;
} }
*/ */

View File

@ -30,7 +30,7 @@
* you do not wish to do so, delete this exception statement from your * you do not wish to do so, delete this exception statement from your
* version. * version.
*/ */
#define SMALL_CELL_SIZE 64
#include "amxxmodule.h" #include "amxxmodule.h"
// Fun-specific defines below // Fun-specific defines below