IsDialogMessage fix

[wxWidgets.git] / contrib / samples / ogl / studio / Makefile.in

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 631d77b40242152839972725634e3c38e40508c8..77fc218289457b8071ced06d1a1159d8120ecbc9 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -52,6 +53,8 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
+@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
@@ -82,7 +85,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 -i \
-       $(srcdir)/../../../include -o studio Carbon.r \
+       $(srcdir)/../../../include -o studio$(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_ADV_p = \
@@ -93,6 +96,9 @@ COND_MONOLITHIC_0___WXLIB_ADV_p = \
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -100,18 +106,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@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = $(SETFILE) -a C studio
+@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
 @COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
 
 ### Targets: ###
 
-all: studio $(__studio_bundle___depname) data
+all: studio$(EXEEXT) $(__studio_bundle___depname) data
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f studio
+       rm -f studio$(EXEEXT)
        rm -rf studio.app
 
 data: 
@@ -129,13 +136,13 @@ install: all
 
 install-strip: install
 
-studio: $(STUDIO_OBJECTS) $(__studio___win32rc)
-       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__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)
+studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
+       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__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)
        $(__studio___mac_rezcmd)
        $(__studio___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-studio.app/Contents: studio $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p studio.app/Contents
        mkdir -p studio.app/Contents/MacOS
        mkdir -p studio.app/Contents/Resources
@@ -150,46 +157,46 @@ studio.app/Contents: studio $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
        echo -n "APPL????" >studio.app/Contents/PkgInfo
        
        
-       ln -f studio studio.app/Contents/MacOS/studio
+       ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents
+@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents/PkgInfo
 
 studio_cspalette.o: $(srcdir)/cspalette.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_csprint.o: $(srcdir)/csprint.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_dialogs.o: $(srcdir)/dialogs.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_doc.o: $(srcdir)/doc.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_mainfrm.o: $(srcdir)/mainfrm.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_project.o: $(srcdir)/project.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_shapes.o: $(srcdir)/shapes.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_studio.o: $(srcdir)/studio.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_studio_rc.o: $(srcdir)/studio.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 --include-dir $(srcdir)/../../../include
 
 studio_symbols.o: $(srcdir)/symbols.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_view.o: $(srcdir)/view.cpp
-       $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 uninstall: