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

import of linux sqlite build

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401212
This commit is contained in:
David Anderson 2007-07-29 01:29:27 +00:00
parent 92e7e70ea3
commit efad023796
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/sqlite/Makefile
View File

@ -9,12 +9,30 @@ SOURCEMM = ../../../../sourcemm
### EDIT BELOW FOR OTHER PROJECTS ###
#####################################
PROJECT = sample
PROJECT = dbi.sqlite
#Uncomment for SourceMM-enabled extensions
#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 sm_memtable.cpp \
driver/SqDatabase.cpp driver/SqDriver.cpp driver/SqQuery.cpp \
driver/SqResults.cpp
OBJECTS += sqlite-source/alter.c sqlite-source/analyze.c \
sqlite-source/attach.c sqlite-source/auth.c sqlite-source/btree.c \
sqlite-source/build.c sqlite-source/callback.c sqlite-source/complete.c \
sqlite-source/date.c sqlite-source/delete.c sqlite-source/expr.c \
sqlite-source/func.c sqlite-source/hash.c sqlite-source/insert.c \
sqlite-source/legacy.c sqlite-source/main.c sqlite-source/malloc.c \
sqlite-source/opcodes.c sqlite-source/os.c sqlite-source/os_unix.c \
sqlite-source/pager.c sqlite-source/parse.c sqlite-source/pragma.c \
sqlite-source/prepare.c sqlite-source/printf.c sqlite-source/random.c \
sqlite-source/select.c sqlite-source/table.c sqlite-source/tokenize.c \
sqlite-source/trigger.c sqlite-source/update.c sqlite-source/utf.c \
sqlite-source/util.c sqlite-source/vacuum.c sqlite-source/vdbe.c \
sqlite-source/vdbeapi.c sqlite-source/vdbeaux.c sqlite-source/vdbeblob.c \
sqlite-source/vdbefifo.c sqlite-source/vdbemem.c sqlite-source/vtab.c \
sqlite-source/where.c
##############################################
### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
@ -30,13 +48,13 @@ HL2LIB = $(HL2SDK)/linux_sdk
HL2SDK = $(SOURCEMM)/hl2sdk
SMM_TRUNK = $(SOURCEMM)/trunk
LINK = $(LINK_HL2) -static-libgcc
LINK = $(LINK_HL2) -static-libgcc -lpthread
INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -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 \
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 -Wno-uninitialized -DTHREADSAFE -DSQLITE_OMIT_LOAD_EXTENSION
CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
################################################
@ -60,12 +78,18 @@ endif
BINARY = $(PROJECT).ext.so
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
$(BIN_DIR)/%.o: %.cpp
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
$(BIN_DIR)/%.o: %.c
$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
all:
mkdir -p $(BIN_DIR)/sdk
mkdir -p $(BIN_DIR)/driver
mkdir -p $(BIN_DIR)/sqlite-source
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
$(MAKE) extension
@ -81,7 +105,11 @@ default: all
clean:
rm -rf Release/*.o
rm -rf Release/sdk/*.o
rm -rf Release/sqlite-source/*.o
rm -rf Release/driver/*.o
rm -rf Release/$(BINARY)
rm -rf Debug/*.o
rm -rf Debug/sdk/*.o
rm -rf Debug/sqlite-source/*.o
rm -rf Debug/driver/*.o
rm -rf Debug/$(BINARY)

2
extensions/sqlite/driver/SqResults.cpp
View File

@ -275,7 +275,7 @@ DBResult SqResults::CopyString(unsigned int columnId, char *buffer, size_t maxle
field->type = SQLITE_TEXT;
res = DBVal_Null;
}
size_t wr;
size_t wr = 0;
if (field->type == SQLITE_TEXT)
{
wr = strncopy(buffer, ptr, maxlength);

4
extensions/sqlite/driver/SqResults.h
View File

@ -80,10 +80,10 @@ private:
sqlite3_stmt *m_pStmt; /** DOES NOT CHANGE */
String *m_ColNames; /** DOES NOT CHANGE */
unsigned int m_ColCount; /** DOES NOT CHANGE */
BaseStringTable m_Strings; /** DOES NOT CHANGE */
BaseMemTable *m_pMemory; /** DOES NOT CHANGE */
unsigned int m_RowCount;
unsigned int m_MaxRows;
BaseMemTable *m_pMemory; /** DOES NOT CHANGE */
BaseStringTable m_Strings; /** DOES NOT CHANGE */
SqField *m_Rows;
unsigned int m_CurRow;
unsigned int m_NextRow;