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

fixed this up for gcc-3.4 and no lstdc++.a

Browse Source
This commit is contained in:
David Anderson 2006-08-28 21:21:06 +00:00
parent 76a4d84dbb
commit cba554d193
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/sqlite/Makefile
View File

@ -8,8 +8,8 @@ MM_ROOT = ../../metamod/metamod
OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing
DEBUG_FLAGS = -g -ggdb3 DEBUG_FLAGS = -g -ggdb3
CPP = gcc-4.1 CPP = gcc-3.4
CC = gcc-4.1 CC = gcc-3.4
NAME = sqlite NAME = sqlite
SQL = sqlite-source SQL = sqlite-source
@ -34,7 +34,7 @@ C_OBJECTS = $(SQL)/attach.c $(SQL)/auth.c $(SQL)/btree.c $(SQL)/build.c \
CFLAGS = -Wall -Werror CFLAGS = -Wall -Werror
CPPFLAGS = -Wall -Wno-non-virtual-dtor -Werror CPPFLAGS = -Wall -Wno-non-virtual-dtor -Werror
LINK = -static-libgcc -lpthread /lib/libgcc_eh.a /lib/libstdc++.a LINK = -lgcc -static-libgcc -lpthread
INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
-I$(MM_ROOT) -I$(HLSDK)/common -I$(SQL) -I./sqlitepp -I./sdk -I./thread -I$(MM_ROOT) -I$(HLSDK)/common -I$(SQL) -I./sqlitepp -I./sdk -I./thread

4
dlls/sqlite/module.cpp
View File

@ -80,3 +80,7 @@ void OnPluginsUnloaded()
FreeAllHandles(Handle_Connection); FreeAllHandles(Handle_Connection);
} }
extern "C" void __cxa_pure_virtual(void)
{
}

2
dlls/sqlite/sqlite-source/pager.c
View File

@ -1552,7 +1552,7 @@ int sqlite3pager_open(
){ ){
Pager *pPager = 0; Pager *pPager = 0;
char *zFullPathname = 0; char *zFullPathname = 0;
int nameLen; /* Compiler is wrong. This is always initialized before use */ int nameLen = 0; /* Compiler is wrong. This is always initialized before use */
OsFile *fd; OsFile *fd;
int rc = SQLITE_OK; int rc = SQLITE_OK;
int i; int i;

4
dlls/sqlite/sqlite-source/select.c
View File

@ -2775,8 +2775,8 @@ int sqlite3Select(
WhereInfo *pWInfo; /* Return from sqlite3WhereBegin() */ WhereInfo *pWInfo; /* Return from sqlite3WhereBegin() */
Vdbe *v; /* The virtual machine under construction */ Vdbe *v; /* The virtual machine under construction */
int isAgg; /* True for select lists like "count(*)" */ int isAgg; /* True for select lists like "count(*)" */
ExprList *pEList; /* List of columns to extract. */ ExprList *pEList=NULL; /* List of columns to extract. */
SrcList *pTabList; /* List of tables to select from */ SrcList *pTabList=NULL; /* List of tables to select from */
Expr *pWhere; /* The WHERE clause. May be NULL */ Expr *pWhere; /* The WHERE clause. May be NULL */
ExprList *pOrderBy; /* The ORDER BY clause. May be NULL */ ExprList *pOrderBy; /* The ORDER BY clause. May be NULL */
ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */ ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */

5
dlls/sqlite/threading.cpp
View File

@ -397,11 +397,6 @@ bool AtomicResult::FieldNameToNum(const char *name, unsigned int *columnId)
} }
} }
if (columnId)
{
*columnId = -1;
}
return false; return false;
} }