Windows build fixes

Makefile.vc

@@ -11,7 +11,7 @@ all:
 	nmake /nologo /f Makefile.vc
 	cd ..\..\examples\cpp\src
 	nmake /nologo /f Makefile.vc
-	cd ..\..\..
+	cd ..\..\..\..
 
 clean:
 	cd project\common\src
@@ -24,7 +24,7 @@ clean:
 	nmake /nologo /f Makefile.vc clean
 	cd ..\..\examples\cpp\src
 	nmake /nologo /f Makefile.vc clean
-	cd ..\..\..
+	cd ..\..\..\..
 
 install:
 	cd project\driver\src\release

project/build/Makefile.vc

@@ -1,24 +1,44 @@
 !include config.vc
 !include version.mk
 
+########################################################################
+#
+# Runtime Configuration
+#
+!if "$(RUNTIME_LIBS)" == "dynamic"
+RUNTIME_FLAGS = /MD$(DEBUG_RUNTIME)
+LIB_STATIC_RUNTIME =
+!else if "$(RUNTIME_LIBS)" == "static"
+RUNTIME_FLAGS = /MT$(DEBUG_RUNTIME)
+LIB_STATIC_RUNTIME = s
+!else
+!error "Unknown RUNTIME_LIBS: $(RUNTIME_LIBS)"
+!endif
+
+!if "$(VS_VERSION)" == "vs2003" || "$(VS_VERSION)" == "vs2005" || "$(VS_VERSION)" == "vs2008" || "$(VS_VERSION)" == "vs2010"
+LIB_ODBCCP32 = odbccp32.lib
+!else
+LIB_ODBCCP32 = odbccp32.lib legacy_stdio_definitions.lib
+!endif
+
 LIBRETS_CFLAGS = /I "$(LIBRETS_PATH)\project\librets\include"
 LIBRETS_LDFLAGS = "/LIBPATH:$(LIBRETS_PATH)\project\librets\src\build-$(TARGET_CPU)" \
-	liblibrets-$(VS_VERSION)-s$(DEBUG_RUNTIME)-$(LIBRETS_VERSION).lib
+	liblibrets-$(VS_VERSION)-$(LIB_STATIC_RUNTIME)$(LIB_DEBUG_RUNTIME)-$(LIBRETS_VERSION).lib
 
 BOOST_CFLAGS = /I "$(BOOST_PATH)"
 BOOST_LDFLAGS = "/LIBPATH:$(BOOST_PATH)/stage/lib"
-!if "$(VS_VERSION)" == "vs2008" || "$(VS_VERSION)" == "vs2010"
+!if "$(VS_VERSION)" != "vs2003" && "$(VS_VERSION)" != "vs2005"
 BOOST_LDFLAGS = "/LIBPATH:$(BASE_PATH)/lib"
 !endif
 
 WX_LIB = $(WX_PATH)/lib/vc_lib
 WX_CFLAGS = /I "$(WX_PATH)/include" /I "$(WX_LIB)/mswd" /D "WINVER=0x0400" \
             /D__WXMSW__
-WX_LDFLAGS = "/LIBPATH:$(WX_LIB)" wxmsw26d_core.lib wxbase26d.lib
+WX_LDFLAGS = "/LIBPATH:$(WX_LIB)" wxmsw$(WX_VERSION)d_core.lib wxbase$(WX_VERSION)d.lib
 
-CCNODBG    = cl.exe /MT /O2 /DNDEBUG
-CCDEBUG    = cl.exe /MT$(DEBUG_RUNTIME) /Od /Gm /Zi /D_DEBUG /GZ
-CFLAGS_STD = /nologo /D__WIN__ /W3 /GX /YX /FD /c /GR
+CCNODBG    = cl.exe /O2 /DNDEBUG
+CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ
+CFLAGS_STD = /nologo $(RUNTIME_FLAGS) /D__WIN__ /W3 /GX /YX /FD /c /GR /I "$(BASE_PATH)\include"
 
 !if "$(BUILD)" == "release"
 LINK_MODE = /RELEASE

project/build/config.vc.dist

@@ -1,14 +1,15 @@
 # Point to vendor code, we assume all the dependencies are in this directory
-BASE_PATH = c:/odbcrets
+BASE_PATH = c:/librets/vendor/$(VS_VERSION)-$(TARGET_CPU)
 
 # Points to librets install
 LIBRETS_PATH = $(BASE_PATH)/librets
 
 # Points to boost install
-BOOST_PATH = $(BASE_PATH)/boost_1_32_0
+BOOST_PATH = $(BASE_PATH)/include/boost-1_71
 
 # Points to wxWidgets install
 WX_PATH = $(BASE_PATH)/wxWidgets-2.6.2
+WX_VERSION = 26
 
 # Points to Ruby executable
 RUBY = ruby
@@ -20,11 +21,19 @@ ISCC = "C:\Program Files\Inno Setup 5\ISCC.exe"
 # [debug, release]
 BUILD = debug
 
+# [dynamic, static]
+#
+# Static means compile with /MT and dynamic means compile with /MD.
+#
+# NOTE: ALL objects of a library or application must be compiled
+# with the same flag.  Not doing so will cause errors at link time.
+RUNTIME_LIBS = dynamic
+
 # Visual Studio version to use.
-# [vs2003, vs2005, vs2008, vs2010]
+# [vs2003, vs2005, vs2008, vs2010, vs2015, vs2017, vs2019]
 #
-VS_VERSION = vs2003
+VS_VERSION = vs2017
 
 # librets version to use.
 #
-LIBRETS_VERSION = 1.5.1
+LIBRETS_VERSION = 1.6.5

project/build/version.mk

@@ -1 +1,4 @@
-VERSION = 3.0.0
+VERSION_MAJOR = 3
+VERSION_MINOR = 0
+VERSION_REV = 0
+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REV)

project/driver/include/AbstractHandle.h

@@ -17,6 +17,7 @@
 #ifndef ABSTRACTHANDLE_H
 #define ABSTRACTHANDLE_H
 
+#include <string>
 #include <vector>
 #include "ezrets.h"
 #include "ezretsfwd.h"

project/driver/src/Makefile.vc

@@ -12,7 +12,7 @@ COMMON_LDFLAGS = $(COMMON_LIB)
 EZRETS_CFLAGS = /I. /I../include
 EZRETS_LDFLAGS = /RELEASE
 
-SYSLIBS = user32.lib winmm.lib odbc32.lib odbccp32.lib wsock32.lib
+SYSLIBS = user32.lib winmm.lib odbc32.lib $(LIB_ODBCCP32) wsock32.lib
 
 RETS_DEF = ezrets.def
 RETS_RC = ezrets.rc
@@ -27,7 +27,7 @@ CXX 	= $(CCDEBUG)
 CFLAGS  = $(CFLAGS_STD) $(EZRETS_CFLAGS) $(BOOST_CFLAGS) $(LIBRETS_CFLAGS) \
           $(COMMON_CFLAGS) /DEZRETS_VERSION=\"$(VERSION)\"
 LDFLAGS = $(LDFLAGS_STD) $(LIBRETS_LDFLAGS) $(COMMON_LDFLAGS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(EZRETS_LDFLAGS)
-LINK    = $(LINKDLL) $(LDFLAGS) $(SYSLIBS) /VERSION:$(VERSION) \
+LINK    = $(LINKDLL) $(LDFLAGS) $(SYSLIBS) /VERSION:$(VERSION_MAJOR).$(VERSION_MINOR) \
           /DEF:$(RETS_DEF) /out:$(TARGET)
 RSC_FLAGS = /l 0x409 -I../include
 

project/driver/src/afxres.h

@@ -0,0 +1 @@
+#include "windows.h"

project/examples/cpp/src/Makefile.vc

@@ -1,7 +1,7 @@
 
 !include <../../../build/Makefile.vc>
 
-SYSLIBS = user32.lib winmm.lib odbc32.lib odbccp32.lib wsock32.lib
+SYSLIBS = user32.lib winmm.lib odbc32.lib $(LIB_ODBCCP32) wsock32.lib
 
 DIROBJ = release
 TARGET = $(DIROBJ)\ConnectTest.exe $(DIROBJ)\SimpleSearch.exe\

project/installer/src/Makefile.vc

@@ -4,7 +4,7 @@
 INSTALLER_CFLAGS = /I. /I../include /I../../common/include
 INSTALLER_LDFLAGS = /RELEASE
 
-SYSLIBS = user32.lib winmm.lib odbccp32.lib
+SYSLIBS = user32.lib winmm.lib $(LIB_ODBCCP32)
 DIROBJ = release
 TARGET = $(DIROBJ)\RegisterDriver.exe
 CC  = $(CCNODBG)
@@ -21,7 +21,7 @@ all: $(TARGET)
 $(TARGET): $(DIROBJ)
 
 $(DIROBJ)\RegisterDriver.exe: $(REGISTERDRIVER_OBJS)
-	$(LINK) /SUBSYSTEM:CONSOLE /VERSION:$(VERSION) /out:$(DIROBJ)\RegisterDriver.exe $(REGISTERDRIVER_OBJS) $(SYSLIBS)
+	$(LINK) /SUBSYSTEM:CONSOLE /VERSION:$(VERSION_MAJOR).$(VERSION_MINOR) /out:$(DIROBJ)\RegisterDriver.exe $(REGISTERDRIVER_OBJS) $(SYSLIBS)
 
 $(DIROBJ):
 	@if not exist "$(DIROBJ)" mkdir $(DIROBJ)

project/setup/src/Makefile.vc

@@ -3,7 +3,7 @@
 
 LIB_NAME   = ezretss
 
-SYSLIBS = user32.lib winmm.lib odbc32.lib odbccp32.lib wsock32.lib \
+SYSLIBS = user32.lib winmm.lib odbc32.lib $(LIB_ODBCCP32) wsock32.lib \
           gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib \
           comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib \
           advapi32.lib wsock32.lib oleacc.lib odbc32.lib
@@ -28,7 +28,7 @@ CFLAGS  = $(CFLAGS_STD) $(BOOST_CFLAGS) $(LIBRETS_CFLAGS) $(WX_CFLAGS) \
           $(DEBUG_CFLAGS) /DEZRETS_VERSION=\"$(VERSION)\"
 LDFLAGS = $(LDFLAGS_STD) $(BOOST_LDFLAGS) $(LIBRETS_LDFLAGS) $(WX_LDFLAGS) $(COMMON_LDFLAGS) \
 	/NODEFAULTLIB:LIBCMT
-LINK    = $(LINKDLL) $(LDFLAGS) $(SYSLIBS) /VERSION:$(VERSION) \
+LINK    = $(LINKDLL) $(LDFLAGS) $(SYSLIBS) /VERSION:$(VERSION_MAJOR).$(VERSION_MINOR) \
           /DEF:$(RETS_DEF) /out:$(TARGET)
 LINK_EXE = $(LINKEXE) $(LDFLAGS) $(SYSLIBS)
 

project/setup/src/Setup.cpp

@@ -35,6 +35,10 @@
 #include "str_stream.h"
 #include <sstream>
 
+#ifdef __WXMSW__
+#include <wx/msw/private.h>
+#endif
+
 using namespace odbcrets;
 using std::string;
 using std::map;