(should) fix unix compilation...

[wxWidgets.git] / samples / stc / makefile.vc

diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 16dca9b2612672437773aedd6d394ccfb1be4308..85d11d6c17bd59ef5a4b7220da8f9051da422267 100644 (file)
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -21,10 +21,12 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__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 \
-       /I.\..\..\include $(CXXFLAGS) /GR /GX
+       /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample.res \
-       $(OBJS)\stctest_stctest.obj
+       $(OBJS)\stctest_stctest.obj \
+       $(OBJS)\stctest_edit.obj \
+       $(OBJS)\stctest_prefs.obj
 
 ### Conditionally set variables: ###
 
@@ -118,6 +120,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
@@ -229,6 +243,12 @@ $(OBJS):
 
 all: $(OBJS)\stctest.exe data
 
+$(OBJS)\stctest_edit.obj: .\edit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
+
+$(OBJS)\stctest_prefs.obj: .\prefs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
+
 $(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.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 $**