Connector/ODBC 5 commit: r791 - trunk

[jbalint]

Modified:
   trunk/VersionInfo.h
   trunk/defines.pri
Log:
RE-FIXED CONSTANTS THE RIGHT WAY

Modified: trunk/VersionInfo.h
===================================================================
--- trunk/VersionInfo.h	2007-02-09 07:36:40 UTC (rev 790)
+++ trunk/VersionInfo.h	2007-02-09 08:54:43 UTC (rev 791)
@@ -32,6 +32,8 @@
     This is picked up by the Windows rc files and is used in some areas of the 
     source.
 
+    Other constants are also included.
+
     \todo
 
     We should get these from the make files. So config.h for GNU build, defines.pri for 
@@ -43,5 +45,13 @@
 #define MYODBC_PRODUCTVER     5,00,12,0
 #define MYODBC_STRFILEVER     "5, 00, 12, 0\0"
 #define MYODBC_STRPRODUCTVER  "5, 00, 12, 0\0"
+
+#define MYODBC_VENDOR "MySQL"
+#define MYODBC_NAME "MyODBC"
+#ifdef _WIN32
+#   define MYODBC_DRIVER_NAME "MYODBCDriver5.dll"
+#else
+#   define MYODBC_DRIVER_NAME "libMYODBCDriver5.so"
+#endif
 /*@}*/
 

Modified: trunk/defines.pri
===================================================================
--- trunk/defines.pri	2007-02-09 07:36:40 UTC (rev 790)
+++ trunk/defines.pri	2007-02-09 08:54:43 UTC (rev 791)
@@ -16,11 +16,6 @@
 #               with some other vers of Qt. - PAH
 #
 win32 {
-    DEFINES         += MYODBC_VENDOR=\\\"MySQL\\\"
-    DEFINES         += MYODBC_NAME=\\\"MyODBC\\\"
-
-	DEFINES += MYODBC_DRIVER_NAME=\\\"MYODBCDriver5.dll\\\"
-
     # supress deprecated sprintf() warnings
     DEFINES += _CRT_SECURE_NO_DEPRECATE
     # runtime checks
@@ -29,10 +24,6 @@
 }
 
 unix {
-    DEFINES         += MYODBC_VENDOR='\\"MySQL\\"'
-    DEFINES         += MYODBC_NAME='\\"MyODBC\\"'
-
-    DEFINES += MYODBC_DRIVER_NAME='\\"libMYODBCDriver5.so\\"'
     DEFINES += SQL_WCHART_CONVERT
 
     DEFINES += HAVE_LONG_LONG