X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..bc59c2062c644236551b9652874414bdb2144955:/contrib/samples/gizmos/dynsash_switch/Makefile.in?ds=sidebyside

diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
index b3a01e92c8..d147643512 100644
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
+DESTDIR = 
+DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+	$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
+	-I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
 DYNSASH_SWITCH_OBJECTS =  \
 	$(__dynsash_switch___win32rc) \
+	$(__dynsash_switch_os2_lib_res) \
 	dynsash_switch_dynsash_switch.o
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
@@ -75,10 +77,10 @@ WX_VERSION = 2.5.1
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
-	$(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
-	$(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+	$(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \
+	dynsash_switch$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
+	sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -103,6 +105,8 @@ COND_PLATFORM_OS2_1___dynsash_switch___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_WIN32_1@	dynsash_switch_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__dynsash_switch_bundle___depname \
 @COND_PLATFORM_MACOSX_1@	= dynsash_switch_bundle
+@COND_PLATFORM_OS2_1@__dynsash_switch_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,8 +146,8 @@ dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/m
 	ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc
-	ln -f $(top_srcdir)/src/mac/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: dynsash_switch.app/Contents/PkgInfo
 
@@ -151,7 +155,7 @@ dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp
 	$(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $<
 
 dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples
 
 install: all