overseeing the obvious, there is already a perfect scroll call for HIView...

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

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 601433d569405e808536ab720fde2994706568d4..78a46f256064b8c4c2a08b353eb056c6111539bd 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -102,13 +102,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-       $(srcdir)/../../../samples -o penguin$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -o penguin$(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)
 
 ### Targets: ###
@@ -137,7 +137,7 @@ penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
        $(__penguin___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-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
+penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p penguin.app/Contents
        mkdir -p penguin.app/Contents/MacOS
        mkdir -p penguin.app/Contents/Resources
@@ -146,7 +146,7 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/penguin/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >penguin.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >penguin.app/Contents/Info.plist
        
        
        echo -n "APPL????" >penguin.app/Contents/PkgInfo
@@ -156,7 +156,7 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        
        
        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
+       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo
 
@@ -178,7 +178,7 @@ penguin_trackball.o: $(srcdir)/trackball.c
        $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $<
 
 penguin_penguin_rc.o: $(srcdir)/penguin.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --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 --include-dir $(top_srcdir)/include
 
 
 # Include dependency info, if present: