diff options
Diffstat (limited to 'mysqlcppconn')
-rw-r--r-- | mysqlcppconn/mysql-connector-c++-1.1.0.patch | 4 | ||||
-rw-r--r-- | mysqlcppconn/mysql_config.pmk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch index 9d9a8ad7c60e..eb39eb4437cc 100644 --- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch +++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch @@ -114,7 +114,7 @@ NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {} --- misc/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200 +++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200 -@@ -1 +1,64 @@ +@@ -1,1 +1,64 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -131,7 +131,7 @@ + +# --- Files -------------------------------------------------------- + -+.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86" ++.IF "$(OS)-$(RTL_ARCH)" == "LINUX-x86" + SHL1NOCHECK=TRUE +.ENDIF +SHL1TARGET=$(TARGET) diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk index eb316e0911c3..43a7ab80aad0 100644 --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -35,11 +35,11 @@ .ENDIF .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" .IF "$(SYSTEM_MYSQL)" != "YES" MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include |