Rebaked after removal of notebook.rc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index da347f6a87f7d198f4a93eabd958db3d16ef8c48..b2e8cad79565eb4f4cc0affac091e705a34d5a7d 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -42,9 +42,9 @@ NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 NOTEBOOK_OBJECTS =  \
+       $(__notebook___win32rc) \
        $(__notebook_os2_lib_res) \
-       notebook_notebook.o \
-       $(__notebook___win32rc)
+       notebook_notebook.o
 
 ### Conditionally set variables: ###
 
@@ -82,6 +82,7 @@ NOTEBOOK_OBJECTS =  \
 COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep notebook$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__notebook___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd)
+@COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_sample_rc.o
 @COND_PLATFORM_OS2_1@__notebook_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle
@@ -95,7 +96,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_notebook_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -172,12 +172,12 @@ notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 
 @COND_PLATFORM_MACOSX_1@notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP)
 
+notebook_sample_rc.o: $(srcdir)/../../samples/sample.rc
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+
 notebook_notebook.o: $(srcdir)/notebook.cpp
        $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(srcdir)/notebook.cpp
 
-notebook_notebook_rc.o: $(srcdir)/notebook.rc
-       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d

diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index e6661b77c2c5f78cf8c8132954650a86124b48ea..264c8d9f9d38cfc5a4747d36dd4d141ad4aa7585 100644 (file)
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -205,14 +205,14 @@ clean:
        -if exist $(OBJS)\notebook.ilf del $(OBJS)\notebook.ilf
        -if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils
 
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_notebook.res
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__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) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_notebook.res
+       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__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) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res
 |
 
+$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__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) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
+
 $(OBJS)\notebook_notebook.obj: .\notebook.cpp
        $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) $**
 
-$(OBJS)\notebook_notebook.res: .\notebook.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__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) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
-

diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index 6a43658c2fe62e06d1937ad7059759aeb5a371d0..6ebfbafc7c92af10271e537a31c34b8da720dae0 100644 (file)
--- a/samples/notebook/makefile.gcc
+++ b/samples/notebook/makefile.gcc
@@ -25,8 +25,8 @@ NOTEBOOK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 NOTEBOOK_OBJECTS =  \
-       $(OBJS)\notebook_notebook.o \
-       $(OBJS)\notebook_notebook_rc.o
+       $(OBJS)\notebook_sample_rc.o \
+       $(OBJS)\notebook_notebook.o
 
 ### Conditionally set variables: ###
 
@@ -198,15 +198,15 @@ clean:
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
 
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook_rc.o
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o
        $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__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)\notebook_sample_rc.o: ./../../samples/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) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+
 $(OBJS)\notebook_notebook.o: ./notebook.cpp
        $(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $<
 
-$(OBJS)\notebook_notebook_rc.o: ./notebook.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) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index f6113b1e1f62decaffd2c164b087db1091323f5b..28db2e96fc29549d0f6dbcf717bcd57658842f84 100644 (file)
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -26,8 +26,8 @@ NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
        /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) \
        $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
 NOTEBOOK_OBJECTS =  \
-       $(OBJS)\notebook_notebook.obj \
-       $(OBJS)\notebook_notebook.res
+       $(OBJS)\notebook_sample.res \
+       $(OBJS)\notebook_notebook.obj
 
 ### Conditionally set variables: ###
 
@@ -256,14 +256,14 @@ clean:
        -if exist $(OBJS)\notebook.ilk del $(OBJS)\notebook.ilk
        -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb
 
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook.res
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(NOTEBOOK_OBJECTS)  $(__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) 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 oleacc.lib odbc32.lib
 <<
 
+$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __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) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
+
 $(OBJS)\notebook_notebook.obj: .\notebook.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) $**
 
-$(OBJS)\notebook_notebook.res: .\notebook.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __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) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
-

diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat
index 2b27cec06c1e9a4deab0ca6c6575ee783d25681e..7b57a98fd60a361069dbf47c7222c44110a795ce 100644 (file)
--- a/samples/notebook/makefile.wat
+++ b/samples/notebook/makefile.wat
@@ -233,7 +233,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
        -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
 
-$(OBJS)\notebook.exe :  $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook.res
+$(OBJS)\notebook.exe :  $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
        @%create $(OBJS)\notebook.lbc
        @%append $(OBJS)\notebook.lbc option quiet
        @%append $(OBJS)\notebook.lbc name $^@
@@ -241,12 +241,12 @@ $(OBJS)\notebook.exe :  $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook.res
        @%append $(OBJS)\notebook.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i
        @for %i in ( $(__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)  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 odbc32.lib ) do @%append $(OBJS)\notebook.lbc library %i
-       @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_notebook.res
+       @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res
        wlink @$(OBJS)\notebook.lbc
 
+$(OBJS)\notebook_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
 $(OBJS)\notebook_notebook.obj :  .AUTODEPEND .\notebook.cpp
        $(CXX) -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $<
 
-$(OBJS)\notebook_notebook.res :  .AUTODEPEND .\notebook.rc
-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-