X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..a67c56641d3a1a22764570f9d487ba916e4ade3c:/samples/opengl/penguin/Makefile.in?ds=sidebyside

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 9660f7b80c..27fa301fbe 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -18,9 +18,11 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+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@
@@ -47,7 +49,7 @@ PENGUIN_OBJECTS =  \
 	penguin_lw.o \
 	penguin_trackball.o \
 	$(__penguin___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -85,7 +87,7 @@ WX_VERSION = 2.5.0
 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 penguin$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.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)
@@ -101,6 +103,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C penguin$(EXEEXT)
+COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep penguin$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_penguin_rc.o
 @COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle
 
@@ -130,12 +135,13 @@ install: all
 install-strip: install
 
 penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
-	$(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+	$(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 	$(__penguin___mac_rezcmd)
 	$(__penguin___mac_setfilecmd)
+	$(__penguin___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p penguin.app/Contents
 	mkdir -p penguin.app/Contents/MacOS
 	mkdir -p penguin.app/Contents/Resources
@@ -153,7 +159,7 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc penguin.app/Contents/Resources/penguin.rsrc
+	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc penguin.app/Contents/Resources/penguin.rsrc
 	ln -f $(top_srcdir)/src/mac/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo
@@ -165,7 +171,7 @@ penguin_penguin.o: $(srcdir)/penguin.cpp
 	$(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $<
 
 penguin_penguin_rc.o: $(srcdir)/penguin.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 $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
 
 penguin_trackball.o: $(srcdir)/trackball.c
 	$(CCC) -c -o $@ $(PENGUIN_CFLAGS) $<