ODBC compile (and link) fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-18 10:15:35 +00:00
parent 1a6944fd74
commit 0d73e5a104
11 changed files with 25 additions and 8 deletions
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -178,7 +178,6 @@ LIB_C_SRC=\
 iodbc/hstmt.c \
 iodbc/connect.c \
 iodbc/prepare.c \
- iodbc/execute.c \
 iodbc/result.c \
 iodbc/execute.c \
 iodbc/fetch.c \
--- a/src/gtk/setup/maketmpl.in
+++ b/src/gtk/setup/maketmpl.in
@@ -107,7 +107,7 @@ WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk

 OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)

-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK)
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl

 LINK = $(CXX) -o $@
 LINK_LIBS= \
--- a/src/gtk/setup/substit.in
+++ b/src/gtk/setup/substit.in
@@ -34,6 +34,7 @@ s|*X_PRE_LIBS*|@X_PRE_LIBS@|g
 s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
 s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
 s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
+s|*DL_LIBRARY*|@DL_LIBRARY@|g
 s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
 s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
 s|*OPENGL_LINK*|@OPENGL_LINK@|g
--- a/src/gtk1/setup/maketmpl.in
+++ b/src/gtk1/setup/maketmpl.in
@@ -107,7 +107,7 @@ WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk

 OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)

-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK)
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl

 LINK = $(CXX) -o $@
 LINK_LIBS= \
--- a/src/gtk1/setup/substit.in
+++ b/src/gtk1/setup/substit.in
@@ -34,6 +34,7 @@ s|*X_PRE_LIBS*|@X_PRE_LIBS@|g
 s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
 s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
 s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
+s|*DL_LIBRARY*|@DL_LIBRARY@|g
 s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
 s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
 s|*OPENGL_LINK*|@OPENGL_LINK@|g
--- a/src/iodbc/execute.c
+++ b/src/iodbc/execute.c
@@ -52,7 +52,7 @@ static void	do_cursoropen(STMT_t FAR* pstmt)
 	}
 }

-RETCODE SQL_API	SQLexecute ( HSTMT hstmt )
+RETCODE SQL_API	SQLExecute ( HSTMT hstmt )
 {
 	STMT_t FAR*	pstmt	= (STMT_t FAR*)hstmt;
 	HPROC		hproc	= SQL_NULL_HPROC;
--- a/src/iodbc/hstmt.c
+++ b/src/iodbc/hstmt.c
@@ -184,7 +184,7 @@ RETCODE _iodbcdm_dropstmt( HSTMT hstmt )
 	return SQL_SUCCESS;
 }

-RETCODE SQL_API	SQLfreestmt (
+RETCODE SQL_API	SQLFreeStmt (
 			HSTMT	hstmt,
 			UWORD	fOption )
 {
--- a/src/iodbc/prepare.c
+++ b/src/iodbc/prepare.c
@@ -27,7 +27,7 @@

 #include	<../iodbc/itrace.h>

-RETCODE SQL_API	SQLprepare (
+RETCODE SQL_API	SQLPrepare (
 			HSTMT		hstmt,
 			UCHAR FAR*	szSqlStr,
 			SDWORD		cbSqlStr )