Avoid incompatible operand types

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

diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 0f9da36d908eade626ca7b0d70ca0b4a85863e85..b5bc6bc24fce6bc51dbd4a06270771fe85f7f042 100644 (file)
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -29,8 +29,8 @@ ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ABOUT_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ABOUT_OBJECTS =  \\r

-       $(OBJS)\about_about.o \\r
-       $(OBJS)\about_about_rc.o\r
+       $(OBJS)\about_sample_rc.o \
+       $(OBJS)\about_about.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r

-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o\r
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o

        $(CXX) -o $@ $(ABOUT_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_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data\r
 \r
        $(CXX) -o $@ $(ABOUT_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_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data\r
 \r

+$(OBJS)\about_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)\about_about.o: ./about.cpp\r
        $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\about_about.o: ./about.cpp\r
        $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\about_about_rc.o: ./about.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_files\r
 \r
 \r
 .PHONY: all clean data_files\r
 \r
 \r