X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b71531ad92f44d4ceba46418020061d24777e4f4..c0b0635cf69537ca32377bad5650b39402cb21b6:/samples/db/makefile.vc

diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc
index b993f4ff69..0d78e00ffa 100644
--- a/samples/db/makefile.vc
+++ b/samples/db/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,29 +12,24 @@
 
 ### Variables: ###
 
-DBTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+WX_RELEASE_NODOT = 25
+OBJS = \
+	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DBTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
 	$(__DEBUGINFO_0) /Fd$(OBJS)\dbtest.pdb $(____DEBUGRUNTIME_2_p) \
 	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
-	/W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \
-	$(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
+	/W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH \
+	$(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
 DBTEST_OBJECTS =  \
 	$(OBJS)\dbtest_dbtest.obj \
 	$(OBJS)\dbtest_listdb.obj \
 	$(OBJS)\dbtest_dbtest.res
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\lib\vc_dll$(CFG)
-!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -47,15 +42,18 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(USE_ODBC)" == "1"
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
@@ -80,17 +78,47 @@ __DEBUGINFO_1 =
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
 !endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = d
+____DEBUGINFO_2_p = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
+____DEBUGINFO_2_p = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
+____DEBUGINFO_2_p = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = d
+____DEBUGINFO_2_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO_2_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO_2_p_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+____DEBUGINFO_2_p_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+____DEBUGINFO_2_p_1 = /d _DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 
@@ -101,23 +129,29 @@ __DEBUGRUNTIME_3 = d
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_3 = $(__DEBUGINFO_3)
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_3 = d
 !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_3 = 
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_3 = 
 !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_3 = d
 !endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_4 = /Od
 !endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = T
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONSFLAG_8 = 
@@ -131,15 +165,6 @@ __EXCEPTIONSFLAG_9 =
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG_9 = /GX
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
 !endif
@@ -152,17 +177,23 @@ __NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
 __NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
 !endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
 !endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = D
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = T
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /D_UNICODE
@@ -170,70 +201,53 @@ __UNICODE_DEFINE_p = /D_UNICODE
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+__WXLIB_DBGRID_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
 !endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
+__WXLIB_ODBC_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
-__WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+__WXLIB_ADV_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = 
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p_1 = 
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p_1 = /d _DEBUG
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = 
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\vc_lib$(CFG)
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\vc_dll$(CFG)
 !endif
 
 
@@ -243,16 +257,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\dbtest.exe
-
-$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
-
-$(OBJS)\dbtest_dbtest.res: .\dbtest.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
-
-$(OBJS)\dbtest_listdb.obj: .\listdb.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
+all: $(__dbtest___depname)
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -261,7 +266,18 @@ clean:
 	-if exist $(OBJS)\dbtest.ilk del $(OBJS)\dbtest.ilk
 	-if exist $(OBJS)\dbtest.pdb del $(OBJS)\dbtest.pdb
 
+!if "$(USE_ODBC)" == "1"
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(DBTEST_OBJECTS)  $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
+	$(DBTEST_OBJECTS)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.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
 <<
+!endif
+
+$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
+
+$(OBJS)\dbtest_listdb.obj: .\listdb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
+
+$(OBJS)\dbtest_dbtest.res: .\dbtest.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**