Modified:
connector-odbc3.vpw
dltest/dltest.vpj
myodbc3/execute.c
myodbc3c/myodbc3c.vpj
myodbc3i/myodbc3i.vpj
myodbc3m/myodbc3m.vpj
myodbc3u/myodbc3u.vpj
mysql.pri
root.pro
Log:
minor changes to get build to complete ok
Modified: connector-odbc3.vpw
===================================================================
--- connector-odbc3.vpw 2006-07-19 19:32:45 UTC (rev 54)
+++ connector-odbc3.vpw 2006-07-19 21:45:56 UTC (rev 55)
@@ -1,28 +1,28 @@
<!DOCTYPE Workspace SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpw.dtd">
<Workspace Version="10.0" VendorName="SlickEdit">
<Projects>
- <Project File="connector-odbc3.vpj" />
- <Project File="dltest/dltest.vpj" />
- <Project File="../connector-odbc/trunk/examples/CPP/7/ADO/exampleADO.vpj" />
- <Project File="myodbc3/myodbc3.vpj" />
- <Project File="myodbc3c/myodbc3c.vpj" />
- <Project File="myodbc3i/myodbc3i.vpj" />
- <Project File="myodbc3m/myodbc3m.vpj" />
- <Project File="myodbc3S/myodbc3S.vpj" />
- <Project File="myodbc3u/myodbc3u.vpj" />
- <Project File="MYODBCBrw/MYODBCBrw.vpj" />
- <Project File="MYODBCBrw/MYODBCBrwApp/MYODBCBrwApp.vpj" />
- <Project File="MYODBCBrw/MYODBCBrwLib/MYODBCBrwLib.vpj" />
- <Project File="MYODBCCls/MYODBCCls.vpj" />
- <Project File="MYODBCCls/MYODBCClsApp/MYODBCClsApp.vpj" />
- <Project File="MYODBCCls/MYODBCClsLib/MYODBCClsLib.vpj" />
- <Project File="MYODBCDbg/MYODBCDbg.vpj" />
- <Project File="MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCCls.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCClsApp/MYQTODBCClsApp.vpj" />
- <Project File="MYQTODBCCls/MYQTODBCClsLib/MYQTODBCClsLib.vpj" />
- <Project File="../mysql-include.vpj" />
- <Project File="scripts/scripts.vpj" />
- <Project File="test/test.vpj" />
+ <Project File="connector-odbc3.vpj"/>
+ <Project File="dltest/dltest.vpj"/>
+ <Project File="../connector-odbc/trunk/examples/CPP/7/ADO/exampleADO.vpj"/>
+ <Project File="myodbc3/myodbc3.vpj"/>
+ <Project File="myodbc3c/myodbc3c.vpj"/>
+ <Project File="myodbc3i/myodbc3i.vpj"/>
+ <Project File="myodbc3m/myodbc3m.vpj"/>
+ <Project File="myodbc3S/myodbc3S.vpj"/>
+ <Project File="myodbc3u/myodbc3u.vpj"/>
+ <Project File="MYODBCBrw/MYODBCBrw.vpj"/>
+ <Project File="MYODBCBrw/MYODBCBrwApp/MYODBCBrwApp.vpj"/>
+ <Project File="MYODBCBrw/MYODBCBrwLib/MYODBCBrwLib.vpj"/>
+ <Project File="MYODBCCls/MYODBCCls.vpj"/>
+ <Project File="MYODBCCls/MYODBCClsApp/MYODBCClsApp.vpj"/>
+ <Project File="MYODBCCls/MYODBCClsLib/MYODBCClsLib.vpj"/>
+ <Project File="MYODBCDbg/MYODBCDbg.vpj"/>
+ <Project File="MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj"/>
+ <Project File="MYQTODBCCls/MYQTODBCCls.vpj"/>
+ <Project File="MYQTODBCCls/MYQTODBCClsApp/MYQTODBCClsApp.vpj"/>
+ <Project File="MYQTODBCCls/MYQTODBCClsLib/MYQTODBCClsLib.vpj"/>
+ <Project File="../mysql-include.vpj"/>
+ <Project File="scripts/scripts.vpj"/>
+ <Project File="test/test.vpj"/>
</Projects>
</Workspace>
Modified: dltest/dltest.vpj
===================================================================
--- dltest/dltest.vpj 2006-07-19 19:32:45 UTC (rev 54)
+++ dltest/dltest.vpj 2006-07-19 21:45:56 UTC (rev 55)
@@ -2,8 +2,7 @@
<Project
Version="10.0"
VendorName="SlickEdit"
- WorkingDir="."
- >
+ WorkingDir=".">
<Config
Name="Debug|Win32"
OutputFile=""
Modified: myodbc3/execute.c
===================================================================
--- myodbc3/execute.c 2006-07-19 19:32:45 UTC (rev 54)
+++ myodbc3/execute.c 2006-07-19 21:45:56 UTC (rev 55)
@@ -296,7 +296,15 @@
if ( param->actual_len && *(param->actual_len) == SQL_NTS )
length= strlen(data);
else if ( param->ValueMax )
+ {
+#ifndef strnlen
+ length=strlen(data);
+ if ( length > param->ValueMax )
+ length = param->ValueMax;
+#else
length=strnlen(data,param->ValueMax);
+#endif
+ }
else
length=strlen(data);
}
Modified: myodbc3c/myodbc3c.vpj
===================================================================
--- myodbc3c/myodbc3c.vpj 2006-07-19 19:32:45 UTC (rev 54)
+++ myodbc3c/myodbc3c.vpj 2006-07-19 21:45:56 UTC (rev 55)
@@ -2,8 +2,7 @@
<Project
Version="10.0"
VendorName="SlickEdit"
- WorkingDir="."
- >
+ WorkingDir=".">
<Config
Name="Debug|Win32"
OutputFile=""
Modified: myodbc3i/myodbc3i.vpj
===================================================================
--- myodbc3i/myodbc3i.vpj 2006-07-19 19:32:45 UTC (rev 54)
+++ myodbc3i/myodbc3i.vpj 2006-07-19 21:45:56 UTC (rev 55)
@@ -2,8 +2,7 @@
<Project
Version="10.0"
VendorName="SlickEdit"
- WorkingDir="."
- >
+ WorkingDir=".">
<Config
Name="Debug|Win32"
OutputFile=""
Modified: myodbc3m/myodbc3m.vpj
===================================================================
--- myodbc3m/myodbc3m.vpj 2006-07-19 19:32:45 UTC (rev 54)
+++ myodbc3m/myodbc3m.vpj 2006-07-19 21:45:56 UTC (rev 55)
@@ -2,8 +2,7 @@
<Project
Version="10.0"
VendorName="SlickEdit"
- WorkingDir="."
- >
+ WorkingDir=".">
<Config
Name="Debug|Win32"
OutputFile=""
Modified: myodbc3u/myodbc3u.vpj
===================================================================
--- myodbc3u/myodbc3u.vpj 2006-07-19 19:32:45 UTC (rev 54)
+++ myodbc3u/myodbc3u.vpj 2006-07-19 21:45:56 UTC (rev 55)
@@ -2,8 +2,7 @@
<Project
Version="10.0"
VendorName="SlickEdit"
- WorkingDir="."
- >
+ WorkingDir=".">
<Config
Name="Debug|Win32"
OutputFile=""
Modified: mysql.pri
===================================================================
--- mysql.pri 2006-07-19 19:32:45 UTC (rev 54)
+++ mysql.pri 2006-07-19 21:45:56 UTC (rev 55)
@@ -5,7 +5,16 @@
#
# Edit these settings before using qmake to
# generate the Makefiles.
+#
+# You will want to set MYSQL_DIR environment
+# variable to something like;
+#
+# MYSQL_DIR=C:\Program Files\MySQL\MySQL Server 5.0
#
+# Using an environment variable in this way
+# allows us to avoid problems with file names with
+# spaces.
+#
# \note The plan is to generate this file using a
# configure.bat/configure.exe at some point in
# the future.
@@ -21,12 +30,8 @@
win32 {
DEFINES += DBUG_OFF _DBUG_OFF NDEBUG _NDEBUG
DEFINES += _WIN32 WIN32 _WINDOWS __WIN__
- INCLUDEPATH += "C:\Program Files\MySQL\MySQL Server 5.0\include"
- LIBS += -L"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt" mysqlclient.lib zlib.lib
-
-# DEFINES += _WIN32 WIN32 _WINDOWS __WIN__
-# INCLUDEPATH += $(MYSQL_DIR)\include
-# LIBS += -L$(MYSQL_DIR)\lib\opt mysqlclient.lib zlib.lib
+ INCLUDEPATH += $(MYSQL_DIR)\include
+ LIBS += -L$(MYSQL_DIR)\lib\opt mysqlclient.lib zlib.lib
}
# #########################################################
Modified: root.pro
===================================================================
--- root.pro 2006-07-19 19:32:45 UTC (rev 54)
+++ root.pro 2006-07-19 21:45:56 UTC (rev 55)
@@ -61,11 +61,15 @@
# failing you (on OSX for example) or if the platform
# does not have gnu auto-build (Windows perhaps).
#
-# 3. The util code does not contains any Qt but it should
+# 3. The util code does not contain any Qt but it should
# be built with qmake if you are going to use Qt
# elsewhere.
#
# \sa
+# Build.bat
+# Install.bat
+# Uninstall.bat
+# Upgrade.bat
# http://www.trolltech.com
#
# #########################################################
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r55 - / dltest myodbc3 myodbc3c myodbc3i myodbc3m myodbc3u | pharvey | 19 Jul |
