X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00fb97de2c85c00ca8192873d1ce60e479dc6817..23fd114fcd326ffa2a374cc6f107dac4fc876c63:/samples/html/helpview/makefile.wat?ds=inline diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index ea1a76f320..6acac408df 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -169,10 +169,6 @@ __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 __CAIRO_LIB_p = !ifeq USE_CAIRO 1 __CAIRO_LIB_p = cairo.lib @@ -212,10 +208,6 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif ____CAIRO_INCLUDEDIR_FILENAMES = !ifeq USE_CAIRO 1 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo @@ -237,10 +229,10 @@ SETUPHDIR = & HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 & + -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = & $(OBJS)\helpview_helpview.obj @@ -261,15 +253,15 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res @%create $(OBJS)\helpview.lbc @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i - @for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\helpview.lbc library %i + @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_sample.res @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i wlink @$(OBJS)\helpview.lbc @@ -277,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\helpview_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< -