Connector/ODBC 5 commit: r762 - in branches/feature-linux-port: . Driver/Driver/Library Driver/Setup/Library

[jbalint]

Modified:
   branches/feature-linux-port/Driver/Driver/Library/Library.pro
   branches/feature-linux-port/Driver/Driver/Library/MYODBCDriverExports.def
   branches/feature-linux-port/Driver/Setup/Library/Library.pro
   branches/feature-linux-port/odbc.pri
Log:
separate odbc and odbcinst, primarily for linux
removed unused export in windows lib exports

Modified: branches/feature-linux-port/Driver/Driver/Library/Library.pro
===================================================================
--- branches/feature-linux-port/Driver/Driver/Library/Library.pro	2007-01-09 20:30:08 UTC
(rev 761)
+++ branches/feature-linux-port/Driver/Driver/Library/Library.pro	2007-01-10 17:40:29 UTC
(rev 762)
@@ -22,6 +22,7 @@
 
 include( ../../../odbc.pri )
 include( ../../../mysql.pri )
+LIBS        += $$ODBCINST
 
 # #########################################################
 # WIN32

Modified: branches/feature-linux-port/Driver/Driver/Library/MYODBCDriverExports.def
===================================================================
--- branches/feature-linux-port/Driver/Driver/Library/MYODBCDriverExports.def	2007-01-09
20:30:08 UTC (rev 761)
+++ branches/feature-linux-port/Driver/Driver/Library/MYODBCDriverExports.def	2007-01-10
17:40:29 UTC (rev 762)
@@ -32,7 +32,7 @@
 SQLEndTran
 SQLExecDirectW
 SQLExecute
-SQLExtendedFetch
+;SQLExtendedFetch
 SQLFetch
 SQLFetchScroll
 SQLForeignKeysW

Modified: branches/feature-linux-port/Driver/Setup/Library/Library.pro
===================================================================
--- branches/feature-linux-port/Driver/Setup/Library/Library.pro	2007-01-09 20:30:08 UTC
(rev 761)
+++ branches/feature-linux-port/Driver/Setup/Library/Library.pro	2007-01-10 17:40:29 UTC
(rev 762)
@@ -20,6 +20,7 @@
 
 include( ../../../odbc.pri )
 
+LIBS        += $$ODBCINST
 
 # #########################################################
 # WIN 

Modified: branches/feature-linux-port/odbc.pri
===================================================================
--- branches/feature-linux-port/odbc.pri	2007-01-09 20:30:08 UTC (rev 761)
+++ branches/feature-linux-port/odbc.pri	2007-01-10 17:40:29 UTC (rev 762)
@@ -19,7 +19,8 @@
 # WIN32
 # #########################################################
 win32 {
-    ODBCLIBS += odbc32.lib odbccp32.lib
+    ODBCLIBS = odbc32.lib odbccp32.lib
+    ODBCINST = $$ODBCLIBS
 }
 
 # #########################################################
@@ -28,14 +29,18 @@
 mac {
 } else:unix {
     INCLUDEPATH += $(ODBC_DIR)/include
-    ODBCLIBS        += -L$(ODBC_DIR)/lib -liodbc -liodbcinst
-    #ODBCLIBS        += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
+    ODBCLIBS = -L$(ODBC_DIR)/lib -liodbc -liodbcinst
+    ODBCINST = -L$(ODBC_DIR)/lib -liodbcinst
+
+    #ODBCLIBS += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
+    #ODBCINST = -L$(ODBC_DIR)/lib -lodbcinst
 }
 
 # #########################################################
 # OSX
 # #########################################################
 mac {
-    ODBCLIBS += -liodbc -liodbcinst
+    ODBCLIBS = -liodbc -liodbcinst
+    ODBCINST = -liodbcinst
 }