X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f82b7036e8e6068411853610dd8ce01265b99719..40730ad17db78193611389a3d12db772b28eac31:/samples/layout/Makefile.in

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 8abb02b839..fc3ad56f37 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -47,9 +47,9 @@ LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
 LAYOUT_OBJECTS =  \
+	$(__layout___win32rc) \
 	$(__layout_os2_lib_res) \
-	layout_layout.o \
-	$(__layout___win32rc)
+	layout_layout.o
 
 ### Conditionally set variables: ###
 
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__layout___win32rc = layout_sample_rc.o
 @COND_PLATFORM_OS2_1@__layout_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \
@@ -106,7 +107,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@__layout___win32rc = layout_layout_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)
@@ -174,12 +174,12 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
 
 @COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP)
 
+layout_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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 $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+
 layout_layout.o: $(srcdir)/layout.cpp
 	$(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $(srcdir)/layout.cpp
 
-layout_layout_rc.o: $(srcdir)/layout.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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 $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d