Remove wxASSERT(!m_windowKey) and wxASSERT(!m_windowMain). When a window

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

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 2f9cb10afe2e7c1651452fd4035a5c19ba99dbe0..9660f7b80ca5fe28c9e7de9c56a71ab70e85e52b 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -15,6 +15,7 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -50,6 +51,10 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
+@COND_DEPS_TRACKING_0@CCC = $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -79,7 +84,7 @@ WX_VERSION = 2.5.0
 @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 penguin Carbon.r \
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o penguin$(EXEEXT) Carbon.r \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@@ -94,18 +99,19 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = $(SETFILE) -a C penguin
+@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C penguin$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_penguin_rc.o
 @COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle
 
 ### Targets: ###
 
-all: penguin $(__penguin_bundle___depname) data
+all: penguin$(EXEEXT) $(__penguin_bundle___depname) data
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f penguin
+       rm -f penguin$(EXEEXT)
        rm -rf penguin.app
 
 data: 
@@ -123,13 +129,13 @@ install: all
 
 install-strip: install
 
-penguin: $(PENGUIN_OBJECTS) $(__penguin___win32rc)
+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)
        $(__penguin___mac_rezcmd)
        $(__penguin___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-penguin.app/Contents: penguin $(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).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p penguin.app/Contents
        mkdir -p penguin.app/Contents/MacOS
        mkdir -p penguin.app/Contents/Resources
@@ -144,25 +150,25 @@ penguin.app/Contents: penguin $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/
        echo -n "APPL????" >penguin.app/Contents/PkgInfo
        
        
-       ln -f penguin penguin.app/Contents/MacOS/penguin
+       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 $(top_srcdir)/src/mac/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents
+@COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo
 
 penguin_lw.o: $(srcdir)/lw.cpp
-       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $<
 
 penguin_penguin.o: $(srcdir)/penguin.cpp
-       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $<
+       $(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
 
 penguin_trackball.o: $(srcdir)/trackball.c
-       $(CC) -c -o $@ $(PENGUIN_CFLAGS) $<
+       $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $<
 
 uninstall: