Fixed drawing of the lines data, also ensure that only tuples are

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

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index 331e4b231d35f2408441c906ad906d69f7b8a109..db148c96e8115575982272e4a96ee8de47770302 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
@@ -164,10 +171,11 @@ OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-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)
+STCTEST_CXXFLAGS = $(__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 $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) &
+       $(CXXFLAGS)
 STCTEST_OBJECTS =  &
        $(OBJS)\stctest_stctest.obj &
        $(OBJS)\stctest_edit.obj &
@@ -180,7 +188,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\stctest.exe
+all : .SYMBOLIC $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
        $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
@@ -201,6 +209,10 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
 
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        @%create $(OBJS)\stctest.lbc
        @%append $(OBJS)\stctest.lbc option quiet