New wxHashTable implementation when wxUSE_STL == 1. Replaces

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

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index b68bbb42415448313fa48770fbe5a65275b8f90f..faa5b3378eb443e59f9bbd792f3eb7d030d0c1c1 100644 (file)
--- a/samples/stc/makefile.wat
+++ b/samples/stc/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
@@ -167,9 +174,12 @@ SETUPHDIR = &
 STCTEST_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 -i=.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) &
+       $(__EXCEPTIONSFLAG_7)
 STCTEST_OBJECTS =  &
-       $(OBJS)\stctest_stctest.obj
+       $(OBJS)\stctest_stctest.obj &
+       $(OBJS)\stctest_edit.obj &
+       $(OBJS)\stctest_prefs.obj
 
 
 all : $(OBJS)
@@ -180,6 +190,12 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\stctest.exe data
 
+$(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
+       $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+
+$(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp
+       $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<