More packager scripts updates. The RPMs will now install icons and

[wxWidgets.git] / contrib / samples / gizmos / editlbox / makefile.vc

diff --git a/contrib/samples/gizmos/editlbox/makefile.vc b/contrib/samples/gizmos/editlbox/makefile.vc
index e540d8ba339141ce5c80ca2caef021e8c0057f3a..b9d9bb490f74886016dd0118221ce2134855cb97 100644 (file)
--- a/contrib/samples/gizmos/editlbox/makefile.vc
+++ b/contrib/samples/gizmos/editlbox/makefile.vc
@@ -16,12 +16,13 @@ OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \
        /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \
-       /I.\..\..\..\include $(CXXFLAGS) /GR /GX
+       /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \
+       $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
        $(OBJS)\test_sample.res \
        $(OBJS)\test_test.obj
@@ -118,6 +119,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_8 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_8 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_9 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_9 = /GX
+!endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif