[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/kexidb/drivers/mySQL
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2006-01-20 14:23:59
Message-ID: 1137767039.644575.14782.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 500536 by staniek:

update: libmysql 5.0 is used on win32



 M  +8 -2      mySQL.pro  
 M  +2 -1      mysqlconnection_p.h  


--- trunk/koffice/kexi/kexidb/drivers/mySQL/mySQL.pro #500535:500536
@@ -2,9 +2,15 @@
 
 INCLUDEPATH += $(MYSQL_INC) $(MYSQL_INC)/mysql
 
-win32:LIBS += $(MYSQL_LIB)/mysqlclient.lib
+contains(CONFIG,debug) {
+	win32:LIBS += $(MYSQL_LIB)/debug/libmysql.lib
+	win32:QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMTD.LIB
+}
+!contains(CONFIG,debug) {
+	win32:LIBS += $(MYSQL_LIB)/opt/mysqlclient.lib
+}
 
-TARGET		= kexidb_mysqldriver$$KDELIBDEBUG
+TARGET = kexidb_mysqldriver$$KDELIBDEBUG
 
 system( bash kmoc )
 
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h #500535:500536
@@ -23,12 +23,13 @@
 #include <kexidb/connection_p.h>
 
 #ifdef Q_WS_WIN
-#include <mysql/config-win.h>
+#include <my_global.h>
 #endif
 #include <mysql_version.h>
 #include <mysql.h>
 
 typedef struct st_mysql MYSQL;
+#undef bool
 
 class QCString;
 class QString;
[prev in list] [next in list] [prev in thread] [next in thread]