reversed change

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

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 27fa301fbe7f4b96670d9f26aba3fe1c68626b03..0732d09f80a0095b55ba5cbc51cc7ff4f9313002 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -37,14 +37,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-PENGUIN_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../../samples $(CFLAGS)
-PENGUIN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS)
+PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)

 PENGUIN_OBJECTS =  \
 PENGUIN_OBJECTS =  \

+       $(__penguin_os2_lib_res) \

        penguin_penguin.o \
        penguin_lw.o \
        penguin_trackball.o \
        penguin_penguin.o \
        penguin_lw.o \
        penguin_trackball.o \


@@ -108,6 +110,8 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
 @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
 @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

+@COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -159,8 +163,8 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
        
        
        ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
        
        

-       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
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc penguin.app/Contents/Resources/penguin.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns penguin.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo