X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/137c8bde085d6d5b7c459902d2ea1a198ab48765..17b1d76b4add82305463d10b9f65668d06169363:/samples/widgets/makefile.wat?ds=sidebyside diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index c36a5b3e93..edb462e3af 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -180,6 +180,10 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -209,6 +213,10 @@ __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL @@ -225,22 +233,26 @@ SETUPHDIR = & WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 & - -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH & - $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) WIDGETS_OBJECTS = & + $(OBJS)\widgets_bmpcombobox.obj & $(OBJS)\widgets_button.obj & $(OBJS)\widgets_checkbox.obj & + $(OBJS)\widgets_clrpicker.obj & $(OBJS)\widgets_combobox.obj & $(OBJS)\widgets_datepick.obj & + $(OBJS)\widgets_dirctrl.obj & + $(OBJS)\widgets_dirpicker.obj & + $(OBJS)\widgets_filepicker.obj & + $(OBJS)\widgets_fontpicker.obj & $(OBJS)\widgets_gauge.obj & $(OBJS)\widgets_hyperlnk.obj & $(OBJS)\widgets_listbox.obj & $(OBJS)\widgets_notebook.obj & - $(OBJS)\widgets_clrpicker.obj & - $(OBJS)\widgets_fontpicker.obj & - $(OBJS)\widgets_filepicker.obj & - $(OBJS)\widgets_dirpicker.obj & + $(OBJS)\widgets_odcombobox.obj & $(OBJS)\widgets_radiobox.obj & $(OBJS)\widgets_slider.obj & $(OBJS)\widgets_spinbtn.obj & @@ -273,45 +285,54 @@ $(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res @%append $(OBJS)\widgets.lbc option caseexact @%append $(OBJS)\widgets.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\widgets.lbc library %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\widgets.lbc library %i @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i wlink @$(OBJS)\widgets.lbc +$(OBJS)\widgets_bmpcombobox.obj : .AUTODEPEND .\bmpcombobox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(OBJS)\widgets_button.obj : .AUTODEPEND .\button.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_checkbox.obj : .AUTODEPEND .\checkbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< +$(OBJS)\widgets_clrpicker.obj : .AUTODEPEND .\clrpicker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(OBJS)\widgets_combobox.obj : .AUTODEPEND .\combobox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_datepick.obj : .AUTODEPEND .\datepick.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp +$(OBJS)\widgets_dirctrl.obj : .AUTODEPEND .\dirctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_hyperlnk.obj : .AUTODEPEND .\hyperlnk.cpp +$(OBJS)\widgets_dirpicker.obj : .AUTODEPEND .\dirpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp +$(OBJS)\widgets_filepicker.obj : .AUTODEPEND .\filepicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp +$(OBJS)\widgets_fontpicker.obj : .AUTODEPEND .\fontpicker.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_clrpicker.obj : .AUTODEPEND .\clrpicker.cpp +$(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_fontpicker.obj : .AUTODEPEND .\fontpicker.cpp +$(OBJS)\widgets_hyperlnk.obj : .AUTODEPEND .\hyperlnk.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_filepicker.obj : .AUTODEPEND .\filepicker.cpp +$(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< -$(OBJS)\widgets_dirpicker.obj : .AUTODEPEND .\dirpicker.cpp +$(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_odcombobox.obj : .AUTODEPEND .\odcombobox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp @@ -336,5 +357,5 @@ $(OBJS)\widgets_widgets.obj : .AUTODEPEND .\widgets.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<