Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed building with newly updated SDK.

Browse Source 
Former-commit-id: bf0455aea7c54493b2b921a2fef52120163e0959
This commit is contained in:
Scott Ehlert
2013-09-05 19:51:52 -05:00
parent 2a458530b7
commit 568bec17fc
60 changed files with 243 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mysqlx/Makefile
View File

@ -5,7 +5,7 @@
### EDIT THESE PATHS FOR YOUR OWN SETUP ###
###########################################
HLSDK = ../../../hlsdk/multiplayer
HLSDK = ../../../hlsdk
MM_ROOT = ../../../metamod/metamod
MYSQL_DIR = ../../../mysql-5.0
@ -33,7 +33,7 @@ CPP_OSX = clang
LINK = $(MYSQL_DIR)/lib/libmysqlclient_r.a -lz -lpthread -L$(MYSQL_DIR)/lib
INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \
-I$(MM_ROOT) -I$(MYSQL_DIR)/include -Ithread -Imysql -Isdk
-I$(HLSDK)/public -I$(MM_ROOT) -I$(MYSQL_DIR)/include -Ithread -Imysql -Isdk
################################################
### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###

4
dlls/mysqlx/msvc10/mysqlx.vcxproj
View File

@ -52,7 +52,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(MYSQL5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -75,7 +75,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\multiplayer\common;$(HLSDK)\multiplayer\engine;$(HLSDK)\multiplayer\dlls;$(MYSQL5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>

16
dlls/mysqlx/sdk/amxxmodule.h
View File

@ -1010,7 +1010,7 @@ void FN_ParticleEffect(const float *org, const float *dir, float color, float co
#endif // FN_ParticleEffect
#ifdef FN_LightStyle
void FN_LightStyle(int style, char *val);
void FN_LightStyle(int style, const char *val);
#endif // FN_LightStyle
#ifdef FN_DecalIndex
@ -1218,7 +1218,7 @@ void FN_CrosshairAngle(const edict_t *pClient, float pitch, float yaw);
#endif // FN_CrosshairAngle
#ifdef FN_LoadFileForMe
byte *FN_LoadFileForMe(char *filename, int *pLength);
byte *FN_LoadFileForMe(const char *filename, int *pLength);
#endif // FN_LoadFileForMe
#ifdef FN_FreeFile
@ -1354,7 +1354,7 @@ void FN_DeltaUnsetField(struct delta_s *pFields, const char *fieldname);
#endif // FN_DeltaUnsetField
#ifdef FN_DeltaAddEncoder
void FN_DeltaAddEncoder(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
void FN_DeltaAddEncoder(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
#endif // FN_DeltaAddEncoder
#ifdef FN_GetCurrentPlayer
@ -1386,7 +1386,7 @@ int FN_engCreateInstancedBaseline(int classname, struct entity_state_s *baseline
#endif // FN_engCreateInstancedBaseline
#ifdef FN_Cvar_DirectSet
void FN_Cvar_DirectSet(struct cvar_s *var, char *value);
void FN_Cvar_DirectSet(struct cvar_s *var, const char *value);
#endif // FN_Cvar_DirectSet
#ifdef FN_ForceUnmodified
@ -1591,7 +1591,7 @@ void FN_ParticleEffect_Post(const float *org, const float *dir, float color, flo
#endif // FN_ParticleEffect_Post
#ifdef FN_LightStyle_Post
void FN_LightStyle_Post(int style, char *val);
void FN_LightStyle_Post(int style, const char *val);
#endif // FN_LightStyle_Post
#ifdef FN_DecalIndex_Post
@ -1799,7 +1799,7 @@ void FN_CrosshairAngle_Post(const edict_t *pClient, float pitch, float yaw);
#endif // FN_CrosshairAngle_Post
#ifdef FN_LoadFileForMe_Post
byte *FN_LoadFileForMe_Post(char *filename, int *pLength);
byte *FN_LoadFileForMe_Post(const char *filename, int *pLength);
#endif // FN_LoadFileForMe_Post
#ifdef FN_FreeFile_Post
@ -1935,7 +1935,7 @@ void FN_DeltaUnsetField_Post(struct delta_s *pFields, const char *fieldname);
#endif // FN_DeltaUnsetField_Post
#ifdef FN_DeltaAddEncoder_Post
void FN_DeltaAddEncoder_Post(char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
void FN_DeltaAddEncoder_Post(const char *name, void (*conditionalencode)( struct delta_s *pFields, const unsigned char *from, const unsigned char *to ) );
#endif // FN_DeltaAddEncoder_Post
#ifdef FN_GetCurrentPlayer_Post
@ -1967,7 +1967,7 @@ int FN_engCreateInstancedBaseline_Post(int classname, struct entity_state_s *bas
#endif // FN_engCreateInstancedBaseline_Post
#ifdef FN_Cvar_DirectSet_Post
void FN_Cvar_DirectSet_Post(struct cvar_s *var, char *value);
void FN_Cvar_DirectSet_Post(struct cvar_s *var, const char *value);
#endif // FN_Cvar_DirectSet_Post
#ifdef FN_ForceUnmodified_Post