Modified wxGetHomeDir to take environment variable HOME into account.

[wxWidgets.git] / samples / db / makefile.wat

diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat
index 431157d60aaca4e942af06cecf154bd89ab5d3e6..efcb2255d3d8fd96824e3d8fe3232a9ce19d545b 100644 (file)
--- a/samples/db/makefile.wat
+++ b/samples/db/makefile.wat
@@ -109,6 +109,13 @@ __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
 !endif
+__EXCEPTIONSFLAG_7 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_7 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_7 = -xs
+!endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
@@ -161,13 +168,17 @@ __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
+__dbtest___depname =
+!ifeq USE_ODBC 1
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 
 ### Variables: ###
 
 DBTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
-       -i=.\..\..\samples $(CXXFLAGS)
+       -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)
 DBTEST_OBJECTS =  &
        $(OBJS)\dbtest_dbtest.obj &
        $(OBJS)\dbtest_listdb.obj
@@ -183,7 +194,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\dbtest.exe
+all : .SYMBOLIC $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.obj :  .AUTODEPEND .\dbtest.cpp
        $(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $<
@@ -201,6 +212,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
 
+!ifeq USE_ODBC 1
 $(OBJS)\dbtest.exe :  $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        @%create $(OBJS)\dbtest.lbc
        @%append $(OBJS)\dbtest.lbc option quiet
@@ -211,3 +223,4 @@ $(OBJS)\dbtest.exe :  $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        @for %i in ( $(__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   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 ) do @%append $(OBJS)\dbtest.lbc library %i
        @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res
        wlink @$(OBJS)\dbtest.lbc
+!endif