Ignore expat*.lib files and vc_lib directory which are created during build.

[wxWidgets.git] / contrib / samples / fl / makefile.gcc

diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc
index c9d63877975f51c4f711fdb1949b3960a7881db9..f0d088c1b23f66dafbb2ba22698e32f8048cffe1 100644 (file)
--- a/contrib/samples/fl/makefile.gcc
+++ b/contrib/samples/fl/makefile.gcc
@@ -16,7 +16,8 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(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 \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_1)
 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.o \
        $(OBJS)\fl_demo1_fl_demo1_rc.o
@@ -24,7 +25,8 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(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 \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_1)
 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.o \
        $(OBJS)\fl_demo2_fl_demo2_rc.o
@@ -32,7 +34,8 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(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 \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_1)
 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.o \
        $(OBJS)\fl_sample1_fl_sample1_rc.o
@@ -40,7 +43,8 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(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 \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_1)
 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.o \
        $(OBJS)\fl_sample2_fl_sample2_rc.o
@@ -48,7 +52,8 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(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 \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_1)
 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.o \
        $(OBJS)\fl_sample3_fl_sample3_rc.o
@@ -129,6 +134,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_12 = --define WXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_1 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_1 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -148,7 +165,7 @@ ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_13 = --define _UNICODE
+__UNICODE_DEFINE_p_14 = --define _UNICODE
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
@@ -184,31 +201,31 @@ $(OBJS)\fl_demo1_fl_demo1.o: ./fl_demo1.cpp
        $(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 $(OBJS)\fl_demo1_fl_demo1_rc.o: ./fl_demo1.rc
-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_13) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_demo2_fl_demo2.o: ./fl_demo2.cpp
        $(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 $(OBJS)\fl_demo2_fl_demo2_rc.o: ./fl_demo2.rc
-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_13) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample1_fl_sample1.o: ./fl_sample1.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 $(OBJS)\fl_sample1_fl_sample1_rc.o: ./fl_sample1.rc
-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_13) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample2_fl_sample2.o: ./fl_sample2.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 $(OBJS)\fl_sample2_fl_sample2_rc.o: ./fl_sample2.rc
-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_13) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample3_fl_sample3.o: ./fl_sample3.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 $(OBJS)\fl_sample3_fl_sample3_rc.o: ./fl_sample3.rc
-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_13) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o