Connector/ODBC 3.51 commit: r869 - in branches/guffert/setupgui: . windows

[jwinstead]

Modified:
   branches/guffert/setupgui/CMakeLists.txt
   branches/guffert/setupgui/ConfigDSN.c
   branches/guffert/setupgui/callbacks.h
   branches/guffert/setupgui/windows/odbcdialogparams.rc
Log:
Fix new Windows GUI build now that files are all moved around.

Modified: branches/guffert/setupgui/CMakeLists.txt
===================================================================
--- branches/guffert/setupgui/CMakeLists.txt	2007-11-15 19:12:12 UTC (rev 868)
+++ branches/guffert/setupgui/CMakeLists.txt	2007-11-15 19:29:08 UTC (rev 869)
@@ -26,6 +26,7 @@
 
 IF (WIN32)
   SET(SETUP_SRCS ${SETUP_SRCS}
+                 myodbc5S.def
                  windows/main.cpp
                  windows/odbcdialogparams.cpp
                  windows/odbcdialogparams.h

Modified: branches/guffert/setupgui/ConfigDSN.c
===================================================================
--- branches/guffert/setupgui/ConfigDSN.c	2007-11-15 19:12:12 UTC (rev 868)
+++ branches/guffert/setupgui/ConfigDSN.c	2007-11-15 19:29:08 UTC (rev 869)
@@ -24,12 +24,16 @@
 #include <winsock2.h>
 #include <windows.h>
 #endif
+
 #include <sql.h>
 #include <sqlext.h>
+
 #include "installer.h"
 #include "stringutil.h"
-#include "odbcdialogparams/odbcdialogparams.h"
 
+#ifdef WIN32
+# include "windows/odbcdialogparams.h"
+#endif
 
 /*
    Entry point for GUI prompting from SQLDriverConnect().

Modified: branches/guffert/setupgui/callbacks.h
===================================================================
--- branches/guffert/setupgui/callbacks.h	2007-11-15 19:12:12 UTC (rev 868)
+++ branches/guffert/setupgui/callbacks.h	2007-11-15 19:29:08 UTC (rev 869)
@@ -2,6 +2,7 @@
 #define _CALLBACKS_H
 
 #ifdef _WIN32
+#include <winsock2.h>
 #include <windows.h>
 #endif
 

Modified: branches/guffert/setupgui/windows/odbcdialogparams.rc
===================================================================
--- branches/guffert/setupgui/windows/odbcdialogparams.rc	2007-11-15 19:12:12 UTC (rev
868)
+++ branches/guffert/setupgui/windows/odbcdialogparams.rc	2007-11-15 19:29:08 UTC (rev
869)
@@ -177,7 +177,7 @@
 // Bitmap
 //
 
-IDB_LOGO                BITMAP                 
"../odbcdialogparams/connector_odbc_header.bmp"
+IDB_LOGO                BITMAP                  "connector_odbc_header.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //