X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b910a8add446261996bc8d22e6545e6bdb373b8b..85e5bb6a953e5dffd5c52d907b4ca0767a544bcc:/samples/dataview/makefile.gcc diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc index 58c53d2504..9ea33d755e 100644 --- a/samples/dataview/makefile.gcc +++ b/samples/dataview/makefile.gcc @@ -28,7 +28,7 @@ DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ $(CPPFLAGS) $(CXXFLAGS) DATAVIEW_OBJECTS = \ $(OBJS)\dataview_dataview.o \ - $(OBJS)\dataview_dataview_rc.o + $(OBJS)\dataview_sample_rc.o ### Conditionally set variables: ### @@ -211,13 +211,13 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe -$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview_rc.o +$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(OBJS)\dataview_dataview.o: ./dataview.cpp $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\dataview_dataview_rc.o: ./dataview.rc +$(OBJS)\dataview_sample_rc.o: ./../sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH .PHONY: all clean