added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / build / plot / makefile.gcc

diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc
index 11f82c485f18a1122fbbc0d520340bf727b4f685..54a8d177faf4ab46b90640552459e39b489fd78d 100644 (file)
--- a/contrib/build/plot/makefile.gcc
+++ b/contrib/build/plot/makefile.gcc
@@ -18,14 +18,15 @@ PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \
        -Wall -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \
        -Wall -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT \

-       $(CXXFLAGS)
+       $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)

 PLOTDLL_OBJECTS =  \
        $(OBJS)\plotdll_dummy.o \
        $(OBJS)\plotdll_plot.o
 PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \
 PLOTDLL_OBJECTS =  \
        $(OBJS)\plotdll_dummy.o \
        $(OBJS)\plotdll_plot.o
 PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \

-       -Wall -I..\..\src\plot\..\..\include $(CXXFLAGS)
+       -Wall -I..\..\src\plot\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_0)

 PLOTLIB_OBJECTS =  \
        $(OBJS)\plotlib_dummy.o \
        $(OBJS)\plotlib_plot.o
 PLOTLIB_OBJECTS =  \
        $(OBJS)\plotlib_dummy.o \
        $(OBJS)\plotlib_plot.o


@@ -96,6 +97,18 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
+endif

 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif