Fix problems with the wxHtmpTagHandler wrappers and related

[wxWidgets.git] / demos / life / makefile.vc

diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 6fca36fba7796053a383b0e8540f9b27a510d73d..3bfec112b031aa27ac207f984695c6adab35534c 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -12,11 +12,12 @@
 
 ### Variables: ###
 
-LIFE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__DEBUGINFO_0) /Fd$(OBJS)\life.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) /GR /GX
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
        $(OBJS)\life_life.obj \
        $(OBJS)\life_dialogs.obj \
@@ -120,6 +121,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_8 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_8 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_9 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_9 = /GX
+!endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
@@ -255,7 +268,7 @@ clean:
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (samples.inc breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<