projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IsExposed() needs to reverse the direction in RTL.
[wxWidgets.git]
/
samples
/
opengl
/
isosurf
/
Makefile.in
diff --git
a/samples/opengl/isosurf/Makefile.in
b/samples/opengl/isosurf/Makefile.in
index 8c1492f48e707c58f80d41513b44241193d241ef..1ac98920202acced52ed6d1c6399373164fac5b8 100644
(file)
--- a/
samples/opengl/isosurf/Makefile.in
+++ b/
samples/opengl/isosurf/Makefile.in
@@
-1,6
+1,6
@@
# =========================================================================
# This makefile was generated by
# =========================================================================
# This makefile was generated by
-# Bakefile 0.
1.9
(http://bakefile.sourceforge.net)
+# Bakefile 0.
2.0
(http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# Do not modify, all changes will be overwritten!
# =========================================================================
@@
-11,7
+11,8
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
EXEEXT = @EXEEXT@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
SETFILE = @SETFILE@
NM = @NM@
srcdir = @srcdir@
SETFILE = @SETFILE@
NM = @NM@
srcdir = @srcdir@
@@
-26,6
+27,7
@@
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
@@
-37,7
+39,7
@@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.7
DESTDIR =
WX_RELEASE = 2.7
-WX_VERSION = $(WX_RELEASE).
0
+WX_VERSION = $(WX_RELEASE).
1
LIBDIRNAME = $(top_builddir)lib
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
LIBDIRNAME = $(top_builddir)lib
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@
-85,6
+87,10
@@
ISOSURF_OBJECTS = \
COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd)
COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
@COND_PLATFORM_OS2_1@__isosurf_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
@COND_PLATFORM_OS2_1@__isosurf_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@@
-120,11
+126,11
@@
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RE
SCOMP
) -d __DARWIN__ -t APPL -d \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RE
Z
) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../samples
-i $(top_srcdir)/include -o isosurf$(EXEEXT)
\
- Carbon.r sample.r
+ $(srcdir)/../../../samples
$(__RCDEFDIR_p) -i $(top_srcdir)/include -o
\
+
isosurf$(EXEEXT)
Carbon.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@
-147,7
+153,7
@@
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
-@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_FOR_BASE) $(EXTRALIBS_FOR_GUI
)
+@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(
EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE
)
@COND_USE_OPENGL_1@ $(__isosurf___mac_rezcmd)
@COND_USE_OPENGL_1@ $(__isosurf___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd)
@COND_USE_OPENGL_1@ $(__isosurf___mac_rezcmd)
@COND_USE_OPENGL_1@ $(__isosurf___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd)
@@
-188,7
+194,7
@@
data:
done
isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc
done
isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc
- $(
RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
--include-dir $(top_srcdir)/include
+ $(
WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1)
--include-dir $(top_srcdir)/include
isosurf_isosurf.o: $(srcdir)/isosurf.cpp
$(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp
isosurf_isosurf.o: $(srcdir)/isosurf.cpp
$(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp