X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b796194b15ddb3bd794b2150e2f2130e809ad2a6..23fd114fcd326ffa2a374cc6f107dac4fc876c63:/samples/html/widget/makefile.vc diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 20511cd18c..9fa57087bf 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -32,7 +32,7 @@ WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ WIDGET_OBJECTS = \ $(OBJS)\widget_widget.obj WIDGET_RESOURCES = \ - $(OBJS)\widget_widget.res + $(OBJS)\widget_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb -$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res +$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(WIDGET_OBJECTS) $(WIDGET_RESOURCES) $(__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) $(__UNICOWS_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 << @@ -352,9 +352,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\widget_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\widget_widget.obj: .\widget.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp -$(OBJS)\widget_widget.res: .\widget.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc -