]> git.saurik.com Git - wxWidgets.git/blobdiff - demos/fractal/Makefile.in
gtk_frame_focus_out_callback can be called with g_activeFrame
[wxWidgets.git] / demos / fractal / Makefile.in
index 3f6a89cea86b2add8d46df2f7034dbe235a2efec..71c147f46986035a0453ce84365e075a9287159e 100644 (file)
@@ -36,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.2
 WX_RELEASE = 2.5
+WX_VERSION = $(WX_RELEASE).3
 LIBDIRNAME = $(top_builddir)lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -77,14 +77,14 @@ COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \
 @COND_TOOLKIT_MAC@____fractal_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     fractal.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 @COND_PLATFORM_WIN32_1@__fractal___win32rc = fractal_fractal_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
@@ -98,7 +98,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -107,7 +107,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 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 -i $(top_srcdir)/include -o fractal$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -136,7 +136,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
        $(__fractal___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fractal.app/Contents
        mkdir -p fractal.app/Contents/MacOS
        mkdir -p fractal.app/Contents/Resources
@@ -154,7 +154,7 @@ fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fractal.app/Contents/Resources/fractal.rsrc
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc fractal.app/Contents/Resources/fractal.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fractal_bundle: $(____fractal_BUNDLE_TGT_REF_DEP)