added resolution option to JPEG handler (patch #833234)

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

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 6c344e69b0d993aae601b412382cffb13708af4c..ce918b46ef752e4f6909098595ed0455175df4a5 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -36,10 +36,11 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 SHAPED_OBJECTS =  \
+       $(__shaped_os2_lib_res) \
        shaped_shaped.o \
        $(__shaped___win32rc)
 WX_VERSION = 2.5.1
@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o
 @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle
+@COND_PLATFORM_OS2_1@__shaped_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -150,8 +153,8 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc shaped.app/Contents/Resources/shaped.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc shaped.app/Contents/Resources/shaped.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@shaped_bundle: shaped.app/Contents/PkgInfo