compilation fix for tooltip patch code applied by Julian and w32api

[wxWidgets.git] / samples / opengl / cube / Makefile.in

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index dddb97e4e5eebcc7d6d7ca1c1100802c9cff47c8..771f22590d91810c14aa0d57236fcb3b86f9531e 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -20,6 +20,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -34,14 +35,15 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CUBE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples $(CXXFLAGS)
+CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
 CUBE_OBJECTS =  \
+       $(__cube_os2_lib_res) \
        cube_cube.o \
        $(__cube___win32rc)
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -75,9 +77,9 @@ WX_VERSION = 2.5.0
 @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 cube$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../../samples -o cube$(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)
@@ -93,9 +95,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C cube$(EXEEXT)
-@COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = emxbind -ep cube$(EXEEXT)
+COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
+       pmwin.763 ; then emxbind -ep cube$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__cube___win32rc = cube_cube_rc.o
 @COND_PLATFORM_MACOSX_1@__cube_bundle___depname = cube_bundle
+@COND_PLATFORM_OS2_1@__cube_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -114,7 +120,7 @@ cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
        $(__cube___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p cube.app/Contents
        mkdir -p cube.app/Contents/MacOS
        mkdir -p cube.app/Contents/Resources
@@ -132,8 +138,8 @@ cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc cube.app/Contents/Resources/cube.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns cube.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc cube.app/Contents/Resources/cube.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns cube.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@cube_bundle: cube.app/Contents/PkgInfo
 
@@ -141,7 +147,7 @@ cube_cube.o: $(srcdir)/cube.cpp
        $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $<
 
 cube_cube_rc.o: $(srcdir)/cube.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
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile