Updates for wxColourDatabase

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

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 62c646497214cfc35b1bc82f4fd81ec3e8323583..a34e4ade154d958bb29773c843aee475c24d2609 100644 (file)
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -19,7 +19,8 @@ SETUPHDIR = \
 STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5)
 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample_rc.o \
        $(OBJS)\stctest_stctest.o \
@@ -98,6 +99,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -147,7 +160,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\stctest.exe
+all: $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_edit.o: ./edit.cpp
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $<
@@ -165,7 +178,11 @@ clean:
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
 
+data: 
+       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_rc.o
        $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 
-.PHONY: all clean
+.PHONY: all clean data