Connector/ODBC 5 commit: r704 - in trunk: . Driver/Driver/Library

[jbalint]

Modified:
   trunk/Driver/Driver/Library/MYODBCDriver5.sln
   trunk/defines.pri
   trunk/mysql.pri
Log:
Added conditional flags for debug build.
Added missing vcproj to VS sln.

Modified: trunk/Driver/Driver/Library/MYODBCDriver5.sln
===================================================================
--- trunk/Driver/Driver/Library/MYODBCDriver5.sln	2006-11-30 06:47:10 UTC (rev 703)
+++ trunk/Driver/Driver/Library/MYODBCDriver5.sln	2006-11-30 07:00:35 UTC (rev 704)
@@ -48,6 +48,8 @@
 		{6C864C83-4CA2-3821-BDC9-03BE655919A6} = {6C864C83-4CA2-3821-BDC9-03BE655919A6}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MYODBCDriverTest",
"..\Tests\MYODBCDriverTest.vcproj", "{83D18328-9A23-3CA5-966F-A802BEEC80CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -94,6 +96,10 @@
 		{F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Debug|Win32.Build.0 = Debug|Win32
 		{F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Release|Win32.ActiveCfg = Release|Win32
 		{F97D18ED-8AA1-36C8-A413-72D8CF0424C3}.Release|Win32.Build.0 = Release|Win32
+		{83D18328-9A23-3CA5-966F-A802BEEC80CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83D18328-9A23-3CA5-966F-A802BEEC80CE}.Debug|Win32.Build.0 = Debug|Win32
+		{83D18328-9A23-3CA5-966F-A802BEEC80CE}.Release|Win32.ActiveCfg = Release|Win32
+		{83D18328-9A23-3CA5-966F-A802BEEC80CE}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/defines.pri
===================================================================
--- trunk/defines.pri	2006-11-30 06:47:10 UTC (rev 703)
+++ trunk/defines.pri	2006-11-30 07:00:35 UTC (rev 704)
@@ -15,6 +15,12 @@
 
 win32 {
 	DEFINES += MYODBC_DRIVER_NAME=\"MYODBCDriver5.dll\"
+
+    # supress deprecated sprintf() warnings
+    DEFINES += _CRT_SECURE_NO_DEPRECATE
+    # runtime checks
+    QMAKE_CXXFLAGS_DEBUG += /RTCc /RTC1
+    QMAKE_CFLAGS_DEBUG   += /RTCc /RTC1
 }
 
 unix {

Modified: trunk/mysql.pri
===================================================================
--- trunk/mysql.pri	2006-11-30 06:47:10 UTC (rev 703)
+++ trunk/mysql.pri	2006-11-30 07:00:35 UTC (rev 704)
@@ -23,10 +23,15 @@
 #
 # #########################################################
 win32 {
-        DEFINES         += DBUG_OFF _DBUG_OFF NDEBUG _NDEBUG 
-        INCLUDEPATH     += "$(MYSQL_DIR)\include"
-#        LIBS            += /VERBOSE:LIB
-	LIBS		+= -L"$(MYSQL_DIR)\lib\opt" mysqlclient.lib mysys.lib regex.lib strings.lib
zlib.lib Ws2_32.lib Advapi32.lib
+    DEFINES         += DBUG_OFF _DBUG_OFF NDEBUG _NDEBUG 
+    INCLUDEPATH     += "$(MYSQL_DIR)\include"
+    #LIBS            += /VERBOSE:LIB
+    CONFIG(debug, release|debug) {
+        LIBS        += -L"$(MYSQL_DIR)\lib\debug"
+    } else {
+        LIBS        += -L"$(MYSQL_DIR)\lib\opt"
+    }
+    LIBS            += mysqlclient.lib mysys.lib regex.lib strings.lib zlib.lib
Ws2_32.lib Advapi32.lib
 }
 
 # #########################################################