UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builds on linux now

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40870
This commit is contained in:
David Anderson 2007-05-30 04:20:51 +00:00
parent 4aab11577d
commit ce3689c6ce
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/mysql/Makefile
View File

@ -3,18 +3,22 @@
SMSDK = ../.. SMSDK = ../..
SRCDS = ~/srcds SRCDS = ~/srcds
SOURCEMM = ../../../../sourcemm SOURCEMM = ../../../sourcemm
MYSQL = ../../../mysql-5.0
##################################### #####################################
### EDIT BELOW FOR OTHER PROJECTS ### ### EDIT BELOW FOR OTHER PROJECTS ###
##################################### #####################################
PROJECT = sample PROJECT = dbi.mysql
#Uncomment for SourceMM-enabled extensions #Uncomment for SourceMM-enabled extensions
#LINK_HL2 = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so #LINK_HL2 = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so
OBJECTS = sdk/smsdk_ext.cpp extension.cpp OBJECTS = sdk/smsdk_ext.cpp extension.cpp \
mysql/MyBasicResults.cpp mysql/MyDatabase.cpp \
mysql/MyBoundResults.cpp mysql/MyDriver.cpp \
mysql/MyStatement.cpp
############################################## ##############################################
### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
@ -30,13 +34,15 @@ HL2LIB = $(HL2SDK)/linux_sdk
HL2SDK = $(SOURCEMM)/hl2sdk HL2SDK = $(SOURCEMM)/hl2sdk
SMM_TRUNK = $(SOURCEMM)/trunk SMM_TRUNK = $(SOURCEMM)/trunk
LINK = $(LINK_HL2) -static-libgcc LINK = $(LINK_HL2) -L$(MYSQL)/lib -lmysqlclient -lz -static-libgcc
INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine \
-I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \ -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 \
-I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
-I$(MYSQL)/include
CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -Wno-switch-enum
CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
################################################ ################################################
@ -66,6 +72,7 @@ $(BIN_DIR)/%.o: %.cpp
all: all:
mkdir -p $(BIN_DIR)/sdk mkdir -p $(BIN_DIR)/sdk
mkdir -p $(BIN_DIR)/mysql
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
$(MAKE) extension $(MAKE) extension
@ -81,7 +88,10 @@ default: all
clean: clean:
rm -rf Release/*.o rm -rf Release/*.o
rm -rf Release/sdk/*.o rm -rf Release/sdk/*.o
rm -rf Release/mysql/*.o
rm -rf Release/$(BINARY) rm -rf Release/$(BINARY)
rm -rf Debug/*.o rm -rf Debug/*.o
rm -rf Debug/sdk/*.o rm -rf Debug/sdk/*.o
rm -rf Debug/mysql/*.o
rm -rf Debug/$(BINARY) rm -rf Debug/$(BINARY)

6
extensions/mysql/mysql/MyBoundResults.cpp
View File

@ -29,6 +29,10 @@ enum_field_types GetTheirType(DBType type)
{ {
return MYSQL_TYPE_BLOB; return MYSQL_TYPE_BLOB;
} }
case DBType_Unknown:
{
return MYSQL_TYPE_STRING;
}
} }
return MYSQL_TYPE_STRING; return MYSQL_TYPE_STRING;
@ -171,7 +175,7 @@ IResultRow *MyBoundResults::FetchRow()
if (!MoreRows()) if (!MoreRows())
{ {
m_CurRow = m_RowCount + 1; m_CurRow = m_RowCount + 1;
NULL; return NULL;
} }
m_CurRow++; m_CurRow++;

2
extensions/mysql/mysql/MyDriver.cpp
View File

@ -100,7 +100,7 @@ bool CompareField(const char *str1, const char *str2)
return true; return true;
} }
return (strcmp(str1, str2) == NULL); return (strcmp(str1, str2) == 0);
} }
IDatabase *MyDriver::Connect(const DatabaseInfo *info, bool persistent, char *error, size_t maxlength) IDatabase *MyDriver::Connect(const DatabaseInfo *info, bool persistent, char *error, size_t maxlength)

2
extensions/mysql/mysql/MyStatement.h
View File

@ -38,10 +38,10 @@ private:
void *CopyBlob(unsigned int param, const void *blobptr, size_t length); void *CopyBlob(unsigned int param, const void *blobptr, size_t length);
private: private:
MYSQL *m_mysql; MYSQL *m_mysql;
MyDatabase *m_pParent;
MYSQL_STMT *m_stmt; MYSQL_STMT *m_stmt;
MYSQL_BIND *m_bind; MYSQL_BIND *m_bind;
MYSQL_RES *m_pRes; MYSQL_RES *m_pRes;
MyDatabase *m_pParent;
ParamBind *m_pushinfo; ParamBind *m_pushinfo;
unsigned int m_Params; unsigned int m_Params;
MyBoundResults *m_rs; MyBoundResults *m_rs;