X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..cffadd8447201d0e2e1b3de6f8a24b967da9140c:/samples/widgets/makefile.vc?ds=sidebyside diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index 53f4946de7..eeafbc6e04 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -20,9 +20,11 @@ WIDGETS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.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 $(CXXFLAGS) /GR /GX + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) WIDGETS_OBJECTS = \ $(OBJS)\widgets_button.obj \ + $(OBJS)\widgets_checkbox.obj \ $(OBJS)\widgets_combobox.obj \ $(OBJS)\widgets_gauge.obj \ $(OBJS)\widgets_listbox.obj \ @@ -127,6 +129,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 @@ -241,6 +255,9 @@ all: $(OBJS)\widgets.exe $(OBJS)\widgets_button.obj: .\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $** +$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $** + $(OBJS)\widgets_combobox.obj: .\combobox.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**