Also reset DatePicker property editor's global pointer (fixes #11787)

[wxWidgets.git] / samples / html / helpview / makefile.gcc

diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 58aa8395cf8e3a89dc306b29d12a450dd1216a02..9207ed4345cdf03c514fc662dc7c7278b9f78cf2 100644 (file)
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -29,8 +29,8 @@ HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.o \\r
-       $(OBJS)\helpview_helpview_rc.o\r
+       $(OBJS)\helpview_sample_rc.o \
+       $(OBJS)\helpview_helpview.o
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
 \r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o\r
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample_rc.o
        $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
+$(OBJS)\helpview_sample_rc.o: ./../../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __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) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
 $(OBJS)\helpview_helpview.o: ./helpview.cpp\r
        $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc\r
-       windres --use-temp-file -i$< -o$@    --define __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) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
 .PHONY: all clean data\r
 \r
 \r