Fixed this up to work, eh. no more libstdc++.a for you

This commit is contained in:
David Anderson 2006-08-28 21:03:27 +00:00
parent ec83efbdf3
commit 76a4d84dbb
3 changed files with 6 additions and 7 deletions

View File

@ -8,7 +8,7 @@ MM_ROOT = ../../metamod/metamod
OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing OPT_FLAGS = -O2 -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
NAME = mysql NAME = mysql
#MYSQL_DIR = ../../../mysql-5.0.22 #MYSQL_DIR = ../../../mysql-5.0.22
MYSQL_DIR = ../../../mysql-5.0 MYSQL_DIR = ../../../mysql-5.0
@ -20,7 +20,7 @@ OBJECTS = basic_sql.cpp handles.cpp module.cpp threading.cpp sdk/amxxmodule.cpp
OBJECTS += thread/BaseWorker.cpp thread/ThreadWorker.cpp thread/PosixThreads.cpp OBJECTS += thread/BaseWorker.cpp thread/ThreadWorker.cpp thread/PosixThreads.cpp
OBJECTS += mysql/MysqlQuery.cpp mysql/MysqlResultSet.cpp mysql/MysqlDatabase.cpp mysql/MysqlDriver.cpp OBJECTS += mysql/MysqlQuery.cpp mysql/MysqlResultSet.cpp mysql/MysqlDatabase.cpp mysql/MysqlDriver.cpp
LINK = -static-libgcc -lmysqlclient_r -lz -lpthread /lib/libgcc_eh.a /lib/libstdc++.a LINK = -lgcc -static-libgcc -lmysqlclient_r -lz -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$(MYSQL_DIR)/include -L$(MYSQL_DIR)/lib -Ithread \ -I$(MM_ROOT) -I$(HLSDK)/common -I$(MYSQL_DIR)/include -L$(MYSQL_DIR)/lib -Ithread \

View File

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

View File

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