Connector/ODBC 5 commit: r202 - / MYSQLPlus/MYSQLPlusTest

[pharvey]

Modified:
   Build.bat
   MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
Log:


Modified: Build.bat
===================================================================
--- Build.bat	2006-05-08 05:13:15 UTC (rev 201)
+++ Build.bat	2006-05-08 15:45:26 UTC (rev 202)
@@ -24,6 +24,7 @@
     del /Q lib\MYSQL*
 )
 IF EXIST bin ( 
+    del /Q bin\dltest*
     del /Q bin\MYODBC*
     del /Q bin\MYSQL*
 )

Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro	2006-05-08 05:13:15 UTC (rev 201)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro	2006-05-08 15:45:26 UTC (rev 202)
@@ -28,19 +28,23 @@
 # - wsprintfA, MessageBoxA
         LIBS += user32.lib
 
-#        LIBS += /MANIFEST
+        LIBS += /MANIFEST
 
 # The default link for mysql client is /MT but for Qt it is /MD. This may cause conflicts
during
 # link-time (multiply defined symbols). One can use /NODEFAULTLIB to give one way
precedence over
 # other or one may edit the Qt qmake spec file to change /MD to /MT.
 
 # Uncomment following line when you want /MT (static run-time which is
LIBCMT.lib/LIBCPMT.lib based) to have precedence.
-#        LIBS += /VERBOSE:LIB /NODEFAULTLIB:libc.lib /NODEFAULTLIB:msvcrt.lib
/NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+#        LIBS += /VERBOSE:LIB 
+#        LIBS += /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcd.lib 
+#        LIBS += /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib
+#        LIBS += /NODEFAULTLIB:libcmtd.lib
+#        LIBS += libcmt.lib
 
 # Uncomment following line when you want /MD (dynamic run-time which is
MSVCRT.lib/MSVCPRT.lib based (which maps to MSVCR80.DLL/MSVCPR80.DLL)) to have
precedence.
 #        LIBS += /VERBOSE:LIB
 #        LIBS += /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcd.lib
-#        LIBS += /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcmtd.lib
/NODEFAULTLIB:msvcrtd.lib
+#        LIBS += /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcmtd.lib
 #        LIBS += /NODEFAULTLIB:msvcrtd.lib
 
 # Or simply remove all default libraries and append only those libs which are desired.