1.

[wxWidgets.git] / samples / dynamic / Makefile.in

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 3fbb5f34e143e6212e2c42810df97bb167ddc2f1..c30ec4481341232e0080d76dd1f700210f227b70 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -35,10 +35,10 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 DESTDIR = 
-DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DYNAMIC_OBJECTS =  \
+       $(__dynamic_os2_lib_res) \
        dynamic_dynamic.o \
        $(__dynamic___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -76,8 +76,8 @@ 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 -o dynamic$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o dynamic$(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 = \
@@ -99,6 +99,8 @@ COND_PLATFORM_OS2_1___dynamic___os2_emxbindcmd = $(NM) dynamic$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__dynamic___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynamic___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_dynamic_rc.o
 @COND_PLATFORM_MACOSX_1@__dynamic_bundle___depname = dynamic_bundle
+@COND_PLATFORM_OS2_1@__dynamic_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -138,8 +140,8 @@ dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f dynamic$(EXEEXT) dynamic.app/Contents/MacOS/dynamic
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynamic.app/Contents/Resources/dynamic.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns dynamic.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynamic.app/Contents/Resources/dynamic.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns dynamic.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dynamic_bundle: dynamic.app/Contents/PkgInfo
 
@@ -147,7 +149,7 @@ dynamic_dynamic.o: $(srcdir)/dynamic.cpp
        $(CXXC) -c -o $@ $(DYNAMIC_CXXFLAGS) $<
 
 dynamic_dynamic_rc.o: $(srcdir)/dynamic.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