Compare commits
1 Commits
wxPy-2.8.4
...
wxPy_2_6_0
Author | SHA1 | Date | |
---|---|---|---|
|
43208478f1 |
66
.cvsignore
66
.cvsignore
@@ -1,12 +1,78 @@
|
||||
system.list
|
||||
bin
|
||||
.gdb_history
|
||||
Test
|
||||
config.cache
|
||||
configarg.cache
|
||||
config.status
|
||||
system.list
|
||||
linux.system.cache
|
||||
wx-config
|
||||
config.log
|
||||
linux-gnu.system.cache
|
||||
*.dsp
|
||||
*.dsw
|
||||
*.plg
|
||||
*.opt
|
||||
*.aps
|
||||
*.ncb
|
||||
*.pro
|
||||
*.opt
|
||||
*.d
|
||||
*.swp
|
||||
*.swo
|
||||
*.vcp
|
||||
*.vcw
|
||||
Release
|
||||
Debug
|
||||
ReleaseUnicode
|
||||
DebugUnicode
|
||||
ReleaseUnicodeARM
|
||||
DebugUnicodeARM
|
||||
ReleaseUnicodeMIPS
|
||||
DebugUnicodeMIPS
|
||||
ReleaseUnicodeSH3
|
||||
DebugUnicodeSH3
|
||||
ReleaseUnicodeX86
|
||||
DebugUnicodeX86
|
||||
ReleaseUnicodeX86EM
|
||||
DebugUnicodeX86EM
|
||||
ReleaseDLL
|
||||
DebugDLL
|
||||
ReleaseUnicodeDLL
|
||||
DebugUnicodeDLL
|
||||
UnivRelease
|
||||
UnivDebug
|
||||
BaseRelease
|
||||
BaseDebug
|
||||
BaseReleaseDLL
|
||||
BaseDebugDLL
|
||||
build-debug
|
||||
robert
|
||||
stamp-h.in
|
||||
Makefile
|
||||
setup.h
|
||||
stamp-h
|
||||
libtool
|
||||
base
|
||||
gtk
|
||||
gtk2
|
||||
motif
|
||||
win32
|
||||
x11
|
||||
univ
|
||||
univ-debug
|
||||
univ-release
|
||||
base-debug
|
||||
gtk-debug
|
||||
motif-debug
|
||||
win32-debug
|
||||
base-release
|
||||
gtk-release
|
||||
motif-release
|
||||
win32-release
|
||||
*tags
|
||||
log
|
||||
univtags.cmd
|
||||
.DS_Store
|
||||
autom4te.cache
|
||||
|
30
BuildCVS.txt
30
BuildCVS.txt
@@ -27,7 +27,7 @@ Cygwin is available at http://www.cygwin.com/
|
||||
If you are using Cygwin or MinGW together with the MSYS environment, you
|
||||
can build the library using configure (see "Unix ports" and
|
||||
"Windows using configure" below). You can also
|
||||
build wxWidgets without configure using native makefile, but only with
|
||||
build wxWindows without configure using native makefile, but only with
|
||||
MinGW. Using Cygwin together with Windows makefile is no longer supported.
|
||||
|
||||
If building with MinGW without configure:
|
||||
@@ -49,18 +49,18 @@ If using configure, Unix instructions apply.
|
||||
|
||||
c) Build instructions
|
||||
|
||||
Assumming that you installed the wxWidgets sources
|
||||
into c:\wxWidgets:
|
||||
Assumming that you installed the wxWindows sources
|
||||
into c:\wxWindows:
|
||||
|
||||
-> Copy c:\wxWidgets\include\wx\msw\setup0.h
|
||||
to c:\wxWidgets\include\wx\msw\setup.h
|
||||
-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
|
||||
the features you would like to compile wxWidgets with[out].
|
||||
-> Copy c:\wxWindows\include\wx\msw\setup0.h
|
||||
to c:\wxWindows\include\wx\msw\setup.h
|
||||
-> Edit c:\wxWindows\include\wx\msw\setup.h to choose
|
||||
the features you would like to compile wxWindows with[out].
|
||||
|
||||
and std iostreams are disabled with
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
-> type: cd c:\wxWidgets\build\msw
|
||||
-> type: cd c:\wxWindows\build\msw
|
||||
-> type: make -f makefile.gcc (if using GNU tools)
|
||||
or type: nmake -f makefile.vc (if using MS VC++)
|
||||
etc.
|
||||
@@ -72,7 +72,7 @@ d) Borland (including free command line tools)
|
||||
|
||||
See docs/msw/install.txt for details; in brief:
|
||||
|
||||
-> type cd c:\wxWidgets\build\msw
|
||||
-> type cd c:\wxWindows\build\msw
|
||||
-> type make -f makefile.bcc
|
||||
|
||||
You can customize many things in the build process, detailed description is
|
||||
@@ -95,9 +95,9 @@ directory, which just calls autoconf). Note that you usually don't
|
||||
need to do this because configure is included in CVS.
|
||||
|
||||
Set WXWIN environment variable to the base directory such
|
||||
as ~/wxWidgets (this is actually not really needed).
|
||||
as ~/wxWindows (this is actually not really needed).
|
||||
|
||||
-> type: export WXWIN=~/wxWidgets
|
||||
-> type: export WXWIN=~/wxWindows
|
||||
-> type: md mybuild
|
||||
-> type: cd mybuild
|
||||
-> type: ../configure --with-motif
|
||||
@@ -116,7 +116,7 @@ yet complete).
|
||||
III) Windows using configure
|
||||
----------------------------------------
|
||||
|
||||
wxWidgets can be built on Windows using MSYS (see
|
||||
wxWindows can be built on Windows using MSYS (see
|
||||
http://www.mingw.org/), which is a POSIX build environment
|
||||
for Windows. With MSYS you can just ./configure && make (see also VII,
|
||||
Unix->Windows cross-compiling using configure).
|
||||
@@ -128,7 +128,7 @@ IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
|
||||
----------------------------------------
|
||||
|
||||
Refer to the readme.txt and install.txt files in docs/mac to build
|
||||
wxWidgets under Classic Mac OS using CodeWarrior.
|
||||
wxWindows under Classic Mac OS using CodeWarrior.
|
||||
|
||||
If you are checking out the CVS sources using cvs under Mac OS X and
|
||||
compiling under Classic Mac OS:
|
||||
@@ -182,9 +182,9 @@ preferable if you write portable C(++). ]
|
||||
|
||||
You might want to build both Unix and Windows binaries in the same source
|
||||
tree; to do this make subdirs for each e.g. unix and win32. If you've
|
||||
already build wxWidgets in the main dir, do a 'make distclean' there,
|
||||
already build wxWindows in the main dir, do a 'make distclean' there,
|
||||
otherwise configure will get confused. (In any case, read the section 'Unix
|
||||
using configure' and make sure you're able to build a native wxWidgets
|
||||
using configure' and make sure you're able to build a native wxWindows
|
||||
library; cross-compiling errors can be pretty obscure and you'll want to be
|
||||
sure that your configure setup is basically sound.)
|
||||
|
||||
|
9929
Makefile.in
9929
Makefile.in
File diff suppressed because it is too large
Load Diff
297
acinclude.m4
297
acinclude.m4
@@ -43,15 +43,15 @@ for ac_dir in $1 /usr/include;
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
|
||||
dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_libraries
|
||||
dnl to the full name of the file that was found or leaves it empty if not found
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
|
||||
[
|
||||
ac_find_libraries=
|
||||
for ac_dir in $1;
|
||||
ac_find_libraries=
|
||||
for ac_dir in $1 /usr/lib;
|
||||
do
|
||||
for ac_extension in a so sl dylib dll.a; do
|
||||
for ac_extension in a so sl dylib; do
|
||||
if test -f "$ac_dir/lib$2.$ac_extension"; then
|
||||
ac_find_libraries=$ac_dir
|
||||
break 2
|
||||
@@ -60,19 +60,6 @@ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
|
||||
done
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl return list of standard library paths
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl return all default locations:
|
||||
dnl - /usr/lib: standard
|
||||
dnl - /usr/lib32: n32 ABI on IRIX
|
||||
dnl - /usr/lib64: n64 ABI on IRIX
|
||||
dnl - /usr/lib/64: 64 bit ABI on Solaris and Linux x86-64
|
||||
dnl
|
||||
dnl NB: if any of directories in the list is not a subdir of /usr, code setting
|
||||
dnl wx_cv_std_libpath needs to be updated
|
||||
AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Path to include, already defined
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -93,25 +80,16 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
|
||||
dnl
|
||||
dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
|
||||
dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
|
||||
dnl after calling this function
|
||||
dnl Path to link, already defined
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_DEFUN([WX_LINK_PATH_EXIST],
|
||||
[
|
||||
dnl never add -L/usr/libXXX explicitely to libpath
|
||||
if test "$1" = "default location"; then
|
||||
echo "$2" | grep "\-L$1" > /dev/null
|
||||
result=$?
|
||||
if test $result = 0; then
|
||||
ac_path_to_link=""
|
||||
else
|
||||
echo "$2" | grep "\-L$1" > /dev/null
|
||||
result=$?
|
||||
if test $result = 0; then
|
||||
ac_path_to_link=""
|
||||
else
|
||||
ac_path_to_link=" -L$1"
|
||||
fi
|
||||
ac_path_to_link=" -L$1"
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -132,7 +110,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
AC_CHECK_HEADERS(iostream,,, [ ])
|
||||
AC_CHECK_HEADERS(iostream)
|
||||
|
||||
if test "$ac_cv_header_iostream" = "yes" ; then
|
||||
ifelse([$1], , :, [$1])
|
||||
@@ -227,72 +205,6 @@ AC_DEFUN([WX_CPP_EXPLICIT],
|
||||
fi
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl WX_CHECK_FUNCS(FUNCTIONS...,
|
||||
dnl [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND],
|
||||
dnl [EXTRA-DEFINES-AND-INCLUDES],
|
||||
dnl [EXTRA-TEST-CODE])
|
||||
dnl
|
||||
dnl Checks that the functions listed in FUNCTIONS exist in the headers and the
|
||||
dnl libs. For each function, if it is found then defines 'HAVE_FUNCTION' and
|
||||
dnl executes ACTION-IF-FOUND, otherwise executes ACTION-IF-NOT-FOUND.
|
||||
dnl
|
||||
dnl The code from EXTRA-DEFINES-AND-INCLUDES is inserted into the test before
|
||||
dnl the default headers are included, and EXTRA-TEST-CODE is inserted into
|
||||
dnl the main() function after the default test for existence.
|
||||
dnl
|
||||
dnl Examples:
|
||||
dnl # the simple case
|
||||
dnl WX_CHECK_FUNCS(stat)
|
||||
dnl # use break to finish the loop early
|
||||
dnl WX_CHECK_FUNCS(mkstemp mktemp, break)
|
||||
dnl # extra defines
|
||||
dnl WX_CHECK_FUNCS(strtok_r, [], [], [#define _RREENTRANT])
|
||||
dnl # extra includes
|
||||
dnl WX_CHECK_FUNCS(swprintf, [], [], [#include <wchar.h>])
|
||||
dnl # checking the signature with extra test code
|
||||
dnl WX_CHECK_FUNCS(gettimeofday, [], [], [#include <sys/time.h>]
|
||||
dnl [struct timeval tv; struct timezone tz; gettimeofday(&tv, &tz)])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN([WX_CHECK_FUNCS],
|
||||
[
|
||||
for wx_func in $1
|
||||
do
|
||||
AC_CACHE_CHECK(
|
||||
[for $wx_func],
|
||||
[wx_cv_func_$wx_func],
|
||||
[
|
||||
AC_LINK_IFELSE(
|
||||
[
|
||||
AC_LANG_PROGRAM(
|
||||
[
|
||||
$4
|
||||
AC_INCLUDES_DEFAULT
|
||||
],
|
||||
[
|
||||
#ifndef $wx_func
|
||||
&$wx_func;
|
||||
#endif
|
||||
$5
|
||||
])
|
||||
],
|
||||
[eval wx_cv_func_$wx_func=yes],
|
||||
[eval wx_cv_func_$wx_func=no])
|
||||
])
|
||||
|
||||
if eval test \$wx_cv_func_$wx_func = yes
|
||||
then
|
||||
AC_DEFINE_UNQUOTED([HAVE_`echo $wx_func | tr 'a-z' 'A-Z'`])
|
||||
$2
|
||||
else
|
||||
:
|
||||
$3
|
||||
fi
|
||||
done
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -401,11 +313,10 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
||||
])
|
||||
|
||||
dnl this macro checks for a command line argument and caches the result
|
||||
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
|
||||
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
|
||||
AC_DEFUN([WX_ARG_WITH],
|
||||
[
|
||||
withstring=$4
|
||||
AC_MSG_CHECKING([for --${withstring:-with}-$1])
|
||||
AC_MSG_CHECKING([for --with-$1])
|
||||
no_cache=0
|
||||
AC_ARG_WITH($1, [$2],
|
||||
[
|
||||
@@ -446,7 +357,7 @@ dnl message when running configure instead of the default "checking for
|
||||
dnl --enable-foo" one whih is useful for the options enabled by default
|
||||
AC_DEFUN([WX_ARG_ENABLE],
|
||||
[
|
||||
enablestring=$4
|
||||
enablestring=$4
|
||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||
no_cache=0
|
||||
AC_ARG_ENABLE($1, [$2],
|
||||
@@ -481,47 +392,6 @@ AC_DEFUN([WX_ARG_ENABLE],
|
||||
])
|
||||
|
||||
|
||||
dnl Like WX_ARG_ENABLE but accepts a parameter.
|
||||
dnl
|
||||
dnl Usage:
|
||||
dnl WX_ARG_ENABLE_PARAM(option, helpmessage, variable-name, enablestring)
|
||||
dnl
|
||||
dnl Example:
|
||||
dnl WX_ARG_ENABLE_PARAM(foo, [[ --enable-foo[=bar] use foo]], wxUSE_FOO)
|
||||
dnl
|
||||
dnl --enable-foo wxUSE_FOO=yes
|
||||
dnl --disable-foo wxUSE_FOO=no
|
||||
dnl --enable-foo=bar wxUSE_FOO=bar
|
||||
dnl <not given> value from configarg.cache or wxUSE_FOO=no
|
||||
dnl
|
||||
AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
||||
[
|
||||
enablestring=$4
|
||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||
no_cache=0
|
||||
AC_ARG_ENABLE($1, [$2],
|
||||
[
|
||||
wx_cv_use_$1="$3='$enableval'"
|
||||
],
|
||||
[
|
||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
wx_cv_use_$1='$3='$DEFAULT_$3
|
||||
else
|
||||
no_cache=1
|
||||
wx_cv_use_$1="$3=no"
|
||||
fi
|
||||
])
|
||||
|
||||
eval "$wx_cv_use_$1"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$$3])
|
||||
])
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Linker features test
|
||||
dnl ===========================================================================
|
||||
@@ -535,80 +405,81 @@ dnl call WX_VERSIONED_SYMBOLS(versionfile)
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_DEFUN([WX_VERSIONED_SYMBOLS],
|
||||
[
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw* )
|
||||
dnl although ld does support version script option on these
|
||||
dnl platforms, it doesn't make much sense to use it under Win32
|
||||
dnl and, moreover, this breaks linking because of a bug in handling
|
||||
dnl paths in -Wl,--version-script,path option (if we ever do need
|
||||
dnl to use it for cygwin/mingw32, keep in mind that replacing last
|
||||
dnl comma with the equal sign works) so
|
||||
dnl simply disable it
|
||||
wx_cv_version_script=no
|
||||
;;
|
||||
found_versioning=no
|
||||
|
||||
*)
|
||||
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
|
||||
[
|
||||
echo "VER_1 { *; };" >conftest.sym
|
||||
echo "int main() { return 0; }" >conftest.cpp
|
||||
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
|
||||
dnl in the script.
|
||||
dnl dnl Check for known non-gcc cases:
|
||||
dnl case "${host}" in
|
||||
dnl *-*-solaris2* )
|
||||
dnl if test "x$GCC" != "xyes" ; then
|
||||
dnl LDFLAGS_VERSIONING="-M $1"
|
||||
dnl found_versioning=yes
|
||||
dnl fi
|
||||
dnl ;;
|
||||
dnl esac
|
||||
|
||||
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
|
||||
if test $found_versioning = no ; then
|
||||
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
|
||||
[
|
||||
echo "VER_1 { *; };" >conftest.sym
|
||||
echo "int main() { return 0; }" >conftest.cpp
|
||||
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
|
||||
if test -s conftest.stderr ; then
|
||||
wx_cv_version_script=no
|
||||
else
|
||||
wx_cv_version_script=yes
|
||||
fi
|
||||
else
|
||||
wx_cv_version_script=no
|
||||
fi
|
||||
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
|
||||
if test -s conftest.stderr ; then
|
||||
wx_cv_version_script=no
|
||||
else
|
||||
wx_cv_version_script=yes
|
||||
fi
|
||||
else
|
||||
wx_cv_version_script=no
|
||||
fi
|
||||
dnl There's a problem in some old linkers with --version-script that
|
||||
dnl can cause linking to fail when you have objects with vtables in
|
||||
dnl libs 3 deep. This is known to happen in netbsd and openbsd with
|
||||
dnl ld 2.11.2.
|
||||
dnl
|
||||
dnl To test for this we need to make some shared libs and
|
||||
dnl unfortunately we can't be sure of the right way to do that. If the
|
||||
dnl first two compiles don't succeed then it looks like the test isn't
|
||||
dnl working and the result is ignored, but if OTOH the first two
|
||||
dnl succeed but the third does not then the bug has been detected and
|
||||
dnl the --version-script flag is dropped.
|
||||
if test $wx_cv_version_script = yes
|
||||
then
|
||||
echo "struct B { virtual ~B() { } }; \
|
||||
struct D : public B { }; \
|
||||
void F() { D d; }" > conftest.cpp
|
||||
|
||||
dnl There's a problem in some old linkers with --version-script that
|
||||
dnl can cause linking to fail when you have objects with vtables in
|
||||
dnl libs 3 deep. This is known to happen in netbsd and openbsd with
|
||||
dnl ld 2.11.2.
|
||||
dnl
|
||||
dnl To test for this we need to make some shared libs and
|
||||
dnl unfortunately we can't be sure of the right way to do that. If the
|
||||
dnl first two compiles don't succeed then it looks like the test isn't
|
||||
dnl working and the result is ignored, but if OTOH the first two
|
||||
dnl succeed but the third does not then the bug has been detected and
|
||||
dnl the --version-script flag is dropped.
|
||||
if test $wx_cv_version_script = yes
|
||||
then
|
||||
echo "struct B { virtual ~B() { } }; \
|
||||
struct D : public B { }; \
|
||||
void F() { D d; }" > conftest.cpp
|
||||
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
|
||||
AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
|
||||
then
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
|
||||
then
|
||||
wx_cv_version_script=yes
|
||||
else
|
||||
wx_cv_version_script=no
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
|
||||
rm -f conftest1.output conftest2.output conftest3.output
|
||||
])
|
||||
|
||||
if test $wx_cv_version_script = yes ; then
|
||||
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
|
||||
AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
|
||||
then
|
||||
if AC_TRY_COMMAND([
|
||||
$CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
|
||||
-Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
|
||||
then
|
||||
wx_cv_version_script=yes
|
||||
else
|
||||
wx_cv_version_script=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
|
||||
rm -f conftest1.output conftest2.output conftest3.output
|
||||
])
|
||||
if test $wx_cv_version_script = yes ; then
|
||||
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
3000
aclocal.m4
vendored
3000
aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
42
art/back.xpm
42
art/back.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" .XX........ ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XX........ ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" .XX........ ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XX........ ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
@@ -1,57 +1,29 @@
|
||||
/* XPM */
|
||||
static char *cdrom_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"= c #9BACC2",
|
||||
"y c #547B99",
|
||||
"$ c #FFFFFF",
|
||||
"@ c #839CB5",
|
||||
"o c #547897",
|
||||
"4 c #4D7492",
|
||||
"% c #F1F4F7",
|
||||
"X c #5A809C",
|
||||
"< c #8497A5",
|
||||
"0 c #7898AD",
|
||||
"+ c #CAD2DC",
|
||||
"r c #ACAEB2",
|
||||
"2 c #BECAD9",
|
||||
"* c #65839D",
|
||||
"e c #DCE2EA",
|
||||
"- c #ADBED2",
|
||||
"t c #597B9A",
|
||||
" c None",
|
||||
"1 c #467291",
|
||||
"9 c #D6DFE7",
|
||||
"O c #7393AB",
|
||||
"u c #49708B",
|
||||
"5 c #A0BACB",
|
||||
"& c #AABFCD",
|
||||
"8 c #B9CBD5",
|
||||
"; c #B4C4D3",
|
||||
": c #6F90A6",
|
||||
"3 c #A8B6CA",
|
||||
"# c #ADBACE",
|
||||
"w c #E4E9ED",
|
||||
". c #8EA9BC",
|
||||
"> c #B3BFD1",
|
||||
", c #C2CBDB",
|
||||
"6 c #C0D1DC",
|
||||
"7 c #A2B3C5",
|
||||
"q c #5D7C93",
|
||||
/* pixels */
|
||||
" .XooOo+ ",
|
||||
" X@#$$$%o& ",
|
||||
" *=-;$$$$$o+ ",
|
||||
" +O#;-$$$$$$: ",
|
||||
" o=>,-<1<$2-o ",
|
||||
" o3>--1$122-* ",
|
||||
" o=--$<4<22-X ",
|
||||
" o5$$$$$26;7* ",
|
||||
" X%$$$$2;-X8 ",
|
||||
" 90*9$$$-7Xqo ",
|
||||
" wXwe@O44X4<r<o ",
|
||||
" X8628>22222<<*4",
|
||||
" ttyyyoo4441uuuo",
|
||||
" t>$$$$$$$$$$$>o",
|
||||
" XXXtyyyoo44411u"
|
||||
};
|
||||
/* XPM */
|
||||
static char *cdrom_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 10 1",
|
||||
" s None c None",
|
||||
". c #808080",
|
||||
"X c #c0c0c0",
|
||||
"o c Yellow",
|
||||
"O c Blue",
|
||||
"+ c Black",
|
||||
"@ c Gray100",
|
||||
"# c #008080",
|
||||
"$ c Green",
|
||||
"% c #008000",
|
||||
" ... ",
|
||||
" ..XoX.. ",
|
||||
" .O.XoXXX+ ",
|
||||
" ...O.oXXXX+ ",
|
||||
" .O..X.XXXX+ ",
|
||||
" ....X.+..XXX+",
|
||||
" .XXX.+@+.XXX+",
|
||||
" .X@XX.+.X@@X+",
|
||||
" .....X...#XX@+ ",
|
||||
".@@@...XXo.O@X+ ",
|
||||
".@XXX..XXoXOO+ ",
|
||||
".@++++..XoX+++ ",
|
||||
".@$%@@XX+++X.+ ",
|
||||
".............+ ",
|
||||
" ++++++++++++ "};
|
||||
|
58
art/copy.xpm
58
art/copy.xpm
@@ -1,44 +1,26 @@
|
||||
/* XPM */
|
||||
static char *copy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"o c #97C4E7",
|
||||
"* c #FFFFFF",
|
||||
"@ c #60A9DA",
|
||||
"= c #D1E5F5",
|
||||
"& c #C3DDF1",
|
||||
". c #7EA6C0",
|
||||
"16 16 4 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
"o c #000080",
|
||||
" c None",
|
||||
"X c #2F93CD",
|
||||
"O c #85BBE2",
|
||||
", c #EFF6FC",
|
||||
"; c #DEEDF8",
|
||||
"+ c #72B2DD",
|
||||
"3 c #F7FBFD",
|
||||
"4 c #FAFCFE",
|
||||
": c #DAEAF7",
|
||||
"< c #E9F3FA",
|
||||
"1 c #E2EFF8",
|
||||
"- c #FDFDFE",
|
||||
"% c #B6D5EE",
|
||||
"$ c #A5CCEA",
|
||||
"> c #E5F0F9",
|
||||
"# c #AFD1EC",
|
||||
"2 c #F4F9FD",
|
||||
/* pixels */
|
||||
" .....XX ",
|
||||
" .oO+@X#X ",
|
||||
" .$oO+X##X ",
|
||||
" .%$o........ ",
|
||||
" .&%$.*=&#o.-. ",
|
||||
" .=&%.*;=&#.--. ",
|
||||
" .:=&.*>;=&.... ",
|
||||
" .>:=.*,>;=&#o. ",
|
||||
" .<1:.*2,>:=&#. ",
|
||||
" .2<1.*32,>:=&. ",
|
||||
" .32<.*432,>:=. ",
|
||||
" .32<.*-432,>:. ",
|
||||
" .....**-432,>. ",
|
||||
" .***-432,. ",
|
||||
" .......... "
|
||||
" ",
|
||||
"...... ",
|
||||
".XXXX.. ",
|
||||
".XXXX.X. ",
|
||||
".X..X.oooooo ",
|
||||
".XXXXXoXXXXoo ",
|
||||
".X....oXXXXoXo ",
|
||||
".XXXXXoX..Xoooo ",
|
||||
".X....oXXXXXXXo ",
|
||||
".XXXXXoX.....Xo ",
|
||||
"......oXXXXXXXo ",
|
||||
" oX.....Xo ",
|
||||
" oXXXXXXXo ",
|
||||
" ooooooooo ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,17 +1,17 @@
|
||||
/* XPM */
|
||||
static char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
"# c None",
|
||||
/* pixels */
|
||||
" ######## ",
|
||||
" #### ",
|
||||
"# ## #",
|
||||
"## ##",
|
||||
"### ###",
|
||||
"### ###",
|
||||
"## ##",
|
||||
"# ## #",
|
||||
" #### ",
|
||||
" ###### "};
|
||||
/* XPM */
|
||||
static char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
"# c None",
|
||||
/* pixels */
|
||||
" ######## ",
|
||||
" #### ",
|
||||
"# ## #",
|
||||
"## ##",
|
||||
"### ###",
|
||||
"### ###",
|
||||
"## ##",
|
||||
"# ## #",
|
||||
" #### ",
|
||||
" ###### "};
|
||||
|
59
art/cut.xpm
59
art/cut.xpm
@@ -1,46 +1,25 @@
|
||||
/* XPM */
|
||||
static char *cut_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"6 c #D8BDC0",
|
||||
": c #C3C3C4",
|
||||
"- c #FFFFFF",
|
||||
". c #6C6D70",
|
||||
"2 c #AD3A45",
|
||||
"o c #DBDBDB",
|
||||
"# c #939495",
|
||||
"< c #E42234",
|
||||
"& c #C3C5C8",
|
||||
"; c #C6CCD3",
|
||||
"% c #B7B7B8",
|
||||
"16 16 3 1",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
" c None",
|
||||
"* c #DFE0E2",
|
||||
"5 c #B69596",
|
||||
"3 c #9C2A35",
|
||||
"1 c #CFCFD0",
|
||||
", c #AB5C64",
|
||||
"+ c #D2D3D4",
|
||||
"$ c #BCBDBE",
|
||||
"@ c #C6C8CA",
|
||||
"> c #CDC0C1",
|
||||
"O c #826F72",
|
||||
"X c #979BA0",
|
||||
"4 c #9B8687",
|
||||
"= c #9FA0A0",
|
||||
/* pixels */
|
||||
" .X .o ",
|
||||
" O.+ @. ",
|
||||
" O. .. ",
|
||||
" O#$ %.& ",
|
||||
" O.*.. ",
|
||||
" #%#.. ",
|
||||
" O=-.. ",
|
||||
" #%#;. ",
|
||||
" OO:=O ",
|
||||
" >,,<, ,<,,1 ",
|
||||
" ><23<1 1<32<1 ",
|
||||
" ,2 4< <5 2, ",
|
||||
" <, ,2 2, ,< ",
|
||||
" 23,<5 5<,32 ",
|
||||
" 6225 522> "
|
||||
" ",
|
||||
" . . ",
|
||||
" . . ",
|
||||
" . . ",
|
||||
" .. .. ",
|
||||
" . . ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" X.X ",
|
||||
" X XXX ",
|
||||
" XXX X X ",
|
||||
" X X X X ",
|
||||
" X X X X ",
|
||||
" X X XX ",
|
||||
" XX ",
|
||||
" "
|
||||
};
|
||||
|
125
art/deffile.xpm
125
art/deffile.xpm
@@ -1,54 +1,83 @@
|
||||
/* XPM */
|
||||
static char *deffile_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 32 1",
|
||||
"= c #97C4E7",
|
||||
": c #72A8D2",
|
||||
"1 c #FFFFFF",
|
||||
"w c #839CB5",
|
||||
"X c #6B98B8",
|
||||
". c #5A89A6",
|
||||
"@ c #3A749C",
|
||||
", c #D1E5F5",
|
||||
"< c #67A1CF",
|
||||
"> c #F1F4F7",
|
||||
"e c #85A7BC",
|
||||
"% c #C3DDF1",
|
||||
"0 c #749BB4",
|
||||
"2 c #7EA6C0",
|
||||
"; c #5F9BC8",
|
||||
"16 16 61 1",
|
||||
"% c #E8E8EC",
|
||||
"k c #D9D9E0",
|
||||
"= c #E8E8ED",
|
||||
"V c #CACAD4",
|
||||
"8 c #D9D9E1",
|
||||
"h c #D2D2DA",
|
||||
"y c #E1E1E7",
|
||||
"l c #D2D2DB",
|
||||
"< c #E9E9ED",
|
||||
"t c #E9E9EE",
|
||||
"e c #DADAE1",
|
||||
"x c #E2E2E7",
|
||||
"+ c #F1F1F4",
|
||||
"m c #D3D3DB",
|
||||
"1 c #E2E2E8",
|
||||
"C c #D3D3DC",
|
||||
"$ c #EAEAEE",
|
||||
"4 c #DBDBE2",
|
||||
"M c #CCCCD6",
|
||||
"q c #E3E3E8",
|
||||
"f c #D4D4DC",
|
||||
"a c #E3E3E9",
|
||||
"v c #D4D4DD",
|
||||
"7 c #DCDCE2",
|
||||
": c #EBEBEF",
|
||||
"w c #DCDCE3",
|
||||
" c None",
|
||||
"O c #538DB3",
|
||||
"- c #85BBE2",
|
||||
"$ c #D6DFE7",
|
||||
"9 c #EFF6FC",
|
||||
"o c #6591AE",
|
||||
"4 c #F7FBFD",
|
||||
"8 c #FAFCFE",
|
||||
"6 c #DAEAF7",
|
||||
"7 c #E9F3FA",
|
||||
"q c #FDFDFE",
|
||||
"3 c #E2EFF8",
|
||||
"# c #8EA9BC",
|
||||
"& c #B6D5EE",
|
||||
"* c #A5CCEA",
|
||||
"5 c #F4F9FD",
|
||||
"+ c #4581AA",
|
||||
"O c #F3F3F5",
|
||||
"> c #E4E4E9",
|
||||
"& c #F3F3F6",
|
||||
"n c #D5D5DD",
|
||||
"6 c #E4E4EA",
|
||||
". c #C6C6D5",
|
||||
"g c #DDDDE3",
|
||||
"# c #ECECF0",
|
||||
"b c #CECED7",
|
||||
"j c #DDDDE4",
|
||||
"B c #CECED8",
|
||||
"0 c #E5E5EA",
|
||||
"p c #D6D6DE",
|
||||
"; c #EDEDF0",
|
||||
"3 c #DEDEE4",
|
||||
", c #EDEDF1",
|
||||
"Z c #CFCFD8",
|
||||
"u c #DEDEE5",
|
||||
"o c #F5F5F7",
|
||||
"c c #D7D7DE",
|
||||
"- c #E6E6EB",
|
||||
"r c #D7D7DF",
|
||||
"A c #C8C8D3",
|
||||
"s c #DFDFE5",
|
||||
"@ c #EEEEF2",
|
||||
"z c #D0D0D9",
|
||||
"X c #9494AD",
|
||||
"5 c #E7E7EB",
|
||||
"i c #D8D8DF",
|
||||
"9 c #E7E7EC",
|
||||
"d c #D8D8E0",
|
||||
"* c #EFEFF2",
|
||||
"2 c #E0E0E6",
|
||||
"N c #D1D1DA",
|
||||
/* pixels */
|
||||
" ..XooO+@#$ ",
|
||||
" .%%&*=-;:;> ",
|
||||
" .,,%&*=<1=X> ",
|
||||
" #%%%%&*211=X ",
|
||||
" #3-----<oXoO ",
|
||||
" #3456,%&*=-O ",
|
||||
" #3--------=O ",
|
||||
" #355736,%&*o ",
|
||||
" #3--------&o ",
|
||||
" #38459736,%X ",
|
||||
" #3--------,0 ",
|
||||
" #31q84597360 ",
|
||||
" #3--------3w ",
|
||||
" #3111q84597e ",
|
||||
" ##########e# ",
|
||||
" "
|
||||
" ........X ",
|
||||
" .oO+@#$%XX ",
|
||||
" .&+*#$=-XXX ",
|
||||
" .+*;:=->XXXX ",
|
||||
" .*,:<->1234X ",
|
||||
" .,:<5612378X ",
|
||||
" .:<90q23werX ",
|
||||
" .t90qyuweipX ",
|
||||
" .90ayswedpfX ",
|
||||
" .-aysg4dpfhX ",
|
||||
" .>ysj4kpflzX ",
|
||||
" .xsj4kcvlzbX ",
|
||||
" .234krnmzbMX ",
|
||||
" .378rnmNBMVX ",
|
||||
" .wernCNZMVAX ",
|
||||
" XXXXXXXXXXXX "
|
||||
};
|
||||
|
@@ -1,42 +1,24 @@
|
||||
/* XPM */
|
||||
static char *delete_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"2 c #A5AEBD",
|
||||
"* c #5478B4",
|
||||
"< c #95A3BB",
|
||||
"O c #9AA7BC",
|
||||
"; c #758EB7",
|
||||
"$ c #6986B6",
|
||||
"# c #4971B2",
|
||||
"& c #8A9CBA",
|
||||
"X c #8598B9",
|
||||
"16 16 2 1",
|
||||
". c Black",
|
||||
" c None",
|
||||
"o c #ABB2BE",
|
||||
"- c #7F95B9",
|
||||
"= c #4E74B3",
|
||||
"1 c #A0ABBC",
|
||||
"+ c #6F8AB7",
|
||||
". c #B5B9BF",
|
||||
"@ c #3E69B1",
|
||||
", c #90A0BA",
|
||||
": c #6483B5",
|
||||
"> c #5A7BB4",
|
||||
"% c #5F7FB5",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .Xo OO ",
|
||||
" +@#. $@% ",
|
||||
" &@@X .*@*o ",
|
||||
" =@= .*@*. ",
|
||||
" -@@X*@*. ",
|
||||
" .#@@@$. ",
|
||||
" ;@@: ",
|
||||
" ;@@@+ ",
|
||||
" .>@#%@@. ",
|
||||
" o*@*oO@@, ",
|
||||
" <#@*. .@@= ",
|
||||
"&@@$ :@@1 ",
|
||||
";#& 2#>. ",
|
||||
" ... . ",
|
||||
" .... .. ",
|
||||
" .... .. ",
|
||||
" ... .. ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" ..... ",
|
||||
" ... .. ",
|
||||
" ... .. ",
|
||||
" ... . ",
|
||||
" .... . ",
|
||||
" ... ",
|
||||
" . . ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,52 +1,24 @@
|
||||
/* XPM */
|
||||
static char *dir_up_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
"o c #9AEA53",
|
||||
"7 c #94A5BD",
|
||||
"8 c #547897",
|
||||
"5 c #839CB5",
|
||||
"@ c #376485",
|
||||
"$ c #5A809C",
|
||||
"# c #7F99B4",
|
||||
": c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"& c #446A8C",
|
||||
"q c #65839D",
|
||||
"> c #DCE2EA",
|
||||
", c #E1E6EE",
|
||||
"2 c #F5F6F7",
|
||||
"O c #8DA0B9",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
". c #305F81",
|
||||
"X c #7393AB",
|
||||
"+ c #6A89A2",
|
||||
"4 c #A8B6CA",
|
||||
"1 c #EEF1F3",
|
||||
"3 c #F8F9FA",
|
||||
"0 c #215579",
|
||||
"9 c #7F97B0",
|
||||
"* c #B3BFD1",
|
||||
"w c #7A90AC",
|
||||
"- c #C2CBDB",
|
||||
"; c #CAD6E1",
|
||||
"= c #BBC4D6",
|
||||
/* pixels */
|
||||
" .. ",
|
||||
" X.o. ",
|
||||
".... X.ooo. ",
|
||||
".OO+....ooooo. ",
|
||||
".OOOOOO@@ooo.. ",
|
||||
".OOOO#OO@ooo.$ ",
|
||||
".OOOOOOO@ooo.$ ",
|
||||
".O%............&",
|
||||
".O&*=-;:>,<1231.",
|
||||
".+.4*=-;:>,<12$.",
|
||||
"..564*=-;:>,<1. ",
|
||||
".@O764*=-;:>,<. ",
|
||||
".89O764*=-;:>$$ ",
|
||||
"0qw9O764*=-;:. ",
|
||||
"0............. "
|
||||
};
|
||||
/* XPM */
|
||||
static char *dir_up_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 4 1",
|
||||
"@ c #000000",
|
||||
" c None",
|
||||
"* c Yellow",
|
||||
": c Gray100",
|
||||
/* pixels */
|
||||
" ",
|
||||
" @@@@@ ",
|
||||
" @*:*:*@ ",
|
||||
" @@@@@@@@@@@@@@ ",
|
||||
" @:*:*:*:*:*:*:@",
|
||||
" @*:*:@:*:*:*:*@",
|
||||
" @:*:@@@:*:*:*:@",
|
||||
" @*:@@@@@:*:*:*@",
|
||||
" @:*:*@*:*:*:*:@",
|
||||
" @*:*:@:*:*:*:*@",
|
||||
" @:*:*@@@@@@:*:@",
|
||||
" @*:*:*:*:*:*:*@",
|
||||
" @:*:*:*:*:*:*:@",
|
||||
" @@@@@@@@@@@@@@@",
|
||||
" "};
|
||||
|
42
art/down.xpm
42
art/down.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ...... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XX. ",
|
||||
" .. ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ...... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XX. ",
|
||||
" .. ",
|
||||
" "};
|
||||
|
@@ -1,57 +1,25 @@
|
||||
/* XPM */
|
||||
static char *fileopen_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"6 c #9BACC2",
|
||||
"< c #9AEA53",
|
||||
"9 c #94A5BD",
|
||||
"5 c #839CB5",
|
||||
"; c #4D7492",
|
||||
". c #376485",
|
||||
"$ c #7F99B4",
|
||||
"r c #D1D9E5",
|
||||
"7 c #EAEDF3",
|
||||
"@ c #CAD2DC",
|
||||
"% c #718BA7",
|
||||
"t c #BECAD9",
|
||||
"& c #65839D",
|
||||
"0 c #DCE2EA",
|
||||
"4 c #F5F6F7",
|
||||
"w c #597B9A",
|
||||
"O c #8DA0B9",
|
||||
" c None",
|
||||
"+ c #467291",
|
||||
"u c #305F81",
|
||||
"= c #B4C4D3",
|
||||
"# c #CAE2AA",
|
||||
"1 c #FAFCFE",
|
||||
"3 c #A8B6CA",
|
||||
"q c #E4E9ED",
|
||||
"8 c #EEF1F3",
|
||||
"X c #215579",
|
||||
"2 c #7F97B0",
|
||||
": c #B3BFD1",
|
||||
"y c #7A90AC",
|
||||
", c #C2CBDB",
|
||||
"- c #ADD668",
|
||||
"* c #B6D791",
|
||||
"e c #CAD6E1",
|
||||
"o c #DFF0D0",
|
||||
"> c #BBC4D6",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .... ",
|
||||
"XXXXX .oo. ",
|
||||
"XOOOO+@.#o. ",
|
||||
"XOOOO$%&.*oXXX ",
|
||||
"XOOOOOOO.*oX=X ",
|
||||
"XOXXXX...-oXXXX;",
|
||||
"XOX:>,.<<<<<oX1;",
|
||||
"X2X3:>,.<<<oX4=;",
|
||||
"XX563:>>.<oX78; ",
|
||||
"XXO963:>>.X0q7; ",
|
||||
"Xw2O963:>>er0t; ",
|
||||
"X&y2O963:>,er; ",
|
||||
"uXXXXXXXXXXXX; ",
|
||||
" "
|
||||
};
|
||||
/* XPM */
|
||||
static char *fileopen_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 5 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Yellow",
|
||||
"o c Gray100",
|
||||
"O c #bfbf00",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ... ",
|
||||
" . . .",
|
||||
" ..",
|
||||
" ... ...",
|
||||
" .XoX....... ",
|
||||
" .oXoXoXoXo. ",
|
||||
" .XoXoXoXoX. ",
|
||||
" .oXoX..........",
|
||||
" .XoX.OOOOOOOOO.",
|
||||
" .oo.OOOOOOOOO. ",
|
||||
" .X.OOOOOOOOO. ",
|
||||
" ..OOOOOOOOO. ",
|
||||
" ........... ",
|
||||
" "};
|
||||
|
@@ -1,42 +1,25 @@
|
||||
/* XPM */
|
||||
static char *filesave_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"O c #FFFFFF",
|
||||
"> c #D5D6D8",
|
||||
"; c #446A8C",
|
||||
"1 c #CAD2DC",
|
||||
": c #C0C7D1",
|
||||
" c #5F666D",
|
||||
"% c #A5B0BA",
|
||||
"o c #65839D",
|
||||
", c #DCE2EA",
|
||||
"< c #C3C5C8",
|
||||
"- c #E1E6EE",
|
||||
"* c #C6CCD3",
|
||||
". c None",
|
||||
"$ c #305F81",
|
||||
"2 c #D6DFE7",
|
||||
"= c #D2D9E0",
|
||||
"& c #B7BFC7",
|
||||
"X c #1B4467",
|
||||
"# c #BCBDBE",
|
||||
"@ c #7A90AC",
|
||||
"+ c #5D7C93",
|
||||
"16 16 3 1",
|
||||
". c Black",
|
||||
"X c #808000",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" .",
|
||||
" XoOOOOOOOOO+X .",
|
||||
" @oO#######O+@ .",
|
||||
" @oOOOOOOOOO+@ .",
|
||||
" @oO#######O+@ .",
|
||||
" @oOOOOOOOOO+@ .",
|
||||
" @@+++++++++@@ .",
|
||||
" @@@@@@@@@@@@@ .",
|
||||
" @@@$$$$$$$$@@ .",
|
||||
" @@$%%%&*=-O$@ .",
|
||||
" @@$%X;;*=-O$@ .",
|
||||
" @@$%X;;:>,O$@ .",
|
||||
" @@$%X;;<12O$@ .",
|
||||
" @@$<<2OOOOO$@ .",
|
||||
". .."
|
||||
" ",
|
||||
" .............. ",
|
||||
" .X. . . ",
|
||||
" .X. ... ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .XX........XX. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XX.........X. ",
|
||||
" .XX...... .X. ",
|
||||
" .XX...... .X. ",
|
||||
" .XX...... .X. ",
|
||||
" ............. ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,44 +1,25 @@
|
||||
/* XPM */
|
||||
static char *filesaveas_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"X c Black",
|
||||
"+ c #FFFFFF",
|
||||
"< c #D5D6D8",
|
||||
"> c #446A8C",
|
||||
"3 c #CAD2DC",
|
||||
", c #C0C7D1",
|
||||
" c #5F666D",
|
||||
"* c #A5B0BA",
|
||||
"O c #65839D",
|
||||
"1 c #DCE2EA",
|
||||
"2 c #C3C5C8",
|
||||
": c #E1E6EE",
|
||||
". c #FFFF00",
|
||||
"- c #C6CCD3",
|
||||
"@ c None",
|
||||
"& c #305F81",
|
||||
"4 c #D6DFE7",
|
||||
"; c #D2D9E0",
|
||||
"= c #B7BFC7",
|
||||
"o c #1B4467",
|
||||
"$ c #BCBDBE",
|
||||
"# c #7A90AC",
|
||||
"% c #5D7C93",
|
||||
"16 16 3 1",
|
||||
". c Black",
|
||||
"X c #808000",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" .X .XX.",
|
||||
" oO+++++++.X.X.@",
|
||||
" #O+$$$$$XX...XX",
|
||||
" #O++++++.......",
|
||||
" #O+$$$$$XX...XX",
|
||||
" #O+++++++.X.X.@",
|
||||
" ##%%%%%%.X%.X .",
|
||||
" ############# @",
|
||||
" ###&&&&&&&&## @",
|
||||
" ##&***=-;:+&# @",
|
||||
" ##&*o>>-;:+&# @",
|
||||
" ##&*o>>,<1+&# @",
|
||||
" ##&*o>>234+&# @",
|
||||
" ##&224+++++&# @",
|
||||
"@ @@"
|
||||
" ",
|
||||
" .............. ",
|
||||
" .X. . . ",
|
||||
" .X. ... ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .X. .X. ",
|
||||
" .XX........XX. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XX.........X. ",
|
||||
" .XX...... .X. ",
|
||||
" .XX...... .X. ",
|
||||
" .XX...... .X. ",
|
||||
" ............. ",
|
||||
" "
|
||||
};
|
||||
|
75
art/find.xpm
75
art/find.xpm
@@ -1,62 +1,25 @@
|
||||
/* XPM */
|
||||
static char *find_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 41 1",
|
||||
"y c #A06959",
|
||||
"9 c #A7DAF2",
|
||||
"$ c #B5CAD7",
|
||||
"> c #35B4E1",
|
||||
"t c #6B98B8",
|
||||
"w c #B6E0F4",
|
||||
"q c #AEC9D7",
|
||||
"1 c #5A89A6",
|
||||
"+ c #98B3C6",
|
||||
"4 c #EAF6FC",
|
||||
"3 c #DEF1FA",
|
||||
"= c #4CBCE3",
|
||||
"d c #DB916B",
|
||||
"X c #85A7BC",
|
||||
"s c #D8BCA4",
|
||||
"o c #749BB4",
|
||||
"e c #BCD9EF",
|
||||
"* c #62B4DD",
|
||||
"< c #91D2EF",
|
||||
"a c #E6DED2",
|
||||
"0 c #E9F4FB",
|
||||
"16 16 3 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
" c None",
|
||||
"@ c #A0BACB",
|
||||
"O c #AABFCD",
|
||||
"i c #6591AE",
|
||||
": c #B9CBD5",
|
||||
"- c #71C5E7",
|
||||
"5 c #D3ECF8",
|
||||
"% c #81A3B9",
|
||||
"6 c #8AD0EE",
|
||||
"8 c #FDFDFE",
|
||||
"p c #8EA9BC",
|
||||
"r c #B6D5EE",
|
||||
", c #81CCEB",
|
||||
". c #ACC4D3",
|
||||
"; c #AFD1DE",
|
||||
"7 c #EFF8FC",
|
||||
"u c #C2CBDB",
|
||||
"# c #C0D1DC",
|
||||
"2 c #CAD6E1",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XooXO ",
|
||||
" +@###$+% ",
|
||||
" .&#*==-;@@ ",
|
||||
" o:*>,<--:X ",
|
||||
" 12>-345-#% ",
|
||||
" 12>678392% ",
|
||||
" %$*,3059q& ",
|
||||
" @Oq,wwer@@ ",
|
||||
" t@q22q&+ ",
|
||||
" yyui+%o%p ",
|
||||
" yasy ",
|
||||
" yasdy ",
|
||||
" yasdy ",
|
||||
" ysdy ",
|
||||
" yy "
|
||||
" ",
|
||||
" ... ... ",
|
||||
" .X. .X. ",
|
||||
" ... ... ",
|
||||
" ..... ..... ",
|
||||
" .X... .X... ",
|
||||
" ............. ",
|
||||
"..X... ..X..... ",
|
||||
"..X... ..X..... ",
|
||||
"..X......X..... ",
|
||||
"....... ....... ",
|
||||
".X... .X... ",
|
||||
".X... .X... ",
|
||||
"..... ..... ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,63 +1,40 @@
|
||||
/* XPM */
|
||||
static char *findrepl_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 42 1",
|
||||
"y c #A06959",
|
||||
"9 c #A7DAF2",
|
||||
"$ c #B5CAD7",
|
||||
"> c #35B4E1",
|
||||
"t c #6B98B8",
|
||||
"w c #B6E0F4",
|
||||
"q c #AEC9D7",
|
||||
"1 c #5A89A6",
|
||||
"+ c #98B3C6",
|
||||
"4 c #EAF6FC",
|
||||
"d c #008000",
|
||||
"3 c #DEF1FA",
|
||||
"= c #4CBCE3",
|
||||
"f c #DB916B",
|
||||
"X c #85A7BC",
|
||||
"s c #D8BCA4",
|
||||
"o c #749BB4",
|
||||
"e c #BCD9EF",
|
||||
"* c #62B4DD",
|
||||
"< c #91D2EF",
|
||||
"a c #E6DED2",
|
||||
"0 c #E9F4FB",
|
||||
"32 32 2 1",
|
||||
". c Black",
|
||||
" c None",
|
||||
"@ c #A0BACB",
|
||||
"O c #AABFCD",
|
||||
"i c #6591AE",
|
||||
": c #B9CBD5",
|
||||
"- c #71C5E7",
|
||||
"5 c #D3ECF8",
|
||||
"% c #81A3B9",
|
||||
"6 c #8AD0EE",
|
||||
"8 c #FDFDFE",
|
||||
"p c #8EA9BC",
|
||||
"r c #B6D5EE",
|
||||
", c #81CCEB",
|
||||
". c #ACC4D3",
|
||||
"; c #AFD1DE",
|
||||
"7 c #EFF8FC",
|
||||
"u c #C2CBDB",
|
||||
"# c #C0D1DC",
|
||||
"2 c #CAD6E1",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XooXO ",
|
||||
" +@###$+% ",
|
||||
" .&#*==-;@@ ",
|
||||
" o:*>,<--:X ",
|
||||
" 12>-345-#% ",
|
||||
" 12>678392% ",
|
||||
" %$*,3059q& ",
|
||||
" @Oq,wwer@@ ",
|
||||
" t@q22q&+ ",
|
||||
" yyui+%o%p ",
|
||||
" yasy d d ",
|
||||
" yasfy dd dd ",
|
||||
"yasfy ddddddddd",
|
||||
"ysfy dd dd ",
|
||||
" yy d d "
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" .... ... ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . ... ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" ",
|
||||
" . ... ... .... ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . ... ... . . ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,39 +1,26 @@
|
||||
/* XPM */
|
||||
static char *floppy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 18 1",
|
||||
"& c #E3E4E6",
|
||||
"+ c #FFFFFF",
|
||||
". c #446A8C",
|
||||
"o c #697787",
|
||||
"> c #5F666D",
|
||||
"* c #B2B3B3",
|
||||
" c None",
|
||||
", c #4B4C4D",
|
||||
"= c #DCDBDA",
|
||||
"$ c #1B4467",
|
||||
": c #E4E9ED",
|
||||
"@ c #979BA0",
|
||||
"X c #203646",
|
||||
"O c #215579",
|
||||
"- c #545B63",
|
||||
"; c #636465",
|
||||
"# c #CAD6E1",
|
||||
"% c #7F8286",
|
||||
/* pixels */
|
||||
" .XoooooooXO ",
|
||||
" .o+++++++.O ",
|
||||
" .o+OOOOO+.O ",
|
||||
" .o+++++++.O ",
|
||||
" .o@@@@@@@.O ",
|
||||
" ..........O ",
|
||||
" ..#+++++#.O ",
|
||||
" ..+$O+++#.O ",
|
||||
" ..+$O+++#.O ",
|
||||
" %&.........*% ",
|
||||
"%=+++++++++++&% ",
|
||||
"--------------; ",
|
||||
"-:::::::::::::- ",
|
||||
"-:X:XXXXXXXXX:> ",
|
||||
"-*************, "
|
||||
};
|
||||
/* XPM */
|
||||
static char *floppy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 7 1",
|
||||
" s None c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c #c0c0c0",
|
||||
"O c Black",
|
||||
"+ c Cyan",
|
||||
"@ c Red",
|
||||
" ......X",
|
||||
" .ooooooO",
|
||||
" .+++++OO",
|
||||
" .++++++O",
|
||||
" .++++++O",
|
||||
" .ooooooO",
|
||||
" .......o....oO",
|
||||
" .oooooo.o.O.XoO",
|
||||
".XXXXXXXXOOOOOO ",
|
||||
".ooooooooo@o..O ",
|
||||
".ooo....oooo..O ",
|
||||
".o..OOOO...o..O ",
|
||||
".oooXXXXoooo..O ",
|
||||
".............O ",
|
||||
" OOOOOOOOOOOO "};
|
||||
|
@@ -1,43 +1,27 @@
|
||||
/* XPM */
|
||||
static char *folder_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"> c #9BACC2",
|
||||
". c #547897",
|
||||
"1 c #7F99B4",
|
||||
"X c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"+ c #CAD2DC",
|
||||
"3 c #718BA7",
|
||||
"O c #BECAD9",
|
||||
"$ c #E1E6EE",
|
||||
"* c #F5F6F7",
|
||||
", c #8DA0B9",
|
||||
" c None",
|
||||
"# c #D6DFE7",
|
||||
"@ c #D2D9E0",
|
||||
"- c #FAFCFE",
|
||||
"; c #ADBACE",
|
||||
"& c #EEF1F3",
|
||||
"= c #F8F9FA",
|
||||
"o c #B3BFD1",
|
||||
"2 c #7A90AC",
|
||||
": c #A2B3C5",
|
||||
"% c #E5EAF1",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..... ",
|
||||
" .XXXX. ",
|
||||
" ............. ",
|
||||
" .oO+@#$%&*=-. ",
|
||||
" .oO+@#$%&*=-. ",
|
||||
" .;oO+X#$%&*=. ",
|
||||
" .:;oO+X#$%&*. ",
|
||||
" .>:;oO+X#$%&. ",
|
||||
" .,>:;oO+X#$<. ",
|
||||
" .1,>:;oO+X#$. ",
|
||||
" .21,>:;oO+X#. ",
|
||||
" .321,>:;oO+X. ",
|
||||
" ............. ",
|
||||
" "
|
||||
};
|
||||
/* XPM */
|
||||
static char * folder_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"16 15 6 1",
|
||||
/* colors */
|
||||
" s None c None",
|
||||
". c #000000",
|
||||
"+ c #c0c0c0",
|
||||
"@ c #808080",
|
||||
"# c #ffff00",
|
||||
"$ c #ffffff",
|
||||
/* pixels */
|
||||
" ",
|
||||
" @@@@@ ",
|
||||
" @#+#+#@ ",
|
||||
" @#+#+#+#@@@@@@ ",
|
||||
" @$$$$$$$$$$$$@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @@@@@@@@@@@@@@.",
|
||||
" ..............",
|
||||
" "};
|
||||
|
@@ -1,52 +1,27 @@
|
||||
/* XPM */
|
||||
static char *folder_open_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
"w c #547B99",
|
||||
"5 c #94A5BD",
|
||||
". c #376485",
|
||||
"; c #F1F4F7",
|
||||
"o c #7F99B4",
|
||||
"2 c #D1D9E5",
|
||||
"- c #EAEDF3",
|
||||
"O c #718BA7",
|
||||
"0 c #65839D",
|
||||
"* c #DCE2EA",
|
||||
": c #F5F6F7",
|
||||
"7 c #597B9A",
|
||||
"X c #8DA0B9",
|
||||
" c None",
|
||||
"+ c #467291",
|
||||
"q c #305F81",
|
||||
"& c #D6DFE7",
|
||||
"3 c #6A89A2",
|
||||
"1 c #A8B6CA",
|
||||
"= c #E4E9ED",
|
||||
"> c #F8F9FA",
|
||||
", c #FDFDFE",
|
||||
"9 c #215579",
|
||||
"8 c #7F97B0",
|
||||
"@ c #B3BFD1",
|
||||
"< c #7A90AC",
|
||||
"$ c #C2CBDB",
|
||||
"4 c #A2B3C5",
|
||||
"% c #CAD6E1",
|
||||
"# c #BBC4D6",
|
||||
/* pixels */
|
||||
" ",
|
||||
"..... ",
|
||||
".XXXo. ",
|
||||
".XXXXO........ ",
|
||||
".XXXXXXXXXXXX. ",
|
||||
".XXXXXXXXXXXX. ",
|
||||
".X++++++++++++++",
|
||||
".X+@#$%&*=-;:>,+",
|
||||
".<.1@#$%2*=-;:23",
|
||||
"..X41@#$%2*=-;3 ",
|
||||
"..X561@#$%2*=-3 ",
|
||||
".78X561@#$%2*%3 ",
|
||||
"90<8X561@#$%23 ",
|
||||
"q++++++++++++w ",
|
||||
" "
|
||||
};
|
||||
/* XPM */
|
||||
static char * folder_open_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"16 15 6 1",
|
||||
/* colors */
|
||||
" s None c None",
|
||||
". c #000000",
|
||||
"+ c #c0c0c0",
|
||||
"@ c #808080",
|
||||
"# c #ffff00",
|
||||
"$ c #ffffff",
|
||||
/* pixels */
|
||||
" ",
|
||||
" @@@@@ ",
|
||||
" @$$$$$@ ",
|
||||
" @$#+#+#$@@@@@@ ",
|
||||
" @$+#+#+$$$$$$@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
"@@@@@@@@@@@@@#@.",
|
||||
"@$$$$$$$$$$@@+@.",
|
||||
"@$#+#+#+#+##.@@.",
|
||||
" @$#+#+#+#+#+.@.",
|
||||
" @$+#+#+#+#+#.@.",
|
||||
" @$+#+#+#+##@..",
|
||||
" @@@@@@@@@@@@@.",
|
||||
" .............",
|
||||
" "};
|
||||
|
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" ........XX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" ........XX. ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" ........XX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" ........XX. ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
@@ -1,60 +1,26 @@
|
||||
/* XPM */
|
||||
static char *harddisk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"7 c #E3E4E6",
|
||||
"4 c #FFFFFF",
|
||||
"5 c #839CB5",
|
||||
". c #547897",
|
||||
"1 c #4D7492",
|
||||
"@ c #376485",
|
||||
"o c #7A92A3",
|
||||
"u c #D1D9E5",
|
||||
"y c #446A8C",
|
||||
"i c #51B03D",
|
||||
"> c #CAD2DC",
|
||||
"O c #718BA7",
|
||||
"2 c #65839D",
|
||||
"6 c #DCE2EA",
|
||||
"0 c #C3C5C8",
|
||||
"9 c #F5F6F7",
|
||||
": c #EBEBEC",
|
||||
"< c #597B9A",
|
||||
"t c #C6CCD3",
|
||||
" c None",
|
||||
"* c #DFE0E2",
|
||||
"e c #467291",
|
||||
"a c #526E8B",
|
||||
", c #7393AB",
|
||||
"p c #130A0B",
|
||||
"# c #AABFCD",
|
||||
"r c #B4C4D3",
|
||||
"; c #CFCFD0",
|
||||
"X c #6F90A6",
|
||||
"+ c #6A89A2",
|
||||
"- c #D2D3D4",
|
||||
"= c #DCDBDA",
|
||||
"w c #E4E9ED",
|
||||
"q c #C6C8CA",
|
||||
"% c #215579",
|
||||
"$ c #E7E7E7",
|
||||
"3 c #7F97B0",
|
||||
"8 c #C0D1DC",
|
||||
"& c #5D7C93",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .XoooXO+@ ",
|
||||
" #$$%%%%$$$X ",
|
||||
" &$*==-;$$$& ",
|
||||
" &:>+,<1234o5 ",
|
||||
" ###+67;;78242 ",
|
||||
" &4,49*0q*9we4. ",
|
||||
" &4+49*,,*9wo4. ",
|
||||
"&4%r,67;;782t%4.",
|
||||
"&44468rrrr84444,",
|
||||
"y11111111111111e",
|
||||
"1uu1:::::::::::1",
|
||||
"1uu1::::::::ip:1",
|
||||
"auu&:::::::::::1",
|
||||
"1111111111111111"
|
||||
};
|
||||
/* XPM */
|
||||
static char *harddisk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 7 1",
|
||||
" s None c None",
|
||||
". c #808080",
|
||||
"X c #c0c0c0",
|
||||
"o c Black",
|
||||
"O c Gray100",
|
||||
"+ c Green",
|
||||
"@ c #008000",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ............. ",
|
||||
" .XXXXXXXXXXXX.o",
|
||||
".OOOOOOOOOOOO..o",
|
||||
".XXXXXXXXX+@X..o",
|
||||
".XXXXXXXXXXXX..o",
|
||||
".X..........X..o",
|
||||
".XOOOOOOOOOOX..o",
|
||||
"..............o ",
|
||||
" ooooooooooooo ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
/* XPM */
|
||||
static char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
/* XPM */
|
||||
static char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
@@ -1,20 +1,20 @@
|
||||
/* XPM */
|
||||
static char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
" ",
|
||||
" .. ",
|
||||
" ... ",
|
||||
" .... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" ......... ",
|
||||
" .. ... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" .... ....... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
" ",
|
||||
" .. ",
|
||||
" ... ",
|
||||
" .... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" ......... ",
|
||||
" .. ... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" .... ....... ",
|
||||
" "};
|
||||
|
@@ -1,23 +1,23 @@
|
||||
/* XPM */
|
||||
static char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c Black",
|
||||
" ",
|
||||
" .......... ",
|
||||
" .XXXXXXXX.. ",
|
||||
" .XXXXXXXXooo ",
|
||||
" .X......XXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" oooooooooooo "};
|
||||
/* XPM */
|
||||
static char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c Black",
|
||||
" ",
|
||||
" .......... ",
|
||||
" .XXXXXXXX.. ",
|
||||
" .XXXXXXXXooo ",
|
||||
" .X......XXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" oooooooooooo "};
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/* XPM */
|
||||
static char *htmsidep_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 6 1",
|
||||
"16 16 6 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
"+ c #808080",
|
||||
@@ -23,5 +23,6 @@ static char *htmsidep_xpm[] = {
|
||||
" .OOOO.ooooooo. ",
|
||||
" .XOXX.o.+...o. ",
|
||||
" .XXOX.ooooooo. ",
|
||||
" .............. "
|
||||
" .............. ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/* XPM */
|
||||
static char *listview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 4 1",
|
||||
"16 16 4 1",
|
||||
" c Black",
|
||||
". c #FFFFFF",
|
||||
"X c #000084",
|
||||
@@ -13,13 +13,14 @@ static char *listview_xpm[] = {
|
||||
" .XXX. o o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" .............. ",
|
||||
" .XXX.......... ",
|
||||
" .XXX. o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" .............. ",
|
||||
" .XXX.......... ",
|
||||
" .XXX. o o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" "
|
||||
};
|
||||
|
63
art/new.xpm
63
art/new.xpm
@@ -1,50 +1,25 @@
|
||||
/* XPM */
|
||||
static char *new_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 29 1",
|
||||
"* c #97C4E7",
|
||||
"- c #72A8D2",
|
||||
": c #FFFFFF",
|
||||
"9 c #839CB5",
|
||||
"o c #6B98B8",
|
||||
"X c #5A89A6",
|
||||
"# c #3A749C",
|
||||
", c #D1E5F5",
|
||||
"0 c #85A7BC",
|
||||
"$ c #C3DDF1",
|
||||
"8 c #749BB4",
|
||||
"; c #5F9BC8",
|
||||
"16 16 3 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
" c None",
|
||||
"+ c #538DB3",
|
||||
"= c #85BBE2",
|
||||
"3 c #EFF6FC",
|
||||
"O c #6591AE",
|
||||
"5 c #F7FBFD",
|
||||
"7 c #FAFCFE",
|
||||
"< c #DAEAF7",
|
||||
"4 c #E9F3FA",
|
||||
"6 c #FDFDFE",
|
||||
"1 c #E2EFF8",
|
||||
". c #8EA9BC",
|
||||
"% c #B6D5EE",
|
||||
"& c #A5CCEA",
|
||||
"> c #ACE95B",
|
||||
"2 c #F4F9FD",
|
||||
"@ c #4581AA",
|
||||
/* pixels */
|
||||
" .XoOO+@#. ",
|
||||
" .$$%&*=O-; ",
|
||||
" @@@@$%&*O:*o ",
|
||||
" @>>@$$%&O::*o ",
|
||||
"@@@>>@@@$%OOoO+ ",
|
||||
"@>>>>>>@,$%&*=+ ",
|
||||
"@>>>>>>@<,$%&*+ ",
|
||||
"@@@>>@@@1<,$%&O ",
|
||||
" @>>@2341<,$%O ",
|
||||
" @@@@52341<,$o ",
|
||||
" .:6752341<,8 ",
|
||||
" .::6752341<8 ",
|
||||
" .:::67523419 ",
|
||||
" .::::6752340 ",
|
||||
" ............ "
|
||||
" ",
|
||||
" ........ ",
|
||||
" .XXXXXX.. ",
|
||||
" .XXXXXX.X. ",
|
||||
" .XXXXXX.... ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" .XXXXXXXXX. ",
|
||||
" ........... ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,43 +1,24 @@
|
||||
/* XPM */
|
||||
static char *new_dir_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"X c Black",
|
||||
"> c #9BACC2",
|
||||
"o c #547897",
|
||||
"1 c #7F99B4",
|
||||
"O c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"# c #CAD2DC",
|
||||
"3 c #718BA7",
|
||||
"@ c #BECAD9",
|
||||
"& c #E1E6EE",
|
||||
"; c #F5F6F7",
|
||||
". c #FFFF00",
|
||||
", c #8DA0B9",
|
||||
" c None",
|
||||
"% c #D6DFE7",
|
||||
"$ c #D2D9E0",
|
||||
"- c #ADBACE",
|
||||
"= c #EEF1F3",
|
||||
"+ c #B3BFD1",
|
||||
"2 c #7A90AC",
|
||||
": c #A2B3C5",
|
||||
"* c #E5EAF1",
|
||||
/* pixels */
|
||||
" .X .XX.",
|
||||
" ooooo .X.X. ",
|
||||
" oOOOOo XX...XX",
|
||||
" oooooooo.......",
|
||||
" o+@#$%&*XX...XX",
|
||||
" o+@#$%&*=.X.X. ",
|
||||
" o-+@#O%&.X;.X .",
|
||||
" o:-+@#O%&*=;o ",
|
||||
" o>:-+@#O%&*=o ",
|
||||
" o,>:-+@#O%&<o ",
|
||||
" o1,>:-+@#O%&o ",
|
||||
" o21,>:-+@#O%o ",
|
||||
" o321,>:-+@#Oo ",
|
||||
" ooooooooooooo ",
|
||||
" "
|
||||
};
|
||||
/* XPM */
|
||||
static char *new_dir_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 4 1",
|
||||
"@ c Gray0",
|
||||
" c None",
|
||||
"* c Yellow",
|
||||
": c Gray100",
|
||||
/* pixels */
|
||||
" @ ",
|
||||
" ",
|
||||
" @ ",
|
||||
" @ @ ",
|
||||
" @@@@ @ @ @ ",
|
||||
" @*:*:@ @ @ ",
|
||||
" @@@@@@@@@@ @ @",
|
||||
" @:*:*:*:*:@@ ",
|
||||
" @*:*:*:*:*@ @ ",
|
||||
" @:*:*:*:*:@ @ ",
|
||||
" @*:*:*:*:*@ ",
|
||||
" @:*:*:*:*:@ ",
|
||||
" @*:*:*:*:*@ ",
|
||||
" @@@@@@@@@@@ ",
|
||||
" "};
|
||||
|
@@ -1,46 +1,29 @@
|
||||
/* XPM */
|
||||
static char *paste_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"< c #FEECE4",
|
||||
"> c #FEE3D7",
|
||||
"O c #FFFFFF",
|
||||
"o c #7B767D",
|
||||
"% c #F79586",
|
||||
"& c #CAE1F3",
|
||||
"@ c #F08B62",
|
||||
"# c #FCCBB8",
|
||||
"- c #FDD8C9",
|
||||
"4 c #FFF8F4",
|
||||
"5 c #FFF5F0",
|
||||
"16 16 7 1",
|
||||
". c Black",
|
||||
"@ c #FFFFFF",
|
||||
"O c #808080",
|
||||
"+ c #000080",
|
||||
"X c #FFFF00",
|
||||
"o c #808000",
|
||||
" c None",
|
||||
"$ c #F8AA8F",
|
||||
", c #EFF6FC",
|
||||
"1 c #F7FBFD",
|
||||
"2 c #FAFCFE",
|
||||
"; c #DAEAF7",
|
||||
": c #E9F3FA",
|
||||
"6 c #FFFAF8",
|
||||
". c #3C78A6",
|
||||
"3 c #FFF1ED",
|
||||
"X c #9B8687",
|
||||
"+ c #FBBCA4",
|
||||
"* c #B6D5EE",
|
||||
"= c #F4F9FD",
|
||||
/* pixels */
|
||||
" ...... ",
|
||||
" .XoOOOOoo. ",
|
||||
".+XOOOOOOX@. ",
|
||||
".+XXXXXXXX@. ",
|
||||
".#++$$%@..... ",
|
||||
".##++$$%.&*.=. ",
|
||||
".-##++$$.;&.==. ",
|
||||
".--##++$.:;.... ",
|
||||
".>--##++.,:;&*. ",
|
||||
".<>--##+.1,:;&. ",
|
||||
".<<>--##.21,:;. ",
|
||||
".3<<>--#.O21=:. ",
|
||||
".45<<>--....... ",
|
||||
".6453<>----. ",
|
||||
"............ "
|
||||
" ",
|
||||
" .... ",
|
||||
" .....XX..... ",
|
||||
".oOo.X..X.OoO. ",
|
||||
".OO. .Oo. ",
|
||||
".oO........OO. ",
|
||||
".OoOoOoOoOoOo. ",
|
||||
".oOoOo+++++++. ",
|
||||
".OoOoO+@@@@@++ ",
|
||||
".oOoOo+@@@@@+@+ ",
|
||||
".OoOoO+@+++@++++",
|
||||
".oOoOo+@@@@@@@@+",
|
||||
".OoOoO+@++++++@+",
|
||||
" .....+@@@@@@@@+",
|
||||
" ++++++++++",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,60 +1,25 @@
|
||||
/* XPM */
|
||||
static char *print_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"< c #E3E4E6",
|
||||
"+ c #C3C3C4",
|
||||
"i c #FFFFFF",
|
||||
": c #74879B",
|
||||
"# c #5A89A6",
|
||||
"a c #F1F4F7",
|
||||
"r c #5A809C",
|
||||
"@ c #BDCCD9",
|
||||
"e c #7A92A4",
|
||||
"% c #3F6F93",
|
||||
"t c #9FA2A6",
|
||||
"3 c #939495",
|
||||
"w c #5F666D",
|
||||
"9 c #65839E",
|
||||
"5 c #4A7291",
|
||||
"$ c #4B7F9E",
|
||||
" c None",
|
||||
"O c #DFE0E2",
|
||||
"o c #F3F3F3",
|
||||
"; c #84A5BB",
|
||||
"& c #467291",
|
||||
". c #7897AD",
|
||||
"* c #407598",
|
||||
"4 c #CFCFD0",
|
||||
"7 c #6F90A6",
|
||||
"y c #6A89A2",
|
||||
"0 c #AAADB2",
|
||||
"1 c #D2D3D4",
|
||||
"u c #4F7592",
|
||||
", c #BCBDBE",
|
||||
"p c #57778E",
|
||||
"q c #979BA0",
|
||||
"2 c #ABABAC",
|
||||
"- c #E7E7E7",
|
||||
"= c #D6DEE6",
|
||||
"> c #9FA0A0",
|
||||
"8 c #829EB5",
|
||||
"X c #8FB0C3",
|
||||
"6 c #5D7C93",
|
||||
/* pixels */
|
||||
" .XXXXXXXX ",
|
||||
" .oooooooX ",
|
||||
" .OOOOOOOX ",
|
||||
" .+++++++X ",
|
||||
"@##$%&&&&&%*##@ ",
|
||||
"$=-;:>,<123$-=$ ",
|
||||
".44.5678.96$44. ",
|
||||
"7,,,,,,,,,,,,,7 ",
|
||||
"900qwwwwwwwe009 ",
|
||||
"rtt9ryyyyyyuttr ",
|
||||
"6qq6iiiiiii%qq6 ",
|
||||
"633paiiiiii%336 ",
|
||||
"XXX*iiiiiii%XXX ",
|
||||
" 6iiiiiii% ",
|
||||
" $XXXXXXX# "
|
||||
};
|
||||
/* XPM */
|
||||
static char *print_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 5 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
"o c #808000",
|
||||
"O c Yellow",
|
||||
/* pixels */
|
||||
" ......... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .X.....X. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .X.....X.... ",
|
||||
" .XXXXXXXX. . .",
|
||||
" .......... . ..",
|
||||
". . . .",
|
||||
"............. .",
|
||||
". ooo . . ",
|
||||
". OOO ... ",
|
||||
"............. . ",
|
||||
" . . . ",
|
||||
" ........... ",
|
||||
" "};
|
||||
|
118
art/quit.xpm
118
art/quit.xpm
@@ -1,90 +1,40 @@
|
||||
/* XPM */
|
||||
static char *quit_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 69 1",
|
||||
"@ c Black",
|
||||
"i c #9AEA53",
|
||||
"D c #7E9BB1",
|
||||
"H c #839FB4",
|
||||
", c #B7C7D3",
|
||||
"8 c #BCCBD6",
|
||||
"7 c #C1CFDA",
|
||||
"v c #92ABBD",
|
||||
"- c #D0DBE2",
|
||||
"O c #547897",
|
||||
"+ c #376485",
|
||||
"L c #7090A8",
|
||||
"t c #AEC0CE",
|
||||
"g c #B3C4D1",
|
||||
"S c #84A0B4",
|
||||
"G c #89A4B8",
|
||||
"> c #BDCCD7",
|
||||
"F c #5A809C",
|
||||
"2 c #C2D0DA",
|
||||
"k c #93ACBE",
|
||||
"= c #D6E0E6",
|
||||
"* c #446A8C",
|
||||
"z c #A5B9C8",
|
||||
"# c #DEE5EB",
|
||||
"0 c #AFC1CE",
|
||||
"r c #B4C5D2",
|
||||
"p c #B9C9D5",
|
||||
"A c #8AA5B8",
|
||||
"M c #92AABD",
|
||||
"j c #A6BAC9",
|
||||
"K c #7796AC",
|
||||
"l c #ABBECC",
|
||||
"o c #E4EAEF",
|
||||
"9 c #B5C6D2",
|
||||
"32 32 2 1",
|
||||
". c Black",
|
||||
" c None",
|
||||
"; c #C9D6DF",
|
||||
"X c #305F81",
|
||||
"m c #98AFC0",
|
||||
"V c #9DB3C3",
|
||||
"% c #D1DBE3",
|
||||
"u c #A2B7C6",
|
||||
"y c #A7BBCA",
|
||||
"h c #ACBFCD",
|
||||
"4 c #B6C7D3",
|
||||
"w c #C0CFD9",
|
||||
"d c #982106",
|
||||
"B c #85A0B5",
|
||||
"6 c #C8D4DE",
|
||||
"c c #99B0C1",
|
||||
"x c #9EB4C4",
|
||||
"$ c #D7E0E7",
|
||||
"q c #A8BCCA",
|
||||
"s c #ADC0CD",
|
||||
"3 c #BCCCD7",
|
||||
"N c #8BA5B9",
|
||||
": c #C4D1DB",
|
||||
"1 c #C9D5DE",
|
||||
"f c #9AB1C2",
|
||||
"n c #A4B9C8",
|
||||
"a c #B3C5D1",
|
||||
". c #215579",
|
||||
"J c #7D9AB0",
|
||||
"& c #829EB5",
|
||||
"e c #BBCAD6",
|
||||
"b c #8CA6B9",
|
||||
"Z c #91AABC",
|
||||
"C c #96AEC0",
|
||||
"< c #CFDAE2",
|
||||
"5 c #AFC2CF",
|
||||
/* pixels */
|
||||
" ..XXXXXXXXXX ",
|
||||
" XoO+X@@@@@@X ",
|
||||
" X#$%&X*@@@@X ",
|
||||
" X=-;:>,X@@@X ",
|
||||
" X<12345X@@@X ",
|
||||
" X67890qX@XXX ",
|
||||
" XwertyuX@XiX ",
|
||||
" XpasddfX++iiX ",
|
||||
" XghjddkXiiiiiX ",
|
||||
" XlzxcvbXiiiiiiX",
|
||||
" XnxmMNBXiiiiiX ",
|
||||
" XVCZASDXXXiiX ",
|
||||
" XXFGHJKX XiX ",
|
||||
" FXXFLX XX ",
|
||||
" XX* "
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" .... ... ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . . . ",
|
||||
" . . ... ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" ",
|
||||
" . ... ... .... ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . . . . . . ",
|
||||
" . ... ... . . ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
69
art/redo.xpm
69
art/redo.xpm
@@ -1,58 +1,25 @@
|
||||
/* XPM */
|
||||
static char *redo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
"; c #4C7398",
|
||||
"3 c #547B99",
|
||||
"* c #547897",
|
||||
"# c #5A89A6",
|
||||
"8 c #3A749C",
|
||||
"5 c #5A809C",
|
||||
", c #7F99B4",
|
||||
"& c #3F6F93",
|
||||
"9 c #85A7BC",
|
||||
"+ c #749BB4",
|
||||
"> c #718BA7",
|
||||
"e c #A5B3C8",
|
||||
"w c #BECAD9",
|
||||
": c #65839D",
|
||||
"u c #E1E6EE",
|
||||
"o c #236289",
|
||||
"r c #ADBED2",
|
||||
"= c #597B9A",
|
||||
"2 c #8DA0B9",
|
||||
"16 16 3 1",
|
||||
". c #808080",
|
||||
"X c #000080",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
"1 c #7393AB",
|
||||
"i c #4C809F",
|
||||
"- c #A0BACB",
|
||||
"O c #6591AE",
|
||||
"X c #407598",
|
||||
"6 c #6F90A6",
|
||||
"t c #D2D9E0",
|
||||
"7 c #ADBACE",
|
||||
"@ c #326A8F",
|
||||
"0 c #467A9C",
|
||||
". c #ACC4D3",
|
||||
"< c #7F97B0",
|
||||
"y c #B3BFD1",
|
||||
"q c #A2B3C5",
|
||||
"$ c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XoooO ",
|
||||
" +o@@@@@o# +",
|
||||
" $@%%&@&%%&@ +o",
|
||||
" X*=@+-+@*=;@#&@",
|
||||
" @:=+ @=:=*:@",
|
||||
" &>:$ @:>>>@",
|
||||
" &,<X X>,,,&",
|
||||
" +123 @<2222&",
|
||||
" X44X #@56<44X",
|
||||
" O1748 .9#&o",
|
||||
" 0qwe8 ",
|
||||
" 8rty8 ",
|
||||
" 8wu+ ",
|
||||
" i## ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" .XXXX ",
|
||||
" .X XX X ",
|
||||
" X X XX ",
|
||||
" X XXX ",
|
||||
" X XXXX ",
|
||||
" .X XXXXX ",
|
||||
" X. ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
@@ -1,44 +1,26 @@
|
||||
/* XPM */
|
||||
static char *removable_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"@ c #C3C3C4",
|
||||
"4 c #FFFFFF",
|
||||
"o c #D5D6D8",
|
||||
"> c #7A92A3",
|
||||
". c #8497A5",
|
||||
"% c #ACAEB2",
|
||||
"2 c #4A7898",
|
||||
": c #DCE2EA",
|
||||
", c #F5F6F7",
|
||||
"= c #EBEBEC",
|
||||
"$ c #B7B7B8",
|
||||
" c None",
|
||||
"X c #DFE0E2",
|
||||
"* c #A6A8AD",
|
||||
"1 c #4C809F",
|
||||
"3 c #407598",
|
||||
"O c #CFCFD0",
|
||||
"; c #9EA2A8",
|
||||
"# c #BCBDBE",
|
||||
"+ c #C6C8CA",
|
||||
"- c #979BA0",
|
||||
"& c #E7E7E7",
|
||||
"< c #8FB0C3",
|
||||
/* pixels */
|
||||
" ......... ",
|
||||
" .XoO+@#$%. ",
|
||||
" .XoO+@#$%. ",
|
||||
" .&XoO+@#$%*. ",
|
||||
" .&XoO+@#$%*. ",
|
||||
" .=&XoO+@#$%*-. ",
|
||||
" .=&XoO+@#$%*;. ",
|
||||
".:=&XoO+@#$%*;>.",
|
||||
".,=&XoO+@#$%*;-.",
|
||||
"<..............<",
|
||||
"<,=&XoO+@#$%%%%.",
|
||||
"<O1111122233*4*.",
|
||||
"<OOOOOOOOOOO***.",
|
||||
" <<<<<<<<<<<<<< ",
|
||||
" "
|
||||
};
|
||||
/* XPM */
|
||||
static char *removable_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 7 1",
|
||||
" s None c None",
|
||||
". c #808080",
|
||||
"X c #c0c0c0",
|
||||
"o c Black",
|
||||
"O c Gray100",
|
||||
"+ c Red",
|
||||
"@ c #800000",
|
||||
" ",
|
||||
" ",
|
||||
" ............. ",
|
||||
" .XXXXXXXXXXXX.o",
|
||||
".OOOOOOOOOOOO..o",
|
||||
".OXXXXXXXXXXX..o",
|
||||
".O+@.oooooo.X..o",
|
||||
".OXXOooooooOX..o",
|
||||
".OXXXOOOOOOXX..o",
|
||||
".OXXXXXXXXXXX..o",
|
||||
".O............o ",
|
||||
" ooooooooooooo ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/* XPM */
|
||||
static char *repview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
"16 16 3 1",
|
||||
" c Black",
|
||||
"X c #FFFFFF",
|
||||
". c #C0C0C0",
|
||||
@@ -10,7 +10,8 @@ static char *repview_xpm[] = {
|
||||
" .............. ",
|
||||
" . . . . ",
|
||||
" .............. ",
|
||||
" .............. ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
|
34
art/tick.xpm
34
art/tick.xpm
@@ -1,17 +1,17 @@
|
||||
/* XPM */
|
||||
static char *tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..",
|
||||
" ...",
|
||||
" ... ",
|
||||
".. ... ",
|
||||
"... ... ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char *tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..",
|
||||
" ...",
|
||||
" ... ",
|
||||
".. ... ",
|
||||
"... ... ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" "};
|
||||
|
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX..... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .......... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX..... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .......... ",
|
||||
" "};
|
||||
|
69
art/undo.xpm
69
art/undo.xpm
@@ -1,58 +1,25 @@
|
||||
/* XPM */
|
||||
static char *undo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
"* c #4C7398",
|
||||
"2 c #547B99",
|
||||
"- c #547897",
|
||||
"@ c #5A89A6",
|
||||
"8 c #3A749C",
|
||||
"6 c #5A809C",
|
||||
", c #7F99B4",
|
||||
"$ c #3F6F93",
|
||||
"7 c #85A7BC",
|
||||
"+ c #749BB4",
|
||||
"> c #718BA7",
|
||||
"0 c #A5B3C8",
|
||||
"q c #BECAD9",
|
||||
": c #65839D",
|
||||
"u c #E1E6EE",
|
||||
"X c #236289",
|
||||
"y c #ADBED2",
|
||||
"= c #597B9A",
|
||||
"1 c #8DA0B9",
|
||||
"16 16 3 1",
|
||||
"X c #808080",
|
||||
". c #000080",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
"3 c #7393AB",
|
||||
"i c #4C809F",
|
||||
"; c #A0BACB",
|
||||
". c #6591AE",
|
||||
"o c #407598",
|
||||
"5 c #6F90A6",
|
||||
"t c #D2D9E0",
|
||||
"9 c #ADBACE",
|
||||
"# c #326A8F",
|
||||
"e c #467A9C",
|
||||
"O c #ACC4D3",
|
||||
"< c #7F97B0",
|
||||
"r c #B3BFD1",
|
||||
"w c #A2B3C5",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XXXoO ",
|
||||
"+ @X#####X+ ",
|
||||
"X+ #$%%$#$%%#& ",
|
||||
"#$@#*=-#+;+#=-o ",
|
||||
"#:-=:=# +=:# ",
|
||||
"#>>>:# &:>$ ",
|
||||
"$,,,>o o<,$ ",
|
||||
"$1111<# 213+ ",
|
||||
"o44<56#@ o44o ",
|
||||
"X$@7O 8493. ",
|
||||
" 80qwe ",
|
||||
" 8rty8 ",
|
||||
" +uq8 ",
|
||||
" @@i ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ....X ",
|
||||
" . .. .X ",
|
||||
" .. . . ",
|
||||
" ... . ",
|
||||
" .... . ",
|
||||
" ..... .X ",
|
||||
" X. ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
42
art/up.xpm
42
art/up.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ...... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ...... ",
|
||||
" "};
|
||||
|
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char *wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .oXXXX. ",
|
||||
" .oXXX.......",
|
||||
".....oXXX.OOOOO.",
|
||||
".+++.XXXX.oOOOO.",
|
||||
".o++......oOOOO.",
|
||||
".o++++. .oOOOO.",
|
||||
".o++++. .OOOOO.",
|
||||
".+++++. .......",
|
||||
"....... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char *wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .oXXXX. ",
|
||||
" .oXXX.......",
|
||||
".....oXXX.OOOOO.",
|
||||
".+++.XXXX.oOOOO.",
|
||||
".o++......oOOOO.",
|
||||
".o++++. .oOOOO.",
|
||||
".o++++. .OOOOO.",
|
||||
".+++++. .......",
|
||||
"....... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
292
autoconf_inc.m4
292
autoconf_inc.m4
File diff suppressed because one or more lines are too long
@@ -1,27 +0,0 @@
|
||||
autogen.mk
|
||||
|
||||
autogen.mk is a makefile provided to automatically update the GNU autotools
|
||||
build system. It will run Bakefile, aclocal, and autoconf as appropriate.
|
||||
|
||||
The .m4 files required for running aclocal are located in build/aclocal.
|
||||
When upgrading software that wxWidgets depends on (for example, Bakefile,
|
||||
cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
|
||||
located in the build/aclocal directory.
|
||||
|
||||
It is particularly important that if you use a newer version of Bakefile
|
||||
to generate the Makefile.in files that you use the newer bakefile*.m4.
|
||||
Because build/autogen.mk is a Makefile it will automatically rerun
|
||||
aclocal and autoconf as necessary whenever any m4 in build/aclocal is
|
||||
newer than the generated aclocal.m4.
|
||||
|
||||
You can achieve this simply by copying the new bakefile*.m4 files from
|
||||
PREFIX/share/aclocal/ into the build/aclocal/ directory and
|
||||
rerunning make -f build/autogen.mk. Note that you should _not_ preserve
|
||||
source file times (don't use cp -p) or else it's possible your .m4 files
|
||||
will be older than the generated aclocal.m4).
|
||||
Example:
|
||||
cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
|
||||
make -f build/autogen.mk
|
||||
|
||||
Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
|
||||
configure, and Makefile.in files to wxWidgets.
|
@@ -1,78 +0,0 @@
|
||||
dnl @synopsis AC_raf_FUNC_WHICH_GETSERVBYNAME_R
|
||||
dnl
|
||||
dnl Provides a test to determine the correct way to call
|
||||
dnl getservbyname_r:
|
||||
dnl
|
||||
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
|
||||
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
|
||||
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
|
||||
dnl
|
||||
dnl An example use can be found at
|
||||
dnl http://raf.org/autoconf/net_getservbyname.c
|
||||
dnl
|
||||
dnl Based on Caolan McNamara's gethostbyname_r macro. Based on David
|
||||
dnl Arnold's autoconf suggestion in the threads faq.
|
||||
dnl
|
||||
dnl @category Misc
|
||||
dnl @author raf <raf@raf.org>
|
||||
dnl @version 2001-08-20
|
||||
dnl @license GPLWithACException
|
||||
|
||||
AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
|
||||
[
|
||||
AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
|
||||
ac_cv_func_which_getservbyname_r,
|
||||
[
|
||||
dnl we need to use C++ to detect missing prototypes
|
||||
AC_LANG_PUSH(C++)
|
||||
|
||||
AC_TRY_COMPILE([#include <netdb.h>],
|
||||
[
|
||||
char *name;
|
||||
char *proto;
|
||||
struct servent *se, *res;
|
||||
char buffer[2048];
|
||||
int buflen = 2048;
|
||||
(void) getservbyname_r(name, proto, se, buffer, buflen, &res)
|
||||
],
|
||||
ac_cv_func_which_getservbyname_r=six,
|
||||
[
|
||||
AC_TRY_COMPILE([#include <netdb.h>],
|
||||
[
|
||||
char *name;
|
||||
char *proto;
|
||||
struct servent *se;
|
||||
char buffer[2048];
|
||||
int buflen = 2048;
|
||||
(void) getservbyname_r(name, proto, se, buffer, buflen)
|
||||
],
|
||||
ac_cv_func_which_getservbyname_r=five,
|
||||
[
|
||||
AC_TRY_COMPILE([#include <netdb.h>],
|
||||
[
|
||||
char *name;
|
||||
char *proto;
|
||||
struct servent *se;
|
||||
struct servent_data data;
|
||||
(void) getservbyname_r(name, proto, se, &data);
|
||||
],
|
||||
ac_cv_func_which_getservbyname_r=four,
|
||||
ac_cv_func_which_getservbyname_r=no
|
||||
)
|
||||
]
|
||||
)
|
||||
]
|
||||
)
|
||||
AC_LANG_POP()
|
||||
]
|
||||
)
|
||||
|
||||
if test $ac_cv_func_which_getservbyname_r = six; then
|
||||
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
|
||||
elif test $ac_cv_func_which_getservbyname_r = five; then
|
||||
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
|
||||
elif test $ac_cv_func_which_getservbyname_r = four; then
|
||||
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
|
||||
fi
|
||||
|
||||
])
|
@@ -1,155 +0,0 @@
|
||||
dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
|
||||
dnl
|
||||
dnl Determines which historical variant of the gethostbyname_r() call
|
||||
dnl (taking three, five, or six arguments) is available on the system
|
||||
dnl and defines one of the following macros accordingly:
|
||||
dnl
|
||||
dnl HAVE_FUNC_GETHOSTBYNAME_R_6
|
||||
dnl HAVE_FUNC_GETHOSTBYNAME_R_5
|
||||
dnl HAVE_FUNC_GETHOSTBYNAME_R_3
|
||||
dnl
|
||||
dnl If used in conjunction with gethostname.c, the API demonstrated in
|
||||
dnl test.c can be used regardless of which gethostbyname_r() is
|
||||
dnl available. These example files can be found at
|
||||
dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
|
||||
dnl
|
||||
dnl based on David Arnold's autoconf suggestion in the threads faq
|
||||
dnl
|
||||
dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
|
||||
dnl for Autoconf 2.5x by Daniel Richard G.
|
||||
dnl
|
||||
dnl @category InstalledPackages
|
||||
dnl @author Caolan McNamara <caolan@skynet.ie>
|
||||
dnl @author Daniel Richard G. <skunk@iskunk.org>
|
||||
dnl @version 2005-01-21
|
||||
dnl @license GPLWithACException
|
||||
|
||||
AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
|
||||
|
||||
AC_LANG_PUSH(C)
|
||||
AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
|
||||
|
||||
AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
|
||||
|
||||
################################################################
|
||||
|
||||
ac_cv_func_which_gethostbyname_r=unknown
|
||||
|
||||
#
|
||||
# ONE ARGUMENT (sanity check)
|
||||
#
|
||||
|
||||
# This should fail, as there is no variant of gethostbyname_r() that takes
|
||||
# a single argument. If it actually compiles, then we can assume that
|
||||
# netdb.h is not declaring the function, and the compiler is thereby
|
||||
# assuming an implicit prototype. In which case, we're out of luck.
|
||||
#
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LANG_PROGRAM(
|
||||
[[#include <netdb.h>]],
|
||||
[[
|
||||
char *name = "www.gnu.org";
|
||||
(void)gethostbyname_r(name) /* ; */
|
||||
]]),
|
||||
ac_cv_func_which_gethostbyname_r=no)
|
||||
|
||||
#
|
||||
# SIX ARGUMENTS
|
||||
# (e.g. Linux)
|
||||
#
|
||||
|
||||
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
|
||||
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LANG_PROGRAM(
|
||||
[[#include <netdb.h>]],
|
||||
[[
|
||||
char *name = "www.gnu.org";
|
||||
struct hostent ret, *retp;
|
||||
char buf@<:@1024@:>@;
|
||||
int buflen = 1024;
|
||||
int my_h_errno;
|
||||
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
|
||||
]]),
|
||||
ac_cv_func_which_gethostbyname_r=six)
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# FIVE ARGUMENTS
|
||||
# (e.g. Solaris)
|
||||
#
|
||||
|
||||
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
|
||||
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LANG_PROGRAM(
|
||||
[[#include <netdb.h>]],
|
||||
[[
|
||||
char *name = "www.gnu.org";
|
||||
struct hostent ret;
|
||||
char buf@<:@1024@:>@;
|
||||
int buflen = 1024;
|
||||
int my_h_errno;
|
||||
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
|
||||
]]),
|
||||
ac_cv_func_which_gethostbyname_r=five)
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# THREE ARGUMENTS
|
||||
# (e.g. AIX, HP-UX, Tru64)
|
||||
#
|
||||
|
||||
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
|
||||
|
||||
AC_COMPILE_IFELSE(
|
||||
AC_LANG_PROGRAM(
|
||||
[[#include <netdb.h>]],
|
||||
[[
|
||||
char *name = "www.gnu.org";
|
||||
struct hostent ret;
|
||||
struct hostent_data data;
|
||||
(void)gethostbyname_r(name, &ret, &data) /* ; */
|
||||
]]),
|
||||
ac_cv_func_which_gethostbyname_r=three)
|
||||
|
||||
fi
|
||||
|
||||
################################################################
|
||||
|
||||
]) dnl end AC_CACHE_VAL
|
||||
|
||||
case "$ac_cv_func_which_gethostbyname_r" in
|
||||
three)
|
||||
AC_MSG_RESULT([three])
|
||||
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
|
||||
;;
|
||||
|
||||
five)
|
||||
AC_MSG_RESULT([five])
|
||||
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
|
||||
;;
|
||||
|
||||
six)
|
||||
AC_MSG_RESULT([six])
|
||||
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
|
||||
;;
|
||||
|
||||
no)
|
||||
AC_MSG_RESULT([cannot find function declaration in netdb.h])
|
||||
;;
|
||||
|
||||
unknown)
|
||||
AC_MSG_RESULT([can't tell])
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_MSG_ERROR([internal error])
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_LANG_POP(C)
|
||||
|
||||
]) dnl end AC_DEFUN
|
@@ -1,483 +0,0 @@
|
||||
AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
|
||||
[
|
||||
dnl ===================== dllar.sh begins here =====================
|
||||
dnl (Created by merge-scripts.py from dllar.sh
|
||||
dnl file do not edit here!)
|
||||
D='$'
|
||||
cat <<EOF >dllar.sh
|
||||
#!/bin/sh
|
||||
#
|
||||
# dllar - a tool to build both a .dll and an .a file
|
||||
# from a set of object (.o) files for EMX/OS2.
|
||||
#
|
||||
# Written by Andrew Zabolotny, bit@freya.etu.ru
|
||||
# Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
|
||||
#
|
||||
# This script will accept a set of files on the command line.
|
||||
# All the public symbols from the .o files will be exported into
|
||||
# a .DEF file, then linker will be run (through gcc) against them to
|
||||
# build a shared library consisting of all given .o files. All libraries
|
||||
# (.a) will be first decompressed into component .o files then act as
|
||||
# described above. You can optionally give a description (-d "description")
|
||||
# which will be put into .DLL. To see the list of accepted options (as well
|
||||
# as command-line format) simply run this program without options. The .DLL
|
||||
# is built to be imported by name (there is no guarantee that new versions
|
||||
# of the library you build will have same ordinals for same symbols).
|
||||
#
|
||||
# dllar is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# dllar is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with dllar; see the file COPYING. If not, write to the Free
|
||||
# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
# To successfuly run this program you will need:
|
||||
# - Current drive should have LFN support (HPFS, ext2, network, etc)
|
||||
# (Sometimes dllar generates filenames which won't fit 8.3 scheme)
|
||||
# - gcc
|
||||
# (used to build the .dll)
|
||||
# - emxexp
|
||||
# (used to create .def file from .o files)
|
||||
# - emximp
|
||||
# (used to create .a file from .def file)
|
||||
# - GNU text utilites (cat, sort, uniq)
|
||||
# used to process emxexp output
|
||||
# - GNU file utilities (mv, rm)
|
||||
# - GNU sed
|
||||
# - lxlite (optional, see flag below)
|
||||
# (used for general .dll cleanup)
|
||||
#
|
||||
|
||||
flag_USE_LXLITE=1;
|
||||
|
||||
#
|
||||
# helper functions
|
||||
# basnam, variant of basename, which does _not_ remove the path, _iff_
|
||||
# second argument (suffix to remove) is given
|
||||
basnam(){
|
||||
case ${D}# in
|
||||
1)
|
||||
echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
|
||||
;;
|
||||
2)
|
||||
echo ${D}1 | sed 's/'${D}2'${D}//'
|
||||
;;
|
||||
*)
|
||||
echo "error in basnam ${D}*"
|
||||
exit 8
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Cleanup temporary files and output
|
||||
CleanUp() {
|
||||
cd ${D}curDir
|
||||
for i in ${D}inputFiles ; do
|
||||
case ${D}i in
|
||||
*!)
|
||||
rm -rf \`basnam ${D}i !\`
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Kill result in case of failure as there is just to many stupid make/nmake
|
||||
# things out there which doesn't do this.
|
||||
if @<:@ ${D}# -eq 0 @:>@; then
|
||||
rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
|
||||
fi
|
||||
}
|
||||
|
||||
# Print usage and exit script with rc=1.
|
||||
PrintHelp() {
|
||||
echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
|
||||
echo ' @<:@-name-mangler-script script.sh@:>@'
|
||||
echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
|
||||
echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
|
||||
echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
|
||||
echo ' @<:@*.o@:>@ @<:@*.a@:>@'
|
||||
echo '*> "output_file" should have no extension.'
|
||||
echo ' If it has the .o, .a or .dll extension, it is automatically removed.'
|
||||
echo ' The import library name is derived from this and is set to "name".a,'
|
||||
echo ' unless overridden by -import'
|
||||
echo '*> "importlib_name" should have no extension.'
|
||||
echo ' If it has the .o, or .a extension, it is automatically removed.'
|
||||
echo ' This name is used as the import library name and may be longer and'
|
||||
echo ' more descriptive than the DLL name which has to follow the old '
|
||||
echo ' 8.3 convention of FAT.'
|
||||
echo '*> "script.sh may be given to override the output_file name by a'
|
||||
echo ' different name. It is mainly useful if the regular make process'
|
||||
echo ' of some package does not take into account OS/2 restriction of'
|
||||
echo ' DLL name lengths. It takes the importlib name as input and is'
|
||||
echo ' supposed to procude a shorter name as output. The script should'
|
||||
echo ' expect to get importlib_name without extension and should produce'
|
||||
echo ' a (max.) 8 letter name without extension.'
|
||||
echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)'
|
||||
echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
|
||||
echo ' These flags will be put at the start of GCC command line.'
|
||||
echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
|
||||
echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
|
||||
echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
|
||||
echo ' If the last character of a symbol is "*", all symbols beginning'
|
||||
echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).'
|
||||
echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
|
||||
echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
|
||||
echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
|
||||
echo ' C runtime DLLs.'
|
||||
echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
|
||||
echo '*> All other switches (for example -L./ or -lmylib) will be passed'
|
||||
echo ' unchanged to GCC at the end of command line.'
|
||||
echo '*> If you create a DLL from a library and you do not specify -o,'
|
||||
echo ' the basename for DLL and import library will be set to library name,'
|
||||
echo ' the initial library will be renamed to 'name'_s.a (_s for static)'
|
||||
echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
|
||||
echo ' library will be renamed into gcc_s.a.'
|
||||
echo '--------'
|
||||
echo 'Example:'
|
||||
echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
|
||||
echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
|
||||
CleanUp
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Execute a command.
|
||||
# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
|
||||
# @Uses Whatever CleanUp() uses.
|
||||
doCommand() {
|
||||
echo "${D}*"
|
||||
eval ${D}*
|
||||
rcCmd=${D}?
|
||||
|
||||
if @<:@ ${D}rcCmd -ne 0 @:>@; then
|
||||
echo "command failed, exit code="${D}rcCmd
|
||||
CleanUp
|
||||
exit ${D}rcCmd
|
||||
fi
|
||||
}
|
||||
|
||||
# main routine
|
||||
# setup globals
|
||||
cmdLine=${D}*
|
||||
outFile=""
|
||||
outimpFile=""
|
||||
inputFiles=""
|
||||
renameScript=""
|
||||
description=""
|
||||
CC=gcc.exe
|
||||
CFLAGS="-s -Zcrtdll"
|
||||
EXTRA_CFLAGS=""
|
||||
EXPORT_BY_ORDINALS=0
|
||||
exclude_symbols=""
|
||||
library_flags=""
|
||||
curDir=\`pwd\`
|
||||
curDirS=curDir
|
||||
case ${D}curDirS in
|
||||
*/)
|
||||
;;
|
||||
*)
|
||||
curDirS=${D}{curDirS}"/"
|
||||
;;
|
||||
esac
|
||||
# Parse commandline
|
||||
libsToLink=0
|
||||
omfLinking=0
|
||||
while @<:@ ${D}1 @:>@; do
|
||||
case ${D}1 in
|
||||
-ord*)
|
||||
EXPORT_BY_ORDINALS=1;
|
||||
;;
|
||||
-o*)
|
||||
shift
|
||||
outFile=${D}1
|
||||
;;
|
||||
-i*)
|
||||
shift
|
||||
outimpFile=${D}1
|
||||
;;
|
||||
-name-mangler-script)
|
||||
shift
|
||||
renameScript=${D}1
|
||||
;;
|
||||
-d*)
|
||||
shift
|
||||
description=${D}1
|
||||
;;
|
||||
-f*)
|
||||
shift
|
||||
CFLAGS=${D}1
|
||||
;;
|
||||
-c*)
|
||||
shift
|
||||
CC=${D}1
|
||||
;;
|
||||
-h*)
|
||||
PrintHelp
|
||||
;;
|
||||
-ex*)
|
||||
shift
|
||||
exclude_symbols=${D}{exclude_symbols}${D}1" "
|
||||
;;
|
||||
-libf*)
|
||||
shift
|
||||
library_flags=${D}{library_flags}${D}1" "
|
||||
;;
|
||||
-nocrt*)
|
||||
CFLAGS="-s"
|
||||
;;
|
||||
-nolxl*)
|
||||
flag_USE_LXLITE=0
|
||||
;;
|
||||
-* | /*)
|
||||
case ${D}1 in
|
||||
-L* | -l*)
|
||||
libsToLink=1
|
||||
;;
|
||||
-Zomf)
|
||||
omfLinking=1
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
|
||||
;;
|
||||
*.dll)
|
||||
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
|
||||
if @<:@ ${D}omfLinking -eq 1 @:>@; then
|
||||
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
|
||||
else
|
||||
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
found=0;
|
||||
if @<:@ ${D}libsToLink -ne 0 @:>@; then
|
||||
EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
|
||||
else
|
||||
for file in ${D}1 ; do
|
||||
if @<:@ -f ${D}file @:>@; then
|
||||
inputFiles="${D}{inputFiles} ${D}file"
|
||||
found=1
|
||||
fi
|
||||
done
|
||||
if @<:@ ${D}found -eq 0 @:>@; then
|
||||
echo "ERROR: No file(s) found: "${D}1
|
||||
exit 8
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done # iterate cmdline words
|
||||
|
||||
#
|
||||
if @<:@ -z "${D}inputFiles" @:>@; then
|
||||
echo "dllar: no input files"
|
||||
PrintHelp
|
||||
fi
|
||||
|
||||
# Now extract all .o files from .a files
|
||||
newInputFiles=""
|
||||
for file in ${D}inputFiles ; do
|
||||
case ${D}file in
|
||||
*.a | *.lib)
|
||||
case ${D}file in
|
||||
*.a)
|
||||
suffix=".a"
|
||||
AR="ar"
|
||||
;;
|
||||
*.lib)
|
||||
suffix=".lib"
|
||||
AR="emxomfar"
|
||||
EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
dirname=\`basnam ${D}file ${D}suffix\`"_%"
|
||||
mkdir ${D}dirname
|
||||
if @<:@ ${D}? -ne 0 @:>@; then
|
||||
echo "Failed to create subdirectory ./${D}dirname"
|
||||
CleanUp
|
||||
exit 8;
|
||||
fi
|
||||
# Append '!' to indicate archive
|
||||
newInputFiles="${D}newInputFiles ${D}{dirname}!"
|
||||
doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
|
||||
cd ${D}curDir
|
||||
found=0;
|
||||
for subfile in ${D}dirname/*.o* ; do
|
||||
if @<:@ -f ${D}subfile @:>@; then
|
||||
found=1
|
||||
if @<:@ -s ${D}subfile @:>@; then
|
||||
# FIXME: This should be: is file size > 32 byte, _not_ > 0!
|
||||
newInputFiles="${D}newInputFiles ${D}subfile"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if @<:@ ${D}found -eq 0 @:>@; then
|
||||
echo "WARNING: there are no files in archive \\'${D}file\\'"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
newInputFiles="${D}{newInputFiles} ${D}file"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
inputFiles="${D}newInputFiles"
|
||||
|
||||
# Output filename(s).
|
||||
do_backup=0;
|
||||
if @<:@ -z ${D}outFile @:>@; then
|
||||
do_backup=1;
|
||||
set outFile ${D}inputFiles; outFile=${D}2
|
||||
fi
|
||||
|
||||
# If it is an archive, remove the '!' and the '_%' suffixes
|
||||
case ${D}outFile in
|
||||
*_%!)
|
||||
outFile=\`basnam ${D}outFile _%!\`
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
case ${D}outFile in
|
||||
*.dll)
|
||||
outFile=\`basnam ${D}outFile .dll\`
|
||||
;;
|
||||
*.DLL)
|
||||
outFile=\`basnam ${D}outFile .DLL\`
|
||||
;;
|
||||
*.o)
|
||||
outFile=\`basnam ${D}outFile .o\`
|
||||
;;
|
||||
*.obj)
|
||||
outFile=\`basnam ${D}outFile .obj\`
|
||||
;;
|
||||
*.a)
|
||||
outFile=\`basnam ${D}outFile .a\`
|
||||
;;
|
||||
*.lib)
|
||||
outFile=\`basnam ${D}outFile .lib\`
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
case ${D}outimpFile in
|
||||
*.a)
|
||||
outimpFile=\`basnam ${D}outimpFile .a\`
|
||||
;;
|
||||
*.lib)
|
||||
outimpFile=\`basnam ${D}outimpFile .lib\`
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
if @<:@ -z ${D}outimpFile @:>@; then
|
||||
outimpFile=${D}outFile
|
||||
fi
|
||||
defFile="${D}{outFile}.def"
|
||||
arcFile="${D}{outimpFile}.a"
|
||||
arcFile2="${D}{outimpFile}.lib"
|
||||
|
||||
#create ${D}dllFile as something matching 8.3 restrictions,
|
||||
if @<:@ -z ${D}renameScript @:>@ ; then
|
||||
dllFile="${D}outFile"
|
||||
else
|
||||
dllFile=\`${D}renameScript ${D}outimpFile\`
|
||||
fi
|
||||
|
||||
if @<:@ ${D}do_backup -ne 0 @:>@ ; then
|
||||
if @<:@ -f ${D}arcFile @:>@ ; then
|
||||
doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
|
||||
fi
|
||||
if @<:@ -f ${D}arcFile2 @:>@ ; then
|
||||
doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Extract public symbols from all the object files.
|
||||
tmpdefFile=${D}{defFile}_%
|
||||
rm -f ${D}tmpdefFile
|
||||
for file in ${D}inputFiles ; do
|
||||
case ${D}file in
|
||||
*!)
|
||||
;;
|
||||
*)
|
||||
doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Create the def file.
|
||||
rm -f ${D}defFile
|
||||
echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
|
||||
dllFile="${D}{dllFile}.dll"
|
||||
if @<:@ ! -z ${D}description @:>@; then
|
||||
echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile
|
||||
fi
|
||||
echo "EXPORTS" >> ${D}defFile
|
||||
|
||||
doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
|
||||
grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
|
||||
|
||||
# Checks if the export is ok or not.
|
||||
for word in ${D}exclude_symbols; do
|
||||
grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
|
||||
mv ${D}{tmpdefFile}% ${D}tmpdefFile
|
||||
done
|
||||
|
||||
|
||||
if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
|
||||
sed "=" < ${D}tmpdefFile | \\
|
||||
sed '
|
||||
N
|
||||
: loop
|
||||
s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
|
||||
t loop
|
||||
' > ${D}{tmpdefFile}%
|
||||
grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
|
||||
else
|
||||
rm -f ${D}{tmpdefFile}%
|
||||
fi
|
||||
cat ${D}tmpdefFile >> ${D}defFile
|
||||
rm -f ${D}tmpdefFile
|
||||
|
||||
# Do linking, create implib, and apply lxlite.
|
||||
gccCmdl="";
|
||||
for file in ${D}inputFiles ; do
|
||||
case ${D}file in
|
||||
*!)
|
||||
;;
|
||||
*)
|
||||
gccCmdl="${D}gccCmdl ${D}file"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
|
||||
touch "${D}{outFile}.dll"
|
||||
|
||||
doCommand "emximp -o ${D}arcFile ${D}defFile"
|
||||
if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
|
||||
add_flags="";
|
||||
if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
|
||||
add_flags="-ynd"
|
||||
fi
|
||||
doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
|
||||
fi
|
||||
doCommand "emxomf -s -l ${D}arcFile"
|
||||
|
||||
# Successful exit.
|
||||
CleanUp 1
|
||||
exit 0
|
||||
EOF
|
||||
dnl ===================== dllar.sh ends here =====================
|
||||
])
|
@@ -1,282 +0,0 @@
|
||||
dnl
|
||||
dnl This file is part of Bakefile (http://bakefile.sourceforge.net)
|
||||
dnl
|
||||
dnl Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
dnl to deal in the Software without restriction, including without limitation
|
||||
dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
dnl and/or sell copies of the Software, and to permit persons to whom the
|
||||
dnl Software is furnished to do so, subject to the following conditions:
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included in
|
||||
dnl all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
dnl DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl $Id$
|
||||
dnl
|
||||
dnl Compiler detection macros by David Elliott
|
||||
dnl
|
||||
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
|
||||
dnl ===========================================================================
|
||||
|
||||
dnl Based on autoconf _AC_LANG_COMPILER_GNU
|
||||
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
|
||||
[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
|
||||
[AC_TRY_COMPILE([],[#ifndef __MWERKS__
|
||||
choke me
|
||||
#endif
|
||||
],
|
||||
[bakefile_compiler_mwerks=yes],
|
||||
[bakefile_compiler_mwerks=no])
|
||||
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
|
||||
])
|
||||
])
|
||||
|
||||
dnl Loosely based on autoconf AC_PROG_CC
|
||||
dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
|
||||
[AC_LANG_PUSH(C)
|
||||
_AC_BAKEFILE_LANG_COMPILER_MWERKS
|
||||
MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
|
||||
AC_LANG_POP(C)
|
||||
])
|
||||
|
||||
dnl Loosely based on autoconf AC_PROG_CXX
|
||||
dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
|
||||
[AC_LANG_PUSH(C++)
|
||||
_AC_BAKEFILE_LANG_COMPILER_MWERKS
|
||||
MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
|
||||
AC_LANG_POP(C++)
|
||||
])
|
||||
|
||||
dnl Based on autoconf _AC_LANG_COMPILER_GNU
|
||||
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
|
||||
[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
|
||||
[AC_TRY_COMPILE([],[#ifndef __xlC__
|
||||
choke me
|
||||
#endif
|
||||
],
|
||||
[bakefile_compiler_xlc=yes],
|
||||
[bakefile_compiler_xlc=no])
|
||||
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
|
||||
])
|
||||
])
|
||||
|
||||
dnl Loosely based on autoconf AC_PROG_CC
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
|
||||
[AC_LANG_PUSH(C)
|
||||
_AC_BAKEFILE_LANG_COMPILER_XLC
|
||||
XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
|
||||
AC_LANG_POP(C)
|
||||
])
|
||||
|
||||
dnl Loosely based on autoconf AC_PROG_CXX
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
|
||||
[AC_LANG_PUSH(C++)
|
||||
_AC_BAKEFILE_LANG_COMPILER_XLC
|
||||
XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
|
||||
AC_LANG_POP(C++)
|
||||
])
|
||||
|
||||
dnl Based on autoconf _AC_LANG_COMPILER_GNU
|
||||
dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
|
||||
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
|
||||
[
|
||||
AC_LANG_PUSH($2)
|
||||
AC_CACHE_CHECK(
|
||||
[whether we are using the $1 $2 compiler],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
|
||||
[AC_TRY_COMPILE(
|
||||
[],
|
||||
[
|
||||
#ifndef $3
|
||||
choke me
|
||||
#endif
|
||||
],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
|
||||
)
|
||||
]
|
||||
)
|
||||
AC_LANG_POP($2)
|
||||
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
|
||||
:; $4
|
||||
else
|
||||
:; $5
|
||||
fi
|
||||
])
|
||||
|
||||
dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
|
||||
dnl
|
||||
dnl NB: old versions define _COMPILER_VERSION but this could probably be
|
||||
dnl defined by other compilers too so don't test for it to be safe
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
|
||||
])
|
||||
|
||||
dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
|
||||
])
|
||||
|
||||
dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
|
||||
])
|
||||
|
||||
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
|
||||
])
|
||||
|
||||
dnl Tru64 cc and cxx
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
|
||||
])
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl macros to detect specialty compiler options
|
||||
dnl ===========================================================================
|
||||
|
||||
dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
|
||||
AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
|
||||
[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
|
||||
dnl First create an empty conf test
|
||||
[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
|
||||
dnl Now remove .o and .c.o or .cc.o
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext.o
|
||||
dnl Now compile the test
|
||||
AS_IF([AC_TRY_EVAL(ac_compile)],
|
||||
dnl If the test succeeded look for conftest.c.o or conftest.cc.o
|
||||
[for ac_file in `(ls conftest.* 2>/dev/null)`; do
|
||||
case $ac_file in
|
||||
conftest.$ac_ext.o)
|
||||
bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
done],
|
||||
[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
|
||||
]) dnl AS_IF
|
||||
|
||||
rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
|
||||
]) dnl AC_CACHE_CHECK
|
||||
|
||||
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
|
||||
if test "[]_AC_LANG_ABBREV[]" = "c"; then
|
||||
CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
|
||||
fi
|
||||
if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
|
||||
CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
|
||||
fi
|
||||
fi
|
||||
]) dnl AC_DEFUN
|
||||
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Macros to do all of the compiler detections as one macro
|
||||
dnl ===========================================================================
|
||||
|
||||
dnl check for different proprietary compilers depending on target platform
|
||||
dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
|
||||
AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
||||
[
|
||||
AC_PROG_$1
|
||||
AC_BAKEFILE_PROG_INTEL$1
|
||||
dnl if we're using gcc, we can't be using any of incompatible compilers
|
||||
if test "x$G$1" != "xyes"; then
|
||||
if test "x$1" = "xC"; then
|
||||
AC_BAKEFILE_METROWERKS_EXTO
|
||||
if test "x$bakefile_cv_c_exto" '!=' "x"; then
|
||||
unset ac_cv_prog_cc_g
|
||||
_AC_PROG_CC_G
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl most of these compilers are only used under well-defined OS so
|
||||
dnl don't waste time checking for them on other ones
|
||||
case `uname -s` in
|
||||
AIX*)
|
||||
AC_BAKEFILE_PROG_XL$1
|
||||
;;
|
||||
|
||||
Darwin)
|
||||
AC_BAKEFILE_PROG_MW$1
|
||||
AC_BAKEFILE_PROG_XL$1
|
||||
;;
|
||||
|
||||
IRIX*)
|
||||
AC_BAKEFILE_PROG_SGI$1
|
||||
;;
|
||||
|
||||
HP-UX*)
|
||||
AC_BAKEFILE_PROG_HP$1
|
||||
;;
|
||||
|
||||
OSF1)
|
||||
AC_BAKEFILE_PROG_COMPAQ$1
|
||||
;;
|
||||
|
||||
SunOS)
|
||||
AC_BAKEFILE_PROG_SUN$1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_CC],
|
||||
[
|
||||
_AC_BAKEFILE_PROG_COMPILER(CC)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_CXX],
|
||||
[
|
||||
_AC_BAKEFILE_PROG_COMPILER(CXX)
|
||||
])
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,81 +0,0 @@
|
||||
dnl
|
||||
dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_CPPUNIT],
|
||||
[
|
||||
|
||||
AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
|
||||
cppunit_config_prefix="$withval", cppunit_config_prefix="")
|
||||
AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
|
||||
cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
|
||||
|
||||
if test x$cppunit_config_exec_prefix != x ; then
|
||||
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
|
||||
if test x${CPPUNIT_CONFIG+set} != xset ; then
|
||||
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
|
||||
fi
|
||||
fi
|
||||
if test x$cppunit_config_prefix != x ; then
|
||||
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
|
||||
if test x${CPPUNIT_CONFIG+set} != xset ; then
|
||||
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
|
||||
cppunit_version_min=$1
|
||||
|
||||
AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
|
||||
no_cppunit=""
|
||||
if test "$CPPUNIT_CONFIG" = "no" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
no_cppunit=yes
|
||||
else
|
||||
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
|
||||
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
|
||||
cppunit_version=`$CPPUNIT_CONFIG --version`
|
||||
|
||||
cppunit_major_version=`echo $cppunit_version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
cppunit_minor_version=`echo $cppunit_version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
cppunit_micro_version=`echo $cppunit_version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
cppunit_major_min=`echo $cppunit_version_min | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
cppunit_minor_min=`echo $cppunit_version_min | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
cppunit_micro_min=`echo $cppunit_version_min | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
cppunit_version_proper=`expr \
|
||||
$cppunit_major_version \> $cppunit_major_min \| \
|
||||
$cppunit_major_version \= $cppunit_major_min \& \
|
||||
$cppunit_minor_version \> $cppunit_minor_min \| \
|
||||
$cppunit_major_version \= $cppunit_major_min \& \
|
||||
$cppunit_minor_version \= $cppunit_minor_min \& \
|
||||
$cppunit_micro_version \>= $cppunit_micro_min `
|
||||
|
||||
if test "$cppunit_version_proper" = "1" ; then
|
||||
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
no_cppunit=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$no_cppunit" = x ; then
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
CPPUNIT_CFLAGS=""
|
||||
CPPUNIT_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
|
||||
AC_SUBST(CPPUNIT_CFLAGS)
|
||||
AC_SUBST(CPPUNIT_LIBS)
|
||||
])
|
||||
|
||||
|
||||
|
@@ -1,23 +0,0 @@
|
||||
dnl Perform a check for a GStreamer element using gst-inspect
|
||||
dnl Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
dnl Last modification: 25/01/2005
|
||||
|
||||
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
|
||||
AC_DEFUN([AM_GST_ELEMENT_CHECK],
|
||||
[
|
||||
if test "x$GST_INSPECT" == "x"; then
|
||||
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
|
||||
fi
|
||||
|
||||
if test "x$GST_INSPECT" != "x"; then
|
||||
AC_MSG_CHECKING(GStreamer element $1)
|
||||
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
|
||||
AC_MSG_RESULT(found.)
|
||||
$2
|
||||
else
|
||||
AC_MSG_RESULT(not found.)
|
||||
$3
|
||||
fi
|
||||
fi
|
||||
])
|
@@ -1,196 +0,0 @@
|
||||
# Configure paths for GTK+
|
||||
# Owen Taylor 1997-2001
|
||||
|
||||
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
|
||||
dnl pass to pkg-config
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GTK_2_0],
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from pkg-config
|
||||
dnl
|
||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
|
||||
, enable_gtktest=yes)
|
||||
|
||||
pkg_config_args=gtk+-2.0
|
||||
for module in . $4
|
||||
do
|
||||
case "$module" in
|
||||
gthread)
|
||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
no_gtk=""
|
||||
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
|
||||
if test x$PKG_CONFIG != xno ; then
|
||||
if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
||||
:
|
||||
else
|
||||
echo "*** pkg-config too old; version 0.7 or better required."
|
||||
no_gtk=yes
|
||||
PKG_CONFIG=no
|
||||
fi
|
||||
else
|
||||
no_gtk=yes
|
||||
fi
|
||||
|
||||
min_gtk_version=ifelse([$1], ,2.0.0,$1)
|
||||
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
|
||||
|
||||
if test x$PKG_CONFIG != xno ; then
|
||||
## don't try to run the test against uninstalled libtool libs
|
||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
||||
enable_gtktest=no
|
||||
fi
|
||||
|
||||
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
|
||||
:
|
||||
else
|
||||
no_gtk=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x"$no_gtk" = x ; then
|
||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_gtktest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$GTK_LIBS $LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
|
||||
dnl checks the results of pkg-config to some extent)
|
||||
dnl
|
||||
rm -f conf.gtktest
|
||||
AC_TRY_RUN([
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.gtktest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup("$min_gtk_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_gtk_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
||||
(gtk_micro_version != $gtk_config_micro_version))
|
||||
{
|
||||
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
printf ("*** was found! If pkg-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
||||
printf("*** to point to the correct configuration files\n");
|
||||
}
|
||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
||||
{
|
||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
||||
printf("*** library (version %d.%d.%d)\n",
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((gtk_major_version > major) ||
|
||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
||||
major, minor, micro);
|
||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_gtk" = x ; then
|
||||
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** A new enough version of pkg-config was not found."
|
||||
echo "*** See http://pkgconfig.sourceforge.net"
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run GTK+ test program, checking why..."
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdio.h>
|
||||
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
||||
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
GTK_CFLAGS=""
|
||||
GTK_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
rm -f conf.gtktest
|
||||
])
|
@@ -1,194 +0,0 @@
|
||||
# Configure paths for GTK+
|
||||
# Owen Taylor 97-11-3
|
||||
|
||||
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GTK],
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the gtk-config script
|
||||
dnl
|
||||
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
||||
gtk_config_prefix="$withval", gtk_config_prefix="")
|
||||
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
||||
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
||||
, enable_gtktest=yes)
|
||||
|
||||
for module in . $4
|
||||
do
|
||||
case "$module" in
|
||||
gthread)
|
||||
gtk_config_args="$gtk_config_args gthread"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if test x$gtk_config_exec_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
fi
|
||||
fi
|
||||
if test x$gtk_config_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
|
||||
min_gtk_version=ifelse([$1], ,0.99.7,$1)
|
||||
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
else
|
||||
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
|
||||
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
|
||||
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_gtktest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$GTK_LIBS $LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed GTK is sufficiently new. (Also sanity
|
||||
dnl checks the results of gtk-config to some extent
|
||||
dnl
|
||||
rm -f conf.gtktest
|
||||
AC_TRY_RUN([
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.gtktest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup("$min_gtk_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_gtk_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
||||
(gtk_micro_version != $gtk_config_micro_version))
|
||||
{
|
||||
printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
printf("*** before re-running configure\n");
|
||||
}
|
||||
#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
|
||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
||||
{
|
||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
||||
printf("*** library (version %d.%d.%d)\n",
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
}
|
||||
#endif /* defined (GTK_MAJOR_VERSION) ... */
|
||||
else
|
||||
{
|
||||
if ((gtk_major_version > major) ||
|
||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
||||
major, minor, micro);
|
||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_gtk" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
echo "*** The gtk-config script installed by GTK could not be found"
|
||||
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
echo "*** full path to gtk-config."
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run GTK test program, checking why..."
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdio.h>
|
||||
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
||||
echo "***"
|
||||
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
||||
echo "*** came with the system with the command"
|
||||
echo "***"
|
||||
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
GTK_CFLAGS=""
|
||||
GTK_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
rm -f conf.gtktest
|
||||
])
|
@@ -1,156 +0,0 @@
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
else
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_failed=yes])
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[$4])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
||||
[$4])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
@@ -1,181 +0,0 @@
|
||||
# Configure paths for SDL
|
||||
# Sam Lantinga 9/21/99
|
||||
# stolen from Manish Singh
|
||||
# stolen back from Frank Belew
|
||||
# stolen from Manish Singh
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_SDL],
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the sdl-config script
|
||||
dnl
|
||||
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
||||
sdl_prefix="$withval", sdl_prefix="")
|
||||
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
||||
sdl_exec_prefix="$withval", sdl_exec_prefix="")
|
||||
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
|
||||
, enable_sdltest=yes)
|
||||
|
||||
if test x$sdl_exec_prefix != x ; then
|
||||
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
if test x$sdl_prefix != x ; then
|
||||
sdl_args="$sdl_args --prefix=$sdl_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$prefix" != xNONE; then
|
||||
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
fi
|
||||
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
|
||||
min_sdl_version=ifelse([$1], ,0.11.0,$1)
|
||||
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
|
||||
no_sdl=""
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
no_sdl=yes
|
||||
else
|
||||
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
||||
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_sdltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed SDL is sufficiently new. (Also sanity
|
||||
dnl checks the results of sdl-config to some extent
|
||||
dnl
|
||||
rm -f conf.sdltest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "SDL.h"
|
||||
|
||||
char*
|
||||
my_strdup (char *str)
|
||||
{
|
||||
char *new_str;
|
||||
|
||||
if (str)
|
||||
{
|
||||
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
|
||||
strcpy (new_str, str);
|
||||
}
|
||||
else
|
||||
new_str = NULL;
|
||||
|
||||
return new_str;
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
/* This hangs on some systems (?)
|
||||
system ("touch conf.sdltest");
|
||||
*/
|
||||
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = my_strdup("$min_sdl_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_sdl_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($sdl_major_version > major) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
|
||||
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
|
||||
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_sdl" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
echo "*** The sdl-config script installed by SDL could not be found"
|
||||
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the SDL_CONFIG environment variable to the"
|
||||
echo "*** full path to sdl-config."
|
||||
else
|
||||
if test -f conf.sdltest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run SDL test program, checking why..."
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include "SDL.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{ return 0; }
|
||||
#undef main
|
||||
#define main K_and_R_C_main
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding SDL or finding the wrong"
|
||||
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
|
||||
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
SDL_CFLAGS=""
|
||||
SDL_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(SDL_CFLAGS)
|
||||
AC_SUBST(SDL_LIBS)
|
||||
rm -f conf.sdltest
|
||||
])
|
@@ -1,26 +0,0 @@
|
||||
# Created: 2005/03/12
|
||||
# Author: David Elliott
|
||||
|
||||
# For autoconf: Debian in their infinite wisdom decided to improve upon
|
||||
# the standard autoconf 2.59 macros. Thus Debian's autoconf generates
|
||||
# a totally different configure script. This fixes it to look
|
||||
# mostly like Debian's. There are also some fixes pulled in from the OS/2
|
||||
# fork of autoconf.
|
||||
|
||||
# Rule to freeze the m4 so autoconf will actually use it.
|
||||
# NOTE: VERY important to cd to somewhere there are no .m4 files.
|
||||
# or at least no aclocal.m4 or else autom4te helpfully picks it up.
|
||||
.PHONY: all
|
||||
all: autoconf/autoconf.m4f
|
||||
|
||||
AUTOCONF_SOURCES = \
|
||||
autoconf/c.m4 \
|
||||
autoconf/general.m4 \
|
||||
autoconf/libs.m4 \
|
||||
autoconf/status.m4
|
||||
|
||||
AUTOM4TE=autom4te
|
||||
|
||||
autoconf/autoconf.m4f: $(AUTOCONF_SOURCES)
|
||||
$(AUTOM4TE) -B . --language=Autoconf --freeze --output=autoconf/autoconf.m4f
|
||||
|
@@ -1,22 +0,0 @@
|
||||
wxAutohacks
|
||||
|
||||
wxAutohacks is a way of ensuring the configure script remains consistent
|
||||
between developer commits. Previous releases include a build/aclocal_include
|
||||
which has now been moved into the wxWidgets build/aclocal directory.
|
||||
|
||||
At the moment, it is intended to be copied and or symlinked into a wxWidgets
|
||||
source tree. For example, assume you have wxWidgets checked out in the
|
||||
/home/myname/wxCVS/wxWidgets/ path. Then from /home/myname/wxCVS do this:
|
||||
cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxAutohacks
|
||||
|
||||
You will now have wxAutohacks in /home/myname/wxCVS/wxAutohacks/. Now go into
|
||||
the wxWidgets build (/home/myname/wxCVS/wxWidgets/build/) and do this:
|
||||
ln -s ../../wxAutohacks/build/autoconf_prepend-include .
|
||||
|
||||
From now on from the root of your wxWidgets source tree when you do this:
|
||||
make -f build/autogen.mk
|
||||
you will also build an autoconf.m4f file which will ensure the configure
|
||||
script stays consistent.
|
||||
|
||||
Alternatively you can do this:
|
||||
make -f build/autogen.mk AUTOHACKS_PREPEND_INCLUDE_DIR=../wxAutohacks/build/autoconf_prepend-include
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,498 +0,0 @@
|
||||
# This file is part of Autoconf. -*- Autoconf -*-
|
||||
# Checking for libraries.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
# 2002 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
# As a special exception, the Free Software Foundation gives unlimited
|
||||
# permission to copy, distribute and modify the configure scripts that
|
||||
# are the output of Autoconf. You need not follow the terms of the GNU
|
||||
# General Public License when using or distributing such scripts, even
|
||||
# though portions of the text of Autoconf appear in them. The GNU
|
||||
# General Public License (GPL) does govern all other use of the material
|
||||
# that constitutes the Autoconf program.
|
||||
#
|
||||
# Certain portions of the Autoconf source text are designed to be copied
|
||||
# (in certain cases, depending on the input) into the output of
|
||||
# Autoconf. We call these the "data" portions. The rest of the Autoconf
|
||||
# source text consists of comments plus executable code that decides which
|
||||
# of the data portions to output in any given case. We call these
|
||||
# comments and executable code the "non-data" portions. Autoconf never
|
||||
# copies any of the non-data portions into its output.
|
||||
#
|
||||
# This special exception to the GPL applies to versions of Autoconf
|
||||
# released by the Free Software Foundation. When you make and
|
||||
# distribute a modified version of Autoconf, you may extend this special
|
||||
# exception to the GPL to apply to your modified version as well, *unless*
|
||||
# your modified version has the potential to copy into its output some
|
||||
# of the text that was the non-data portion of the version that you started
|
||||
# with. (In other words, unless your change moves or copies text from
|
||||
# the non-data portions to the data portions.) If your modification has
|
||||
# such potential, you must delete any notice of this special exception
|
||||
# to the GPL from your modified version.
|
||||
#
|
||||
# Written by David MacKenzie, with help from
|
||||
# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
|
||||
# Roland McGrath, Noah Friedman, david d zuhn, and many others.
|
||||
|
||||
# Table of contents
|
||||
#
|
||||
# 1. Generic tests for libraries
|
||||
# 2. Tests for specific libraries
|
||||
|
||||
|
||||
## --------------------------------- ##
|
||||
## 1. Generic tests for libraries.## ##
|
||||
## --------------------------------- ##
|
||||
|
||||
|
||||
|
||||
# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# --------------------------------------------------------
|
||||
# Search for a library defining FUNC, if it's not already available.
|
||||
AC_DEFUN([AC_SEARCH_LIBS],
|
||||
[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
|
||||
[ac_func_search_save_LIBS=$LIBS
|
||||
ac_cv_search_$1=no
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
|
||||
[ac_cv_search_$1="none required"])
|
||||
if test "$ac_cv_search_$1" = no; then
|
||||
for ac_lib in $2; do
|
||||
LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
|
||||
[ac_cv_search_$1="-l$ac_lib"
|
||||
break])
|
||||
done
|
||||
fi
|
||||
LIBS=$ac_func_search_save_LIBS])
|
||||
AS_IF([test "$ac_cv_search_$1" != no],
|
||||
[test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
|
||||
$3],
|
||||
[$4])dnl
|
||||
])
|
||||
|
||||
|
||||
|
||||
# AC_CHECK_LIB(LIBRARY, FUNCTION,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# Use a cache variable name containing both the library and function name,
|
||||
# because the test really is for library $1 defining function $2, not
|
||||
# just for library $1. Separate tests with the same $1 and different $2s
|
||||
# may have different results.
|
||||
#
|
||||
# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])
|
||||
# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
|
||||
# ac_cv_lib_$lib_fun, which is definitely not what was meant. Hence
|
||||
# the AS_LITERAL_IF indirection.
|
||||
#
|
||||
# FIXME: This macro is extremely suspicious. It DEFINEs unconditionally,
|
||||
# whatever the FUNCTION, in addition to not being a *S macro. Note
|
||||
# that the cache does depend upon the function we are looking for.
|
||||
#
|
||||
# It is on purpose we used `ac_check_lib_save_LIBS' and not just
|
||||
# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
|
||||
# changed but still want to use AC_CHECK_LIB, so they save `LIBS'.
|
||||
# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
|
||||
# freedom.
|
||||
AC_DEFUN([AC_CHECK_LIB],
|
||||
[m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
|
||||
AS_LITERAL_IF([$1],
|
||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
|
||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
|
||||
AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
|
||||
[ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-l$1 $5 $LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
|
||||
[AS_VAR_SET(ac_Lib, yes)],
|
||||
[AS_VAR_SET(ac_Lib, no)])
|
||||
LIBS=$ac_check_lib_save_LIBS])
|
||||
AS_IF([test AS_VAR_GET(ac_Lib) = yes],
|
||||
[m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
|
||||
LIBS="-l$1 $LIBS"
|
||||
])],
|
||||
[$4])dnl
|
||||
AS_VAR_POPDEF([ac_Lib])dnl
|
||||
])# AC_CHECK_LIB
|
||||
|
||||
|
||||
# AH_CHECK_LIB(LIBNAME)
|
||||
# ---------------------
|
||||
m4_define([AH_CHECK_LIB],
|
||||
[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
|
||||
[Define to 1 if you have the `]$1[' library (-l]$1[).])])
|
||||
|
||||
|
||||
# AC_HAVE_LIBRARY(LIBRARY,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# ---------------------------------------------------------
|
||||
#
|
||||
# This macro is equivalent to calling `AC_CHECK_LIB' with a FUNCTION
|
||||
# argument of `main'. In addition, LIBRARY can be written as any of
|
||||
# `foo', `-lfoo', or `libfoo.a'. In all of those cases, the compiler
|
||||
# is passed `-lfoo'. However, LIBRARY cannot be a shell variable;
|
||||
# it must be a literal name.
|
||||
AU_DEFUN([AC_HAVE_LIBRARY],
|
||||
[m4_pushdef([AC_Lib_Name],
|
||||
m4_bpatsubst(m4_bpatsubst([[$1]],
|
||||
[lib\([^\.]*\)\.a], [\1]),
|
||||
[-l], []))dnl
|
||||
AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl
|
||||
ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
|
||||
m4_popdef([AC_Lib_Name])dnl
|
||||
])
|
||||
|
||||
|
||||
|
||||
|
||||
## --------------------------------- ##
|
||||
## 2. Tests for specific libraries. ##
|
||||
## --------------------------------- ##
|
||||
|
||||
|
||||
|
||||
# --------------------- #
|
||||
# Checks for X window. #
|
||||
# --------------------- #
|
||||
|
||||
|
||||
# _AC_PATH_X_XMKMF
|
||||
# ----------------
|
||||
# Internal subroutine of _AC_PATH_X.
|
||||
# Set ac_x_includes and/or ac_x_libraries.
|
||||
m4_define([_AC_PATH_X_XMKMF],
|
||||
[rm -fr conftest.dir
|
||||
if mkdir conftest.dir; then
|
||||
cd conftest.dir
|
||||
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
|
||||
cat >Imakefile <<'_ACEOF'
|
||||
acfindx:
|
||||
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
|
||||
_ACEOF
|
||||
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
|
||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||
eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
|
||||
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
||||
for ac_extension in a so sl; do
|
||||
if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
|
||||
test -f $ac_im_libdir/libX11.$ac_extension; then
|
||||
ac_im_usrlibdir=$ac_im_libdir; break
|
||||
fi
|
||||
done
|
||||
# Screen out bogus values from the imake configuration. They are
|
||||
# bogus both because they are the default anyway, and because
|
||||
# using them would break gcc on systems where it needs fixed includes.
|
||||
case $ac_im_incroot in
|
||||
/usr/include) ;;
|
||||
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
||||
esac
|
||||
case $ac_im_usrlibdir in
|
||||
/usr/lib | /lib) ;;
|
||||
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
|
||||
esac
|
||||
fi
|
||||
cd ..
|
||||
rm -fr conftest.dir
|
||||
fi
|
||||
])# _AC_PATH_X_XMKMF
|
||||
|
||||
|
||||
# _AC_PATH_X_DIRECT
|
||||
# -----------------
|
||||
# Internal subroutine of _AC_PATH_X.
|
||||
# Set ac_x_includes and/or ac_x_libraries.
|
||||
m4_define([_AC_PATH_X_DIRECT],
|
||||
[# Standard set of common directories for X headers.
|
||||
# Check X11 before X11Rn because it is often a symlink to the current release.
|
||||
ac_x_header_dirs='
|
||||
/usr/X11/include
|
||||
/usr/X11R6/include
|
||||
/usr/X11R5/include
|
||||
/usr/X11R4/include
|
||||
|
||||
/usr/include/X11
|
||||
/usr/include/X11R6
|
||||
/usr/include/X11R5
|
||||
/usr/include/X11R4
|
||||
|
||||
/usr/local/X11/include
|
||||
/usr/local/X11R6/include
|
||||
/usr/local/X11R5/include
|
||||
/usr/local/X11R4/include
|
||||
|
||||
/usr/local/include/X11
|
||||
/usr/local/include/X11R6
|
||||
/usr/local/include/X11R5
|
||||
/usr/local/include/X11R4
|
||||
|
||||
/usr/X386/include
|
||||
/usr/x386/include
|
||||
/usr/XFree86/include/X11
|
||||
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/usr/unsupported/include
|
||||
/usr/athena/include
|
||||
/usr/local/x11r5/include
|
||||
/usr/lpp/Xamples/include
|
||||
|
||||
/usr/openwin/include
|
||||
/usr/openwin/share/include'
|
||||
|
||||
if test "$ac_x_includes" = no; then
|
||||
# Guess where to find include files, by looking for a specified header file.
|
||||
# First, try using that file with no special directory specified.
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
|
||||
[# We can compile using X headers with no special include directory.
|
||||
ac_x_includes=],
|
||||
[for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
done])
|
||||
fi # $ac_x_includes = no
|
||||
|
||||
if test "$ac_x_libraries" = no; then
|
||||
# Check for the libraries.
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lXt $LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
|
||||
[XtMalloc (0)])],
|
||||
[LIBS=$ac_save_LIBS
|
||||
# We can link X programs with no special library path.
|
||||
ac_x_libraries=],
|
||||
[LIBS=$ac_save_LIBS
|
||||
for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done])
|
||||
fi # $ac_x_libraries = no
|
||||
])# _AC_PATH_X_DIRECT
|
||||
|
||||
|
||||
# _AC_PATH_X
|
||||
# ----------
|
||||
# Compute ac_cv_have_x.
|
||||
AC_DEFUN([_AC_PATH_X],
|
||||
[AC_CACHE_VAL(ac_cv_have_x,
|
||||
[# One or both of the vars are not set, and there is no cached value.
|
||||
ac_x_includes=no ac_x_libraries=no
|
||||
_AC_PATH_X_XMKMF
|
||||
_AC_PATH_X_DIRECT
|
||||
if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
|
||||
# Didn't find X anywhere. Cache the known absence of X.
|
||||
ac_cv_have_x="have_x=no"
|
||||
else
|
||||
# Record where we found X for the cache.
|
||||
ac_cv_have_x="have_x=yes \
|
||||
ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
|
||||
fi])dnl
|
||||
])
|
||||
|
||||
|
||||
# AC_PATH_X
|
||||
# ---------
|
||||
# If we find X, set shell vars x_includes and x_libraries to the
|
||||
# paths, otherwise set no_x=yes.
|
||||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
AN_HEADER([X11/Xlib.h], [AC_PATH_X])
|
||||
AC_DEFUN([AC_PATH_X],
|
||||
[dnl Document the X abnormal options inherited from history.
|
||||
m4_divert_once([HELP_BEGIN], [
|
||||
X features:
|
||||
--x-includes=DIR X include files are in DIR
|
||||
--x-libraries=DIR X library files are in DIR])dnl
|
||||
|
||||
if test "x$ac_path_x_has_been_run" != xyes; then
|
||||
AC_MSG_CHECKING([for X])
|
||||
|
||||
ac_path_x_has_been_run=yes
|
||||
AC_ARG_WITH(x, [ --with-x use the X Window System])
|
||||
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
||||
if test "x$with_x" = xno; then
|
||||
# The user explicitly disabled X.
|
||||
have_x=disabled
|
||||
else
|
||||
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
|
||||
# Both variables are already set.
|
||||
have_x=yes
|
||||
else
|
||||
_AC_PATH_X
|
||||
fi
|
||||
eval "$ac_cv_have_x"
|
||||
fi # $with_x != no
|
||||
|
||||
if test "$have_x" != yes; then
|
||||
AC_MSG_RESULT([$have_x])
|
||||
no_x=yes
|
||||
else
|
||||
# If each of the values was on the command line, it overrides each guess.
|
||||
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
||||
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
||||
# Update the cache value to reflect the command line values.
|
||||
ac_cv_have_x="have_x=yes \
|
||||
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
|
||||
# It might be that x_includes is empty (headers are found in the
|
||||
# standard search path. Then output the corresponding message
|
||||
ac_out_x_includes=$x_includes
|
||||
test "x$x_includes" = x && ac_out_x_includes="in standard search path"
|
||||
AC_MSG_RESULT([libraries $x_libraries, headers $ac_out_x_includes])
|
||||
fi
|
||||
|
||||
fi])# AC_PATH_X
|
||||
|
||||
|
||||
|
||||
# AC_PATH_XTRA
|
||||
# ------------
|
||||
# Find additional X libraries, magic flags, etc.
|
||||
AC_DEFUN([AC_PATH_XTRA],
|
||||
[AC_REQUIRE([AC_PATH_X])dnl
|
||||
if test "$no_x" = yes; then
|
||||
# Not all programs may use this symbol, but it does not hurt to define it.
|
||||
AC_DEFINE([X_DISPLAY_MISSING], 1,
|
||||
[Define to 1 if the X Window System is missing or not being used.])
|
||||
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
|
||||
else
|
||||
if test -n "$x_includes"; then
|
||||
X_CFLAGS="$X_CFLAGS -I$x_includes"
|
||||
fi
|
||||
|
||||
# It would also be nice to do this for all -L options, not just this one.
|
||||
if test -n "$x_libraries"; then
|
||||
X_LIBS="$X_LIBS -L$x_libraries"
|
||||
dnl FIXME: banish uname from this macro!
|
||||
# For Solaris; some versions of Sun CC require a space after -R and
|
||||
# others require no space. Words are not sufficient . . . .
|
||||
case `(uname -sr) 2>/dev/null` in
|
||||
"SunOS 5"*)
|
||||
AC_MSG_CHECKING([whether -R must be followed by a space])
|
||||
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
|
||||
if test $ac_R_nospace = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
X_LIBS="$X_LIBS -R$x_libraries"
|
||||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
|
||||
if test $ac_R_space = yes; then
|
||||
AC_MSG_RESULT([yes])
|
||||
X_LIBS="$X_LIBS -R $x_libraries"
|
||||
else
|
||||
AC_MSG_RESULT([neither works])
|
||||
fi
|
||||
fi
|
||||
LIBS=$ac_xsave_LIBS
|
||||
esac
|
||||
fi
|
||||
|
||||
# Check for system-dependent libraries X programs must link with.
|
||||
# Do this before checking for the system-independent R6 libraries
|
||||
# (-lICE), since we may need -lsocket or whatever for X linking.
|
||||
|
||||
if test "$ISC" = yes; then
|
||||
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
||||
else
|
||||
# Martyn Johnson says this is needed for Ultrix, if the X
|
||||
# libraries were built with DECnet support. And Karl Berry says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])],
|
||||
[],
|
||||
[AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
|
||||
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
||||
AC_CHECK_LIB(dnet_stub, dnet_ntoa,
|
||||
[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
|
||||
fi])
|
||||
LIBS="$ac_xsave_LIBS"
|
||||
|
||||
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
||||
# to get the SysV transport functions.
|
||||
# Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
|
||||
# needs -lnsl.
|
||||
# The nsl library prevents programs from opening the X display
|
||||
# on Irix 5.2, according to T.E. Dickey.
|
||||
# The functions gethostbyname, getservbyname, and inet_addr are
|
||||
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
|
||||
AC_CHECK_FUNC(gethostbyname)
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
|
||||
if test $ac_cv_lib_nsl_gethostbyname = no; then
|
||||
AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
|
||||
fi
|
||||
fi
|
||||
|
||||
# lieder@skyler.mavd.honeywell.com says without -lsocket,
|
||||
# socket/setsockopt and other routines are undefined under SCO ODT
|
||||
# 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
|
||||
# on later versions), says Simon Leinen: it contains gethostby*
|
||||
# variants that don't use the name server (or something). -lsocket
|
||||
# must be given before -lnsl if both are needed. We assume that
|
||||
# if connect needs -lnsl, so does gethostbyname.
|
||||
AC_CHECK_FUNC(connect)
|
||||
if test $ac_cv_func_connect = no; then
|
||||
AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
|
||||
$X_EXTRA_LIBS)
|
||||
fi
|
||||
|
||||
# Guillermo Gomez says -lposix is necessary on A/UX.
|
||||
AC_CHECK_FUNC(remove)
|
||||
if test $ac_cv_func_remove = no; then
|
||||
AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
|
||||
fi
|
||||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
AC_CHECK_FUNC(shmat)
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check for libraries that X11R6 Xt/Xaw programs need.
|
||||
ac_save_LDFLAGS=$LDFLAGS
|
||||
test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
|
||||
# check for ICE first), but we must link in the order -lSM -lICE or
|
||||
# we get undefined symbols. So assume we have SM if we have ICE.
|
||||
# These have to be linked with before -lX11, unlike the other
|
||||
# libraries we check for below, so use a different variable.
|
||||
# John Interrante, Karl Berry
|
||||
AC_CHECK_LIB(ICE, IceConnectionNumber,
|
||||
[X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
|
||||
LDFLAGS=$ac_save_LDFLAGS
|
||||
|
||||
fi
|
||||
AC_SUBST(X_CFLAGS)dnl
|
||||
AC_SUBST(X_PRE_LIBS)dnl
|
||||
AC_SUBST(X_LIBS)dnl
|
||||
AC_SUBST(X_EXTRA_LIBS)dnl
|
||||
])# AC_PATH_XTRA
|
File diff suppressed because it is too large
Load Diff
@@ -1,66 +0,0 @@
|
||||
# Created: 2005/03/12
|
||||
# Author: David Elliott
|
||||
|
||||
# Usage Example:
|
||||
# make -f build/autogen.mk ACLOCAL=aclocal-1.9
|
||||
|
||||
# This is a simple Makefile to update the UNIX build system in such a
|
||||
# way that doing a cvs diff on its output files should reveal only the
|
||||
# true changes, not meaningless differences due to slightly different
|
||||
# autoconf or aclocal m4 files.
|
||||
|
||||
# For aclocal: All necessary m4 files are located in the build/aclocal
|
||||
# directory. Running aclocal -I build/aclocal when using aclocal 1.9
|
||||
# will result in an aclocal.m4 which uses m4_include for these files.
|
||||
|
||||
ACLOCAL=aclocal
|
||||
AUTOCONF=autoconf
|
||||
BAKEFILE_GEN=bakefile_gen
|
||||
AUTOHACKS_PREPEND_INCLUDE_DIR=build/autoconf_prepend-include
|
||||
|
||||
# configure depends on everything else so this will build everything.
|
||||
.PHONY: all
|
||||
all: configure
|
||||
|
||||
.PHONY: autoconf_m4f
|
||||
|
||||
# Invoke make on wxAutohacks dir, but don't fail if it's not present
|
||||
autoconf_m4f:
|
||||
-make -C $(AUTOHACKS_PREPEND_INCLUDE_DIR)
|
||||
|
||||
BAKEFILES=\
|
||||
build/bakefiles/wx.bkl \
|
||||
build/bakefiles/common.bkl \
|
||||
build/bakefiles/files.bkl \
|
||||
build/bakefiles/monolithic.bkl \
|
||||
build/bakefiles/multilib.bkl \
|
||||
build/bakefiles/opengl.bkl \
|
||||
build/bakefiles/plugins.bkl \
|
||||
build/bakefiles/build_cfg.bkl
|
||||
|
||||
# Run bakefile-gen (which generates everything) whenever a bakefile is newer
|
||||
# than Makefile.in or autoconf_inc.m4.
|
||||
# This dep is obviously wrong but probably close enough
|
||||
autoconf_inc.m4 Makefile.in: $(BAKEFILES)
|
||||
cd build/bakefiles && \
|
||||
$(BAKEFILE_GEN) -f autoconf
|
||||
|
||||
# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
|
||||
# Depend on our custom autoconf.m4f
|
||||
configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
|
||||
$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
|
||||
|
||||
ACLOCAL_SOURCES = \
|
||||
build/aclocal/bakefile.m4 \
|
||||
build/aclocal/bakefile-lang.m4 \
|
||||
build/aclocal/cppunit.m4 \
|
||||
build/aclocal/gst-element-check.m4 \
|
||||
build/aclocal/gtk-2.0.m4 \
|
||||
build/aclocal/gtk.m4 \
|
||||
build/aclocal/pkg.m4 \
|
||||
build/aclocal/sdl.m4
|
||||
|
||||
# Run aclocal whenever acinclude or one of our local m4s is updated.
|
||||
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
|
||||
$(ACLOCAL) -I build/aclocal
|
||||
|
@@ -14,19 +14,20 @@
|
||||
</bakefile-gen>
|
||||
|
||||
Reasons why these formats are disabled (and so not in CVS):
|
||||
|
||||
|
||||
dmars - In beta testing, will be added when it stabilizes.
|
||||
dmars_smake - ditto
|
||||
msevc4prj - ditto
|
||||
cbuilderx - Generated projects are too bad to be included in CVS. Please
|
||||
*do not* enable this format until FIXMEs in .bkl files related
|
||||
to cbuilderx are addressed. In particular, the project must
|
||||
be placed into build/msw(?) directory and store object files
|
||||
in its subdirectory and it must copy setup.h as others do.
|
||||
cbx_unix - Doesn't integrate well and won't be used by most Unix people.
|
||||
dmars, dmars_smake, msevc4prj - These are generated at release time and
|
||||
we don't want to clutter the source tree with these files.
|
||||
-->
|
||||
|
||||
<disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
|
||||
|
||||
|
||||
<disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
|
||||
|
||||
|
||||
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
|
||||
<input>
|
||||
@@ -52,24 +53,24 @@
|
||||
<add-formats>
|
||||
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
|
||||
</add-formats>
|
||||
|
||||
|
||||
<del-formats files="../../samples/*.bkl">
|
||||
autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../demos/*.bkl">
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/html/html_samples.bkl">
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/mobile/mobile_samples.bkl">
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/opengl/opengl_samples.bkl">
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../utils/*.bkl">
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
|
||||
<!-- WinCE can't have console apps: -->
|
||||
@@ -79,16 +80,11 @@
|
||||
<del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
|
||||
<del-formats files="../../tests/*">msevc4prj</del-formats>
|
||||
|
||||
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
|
||||
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
|
||||
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
|
||||
|
||||
|
||||
<!-- Default flags (for all formats and bakefiles): -->
|
||||
<add-flags>-Iformats</add-flags>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Directories where the files go: -->
|
||||
<add-flags files="wx.bkl" formats="autoconf">
|
||||
-o../../Makefile.in
|
||||
@@ -114,9 +110,6 @@
|
||||
<add-flags files="wx.bkl" formats="msvc6prj">
|
||||
-o../msw/wx.dsw
|
||||
</add-flags>
|
||||
<add-flags files="wx.bkl" formats="msvs2005prj">
|
||||
-o../msw/wx.sln
|
||||
</add-flags>
|
||||
<add-flags files="wx.bkl" formats="msevc4prj">
|
||||
-o../wince/wx.vcw
|
||||
</add-flags>
|
||||
@@ -134,17 +127,22 @@
|
||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
|
||||
</add-flags>
|
||||
<add-flags files="../../contrib/build/*/*.bkl"
|
||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
|
||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
|
||||
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
|
||||
</add-flags>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Format specific settings: -->
|
||||
<add-flags formats="autoconf">
|
||||
-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
|
||||
</add-flags>
|
||||
|
||||
<add-formats files="wx.bkl">wx24dsp</add-formats>
|
||||
<add-flags formats="wx24dsp">
|
||||
-DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
|
||||
</add-flags>
|
||||
|
||||
<add-formats files="wx.bkl">rpmspec</add-formats>
|
||||
|
||||
|
||||
@@ -156,7 +154,7 @@
|
||||
<del-flags files="wx.bkl">
|
||||
-DWRITE_OPTIONS_FILE=0
|
||||
</del-flags>
|
||||
|
||||
|
||||
<add-flags files="wx.bkl" formats="borland">
|
||||
-DOPTIONS_FILE=config.bcc
|
||||
</add-flags>
|
||||
@@ -180,7 +178,7 @@
|
||||
<add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
|
||||
<add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
|
||||
<add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
|
||||
|
||||
|
||||
<add-flags files="../../*/*" formats="borland">
|
||||
-DOPTIONS_FILE=../build/msw/config.bcc
|
||||
</add-flags>
|
||||
@@ -254,15 +252,6 @@
|
||||
-DOPTIONS_FILE=../../../../build/msw/config.wat
|
||||
</add-flags>
|
||||
|
||||
|
||||
<!-- Makefiles for out-of-tree building of samples on Unix: -->
|
||||
<add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
|
||||
gnu
|
||||
</add-formats>
|
||||
<add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
|
||||
formats="gnu">
|
||||
-DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
|
||||
</add-flags>
|
||||
|
||||
<!-- Personal customizations (not in CVS): -->
|
||||
<include file="Bakefiles.local.bkgen" ignore_missing="1"/>
|
||||
|
@@ -8,8 +8,7 @@
|
||||
the library.
|
||||
-->
|
||||
|
||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
|
||||
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
|
||||
|
||||
<set var="BUILD_CFG_FILE" make_var="1">
|
||||
$(SETUPHDIR)$(DIRSEP)build.cfg
|
||||
@@ -39,11 +38,9 @@
|
||||
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
|
||||
@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
|
||||
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
|
||||
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
|
||||
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
||||
<makefile>
|
||||
|
||||
<requires version="0.2.1"/>
|
||||
<requires version="0.1.7"/>
|
||||
|
||||
<!-- bakefile modules we need: -->
|
||||
<using module="datafiles"/>
|
||||
@@ -29,9 +29,37 @@
|
||||
|
||||
<include file="plugins_deps.bkl"/>
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- wxWidgets version numbers: -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<!-- wxWidgets version numbers logic: -->
|
||||
<include file="version.bkl"/>
|
||||
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
|
||||
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
|
||||
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
|
||||
<set var="WX_RELEASE" make_var="1">
|
||||
$(WXVER_MAJOR).$(WXVER_MINOR)
|
||||
</set>
|
||||
<set var="WX_RELEASE_NODOT" make_var="1">
|
||||
$(WXVER_MAJOR)$(WXVER_MINOR)
|
||||
</set>
|
||||
<set var="WX_VERSION" make_var="1">
|
||||
$(WX_RELEASE).$(WXVER_RELEASE)
|
||||
</set>
|
||||
<set var="WX_VERSION_NODOT" make_var="1">
|
||||
$(WX_RELEASE_NODOT)$(WXVER_RELEASE)
|
||||
</set>
|
||||
|
||||
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
|
||||
|
||||
<set var="WXSOVERSION">
|
||||
<if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
|
||||
<if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
|
||||
</set>
|
||||
<set var="WXMACVERSION">$(WX_VERSION)</set>
|
||||
<set var="WXWIN32DLLVERSION">
|
||||
<if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
|
||||
<if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
|
||||
</set>
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
@@ -130,7 +158,7 @@
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
|
||||
</set>
|
||||
<set var="WXLIB_MEDIA">
|
||||
<if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
|
||||
</set>
|
||||
<set var="WXLIB_HTML">
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
|
||||
@@ -149,12 +177,6 @@
|
||||
<set var="WXLIB_DBGRID">
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
|
||||
</set>
|
||||
<set var="WXLIB_AUI">
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
|
||||
</set>
|
||||
<set var="WXLIB_RICHTEXT">
|
||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
|
||||
</set>
|
||||
|
||||
<set var="WXLIB_MONO">
|
||||
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
|
||||
@@ -167,10 +189,6 @@
|
||||
|
||||
<set var="DIR_SUFFIX_CPU">
|
||||
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
|
||||
<if cond="TARGET_CPU=='amd64'">_amd64</if>
|
||||
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
|
||||
<if cond="TARGET_CPU=='ia64'">_ia64</if>
|
||||
<if cond="TARGET_CPU=='IA64'">_ia64</if>
|
||||
</set>
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
@@ -193,14 +211,12 @@
|
||||
</if>
|
||||
|
||||
<set var="LIBTYPE_SUFFIX" make_var="1">
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
|
||||
<if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
|
||||
<if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
|
||||
</set>
|
||||
|
||||
<set var="LIBDIRNAME" make_var="1">
|
||||
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
|
||||
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
</if>
|
||||
@@ -248,13 +264,13 @@
|
||||
</set>
|
||||
|
||||
<set var="RTTI_DEFINE">
|
||||
<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
|
||||
<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
|
||||
</set>
|
||||
<set var="EXCEPTIONS_DEFINE">
|
||||
<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
|
||||
<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
|
||||
</set>
|
||||
<set var="THREAD_DEFINE">
|
||||
<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
|
||||
<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
|
||||
</set>
|
||||
|
||||
<set var="DEBUG_DEFINE">
|
||||
@@ -269,9 +285,6 @@
|
||||
<set var="UNICODE_DEFINE">
|
||||
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
|
||||
</set>
|
||||
<set var="MSLU_DEFINE">
|
||||
<if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
|
||||
</set>
|
||||
|
||||
<!-- fill for the specific case of the format/compiler -->
|
||||
<set var="WIN32_WINNT">
|
||||
@@ -282,22 +295,6 @@
|
||||
<if cond="MSLU=='1'">unicows</if>
|
||||
</set>
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<set var="GDIPLUS_LIB">
|
||||
<if cond="USE_GDIPLUS=='1'">gdiplus</if>
|
||||
</set>
|
||||
<set var="GFXCTX_DEFINE">
|
||||
<if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<set var="LINK_TARGET_CPU">
|
||||
<if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
|
||||
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
|
||||
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
|
||||
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
|
||||
</set>
|
||||
|
||||
<template id="common_settings">
|
||||
<debug-info>$(DEBUGINFO)</debug-info>
|
||||
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
|
||||
@@ -311,17 +308,6 @@
|
||||
</if>
|
||||
<define>$(NO_VC_CRTDBG)</define>
|
||||
<define>$(WIN32_WINNT)</define>
|
||||
<if cond="FORMAT=='msevc4prj' and
|
||||
BAKEFILE_VERSION in ['0.1.9'] and
|
||||
USE_RTTI=='0'">
|
||||
<!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
|
||||
<set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
|
||||
<set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
|
||||
</if>
|
||||
<if cond="FORMAT=='msvc'">
|
||||
<ldflags>$(LINK_TARGET_CPU)</ldflags>
|
||||
</if>
|
||||
<include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>
|
||||
</template>
|
||||
|
||||
<template id="anylib">
|
||||
@@ -347,91 +333,51 @@
|
||||
|
||||
<!-- deal with the need to copy setup.h here: -->
|
||||
|
||||
<set var="IS_MSVC_PRJ">
|
||||
$(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
|
||||
</set>
|
||||
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
|
||||
|
||||
<define-tag name="msvc-headers" rules="dll,lib">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
<msvc-project-files>
|
||||
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
|
||||
</msvc-project-files>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
<set var="msvc_copy_setup_h_script">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
Creating $(SETUPHDIR)\wx\setup.h
|
||||
InputPath=..\..\include\wx\%s
|
||||
|
||||
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
|
||||
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<define-tag name="msvc-headers-setup-h" rules="dll,lib">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
<msvc-headers>
|
||||
$(addPrefixToList('wx/', value))
|
||||
</msvc-headers>
|
||||
<set var="_custom_build_files" append="1">
|
||||
$(nativePaths(addPrefixToList('include/wx/', value)))
|
||||
</set>
|
||||
<!-- FIXME: remove this once we require >=bkl-0.1.9 -->
|
||||
<if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
|
||||
<msvc-project-files>
|
||||
$(addPrefixToList('include\', wxwin.headersOnly(value)))
|
||||
</msvc-project-files>
|
||||
</if>
|
||||
<if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
|
||||
<msvc-project-files>
|
||||
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
|
||||
</msvc-project-files>
|
||||
</if>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
<if cond="FORMAT=='msevc4prj'">
|
||||
<msvc-headers-setup-h>
|
||||
msw/wince/setup.h
|
||||
</msvc-headers-setup-h>
|
||||
<set var="_custom_build_include_wx_msw_wince_setup_h">
|
||||
$(msvc_copy_setup_h_script % 'msw\wince\setup.h')
|
||||
</set>
|
||||
</if>
|
||||
<if cond="FORMAT!='msevc4prj'">
|
||||
<msvc-headers-setup-h>
|
||||
msw/setup.h
|
||||
univ/setup.h
|
||||
</msvc-headers-setup-h>
|
||||
<set var="_custom_build_include_wx_msw_setup_h">
|
||||
<if cond="WXUNIV=='0'">
|
||||
$(msvc_copy_setup_h_script % 'msw\setup.h')
|
||||
</if>
|
||||
</set>
|
||||
<set var="_custom_build_include_wx_univ_setup_h">
|
||||
<if cond="WXUNIV=='1'">
|
||||
$(msvc_copy_setup_h_script % 'univ\setup.h')
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
<if cond="FORMAT=='msevc4prj'">
|
||||
<msvc-headers>wx/msw/wince/setup.h</msvc-headers>
|
||||
<set var="vc_setup_h">wince\setup.h</set>
|
||||
<set var="vc_setup_h_rule">wince_setup_h</set>
|
||||
</if>
|
||||
<if cond="FORMAT!='msevc4prj'">
|
||||
<msvc-headers>wx/msw/setup.h</msvc-headers>
|
||||
<set var="vc_setup_h">setup.h</set>
|
||||
<set var="vc_setup_h_rule">setup_h</set>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
<define-tag name="msvc-create-rcdefs-h" rules="dll,lib">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
<msvc-headers-setup-h>
|
||||
msw/genrcdefs.h
|
||||
</msvc-headers-setup-h>
|
||||
<!-- FIXME: we need another way to get the compiler name -->
|
||||
<set var="VC_COMPILER">
|
||||
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
|
||||
<if cond="FORMAT!='msevc4prj'">cl</if>
|
||||
<set var="_custom_build_files" append="1">
|
||||
include\wx\msw\$(vc_setup_h)
|
||||
</set>
|
||||
<set var="_custom_build_include_wx_msw_genrcdefs_h">
|
||||
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
|
||||
InputPath=..\..\include\wx\msw\genrcdefs.h
|
||||
<set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
|
||||
Creating $(SETUPHDIR)\wx\setup.h
|
||||
InputPath=..\include\wx\msw\$(vc_setup_h)
|
||||
|
||||
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
|
||||
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
|
||||
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
|
||||
</set>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
<template id="msvc_setup_h">
|
||||
<msvc-copy-setup-h/>
|
||||
<msvc-create-rcdefs-h/>
|
||||
</template>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
@@ -465,13 +411,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
|
||||
</set>
|
||||
|
||||
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
|
||||
<set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
|
||||
<set var="MGLPMLIBPATH">
|
||||
<if cond="DOS32=='DOS4GW'">dos4gw</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<template id="wx" template="common_settings">
|
||||
<set var="wxid">$(wxwin.mk_wxid(id))</set>
|
||||
<define>__WX$(TOOLKIT)__</define>
|
||||
@@ -481,15 +420,11 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<define>$(RTTI_DEFINE)</define>
|
||||
<define>$(THREAD_DEFINE)</define>
|
||||
<define>$(UNICODE_DEFINE)</define>
|
||||
<define>$(MSLU_DEFINE)</define>
|
||||
<if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<!-- this include is added by configure, we need to put other
|
||||
includes before it: -->
|
||||
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
||||
<lib-path>$(LIBDIRNAME)</lib-path>
|
||||
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
|
||||
<lib-path>$(MGLLIBPATH)</lib-path>
|
||||
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
|
||||
</if>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<warnings>max</warnings>
|
||||
<cppflags-watcom>
|
||||
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
|
||||
@@ -505,6 +440,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<!-- for both GUI and wxBase libs/samples: -->
|
||||
<template id="wx_append_base_nomono">
|
||||
<!-- link against builtin 3rd party libs, if needed: -->
|
||||
<sys-lib>$(LIB_TIFF)</sys-lib>
|
||||
<sys-lib>$(LIB_JPEG)</sys-lib>
|
||||
<sys-lib>$(LIB_PNG)</sys-lib>
|
||||
<sys-lib>$(LIB_ZLIB)</sys-lib>
|
||||
<sys-lib>$(LIB_ODBC)</sys-lib>
|
||||
<sys-lib>$(LIB_REGEX)</sys-lib>
|
||||
@@ -512,24 +450,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
|
||||
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
|
||||
|
||||
<!-- system libraries on os2: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
|
||||
<if cond="FORMAT=='watcom'">
|
||||
<sys-lib>upm32</sys-lib>
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<!-- system libraries on mgl: -->
|
||||
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
|
||||
<sys-lib>mgl</sys-lib>
|
||||
<sys-lib>mglcpp</sys-lib>
|
||||
<sys-lib>pm</sys-lib>
|
||||
</if>
|
||||
|
||||
<!-- system libraries on windows: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
||||
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
|
||||
<if cond="FORMAT=='borland'">
|
||||
<sys-lib>ole2w32</sys-lib>
|
||||
</if>
|
||||
@@ -557,7 +480,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<sys-lib>advapi32</sys-lib>
|
||||
<sys-lib>wsock32</sys-lib>
|
||||
</if>
|
||||
<if cond="FORMAT=='borland'">
|
||||
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
|
||||
<sys-lib>oleacc</sys-lib>
|
||||
</if>
|
||||
<if cond="FORMAT!='msevc4prj'">
|
||||
@@ -568,10 +491,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
|
||||
|
||||
<!-- for GUI libs/samples: -->
|
||||
<template id="wx_append_nomono" template_append="wx_append_base_nomono">
|
||||
<sys-lib>$(LIB_TIFF)</sys-lib>
|
||||
<sys-lib>$(LIB_JPEG)</sys-lib>
|
||||
<sys-lib>$(LIB_PNG)</sys-lib>
|
||||
<template id="wx_append_nomono" template="wx_append_base_nomono">
|
||||
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
|
||||
</template>
|
||||
|
||||
@@ -593,10 +513,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<libname>$(WXLIBNAME)</libname>
|
||||
|
||||
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
|
||||
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
|
||||
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
|
||||
<precomp-headers-gen>
|
||||
$(WXTOPDIR)src/common/dummy.cpp
|
||||
$(WXTOPDIR)src/msw/dummy.cpp
|
||||
</precomp-headers-gen>
|
||||
</if>
|
||||
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
|
||||
@@ -623,28 +543,19 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
</if>
|
||||
</template>
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<set var="RCDEFDIR">
|
||||
<if cond="TOOLKIT=='MSW'">
|
||||
$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<template id="wx_dll_b" template="wx_lib_b">
|
||||
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
|
||||
<dllname>$(WXDLLNAME)</dllname>
|
||||
<version>$(WX_VERSION)</version>
|
||||
<so_version>$(WXSOVERSION)</so_version>
|
||||
|
||||
<!-- FIXME: until libtool scheme is implemented in bakefile -->
|
||||
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
|
||||
<mac_version>$(WXMACVERSION)</mac_version>
|
||||
|
||||
<!-- version info resources: -->
|
||||
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<res-include>$(RCDEFDIR)</res-include>
|
||||
<res-include>$(TOP_SRCDIR)include</res-include>
|
||||
<if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
|
||||
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
|
||||
<res-include cond="FORMAT=='autoconf'">
|
||||
$(TOP_SRCDIR)include
|
||||
</res-include>
|
||||
</if>
|
||||
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
|
||||
</template>
|
||||
@@ -664,9 +575,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
</template>
|
||||
|
||||
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
|
||||
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
|
||||
<include>$(DOLLAR)(%SCITECH)/include</include>
|
||||
</if>
|
||||
<include>$(INC_TIFF)</include>
|
||||
<include>$(INC_JPEG)</include>
|
||||
<include>$(INC_PNG)</include>
|
||||
|
@@ -35,16 +35,4 @@
|
||||
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
|
||||
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
|
||||
</template>
|
||||
|
||||
<!-- Link against one contrib library. Value must be literal! -->
|
||||
<define-tag name="contrib-lib" rules="exe,dll,module">
|
||||
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
|
||||
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
|
||||
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
|
||||
<depends-on-dsp>
|
||||
$(wxwin.makeContribDspDependency(value))
|
||||
</depends-on-dsp>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
</makefile>
|
||||
|
@@ -3,17 +3,120 @@
|
||||
|
||||
<makefile>
|
||||
|
||||
<include file="common.bkl"/>
|
||||
<set var="file_common_samples_included">1</set>
|
||||
|
||||
<if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
|
||||
<set var="OUT_OF_TREE_MAKEFILES">0</set>
|
||||
<!-- =============================================================== -->
|
||||
<!-- Template for wxWidgets samples: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<set var="MACOSX_RESOURCES">
|
||||
<if cond="TOOLKIT=='MAC'">
|
||||
Carbon.r sample.r
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<if cond="OUT_OF_TREE_MAKEFILES=='1'">
|
||||
<include file="common_samples_outoftree.bkl"/>
|
||||
</if>
|
||||
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
|
||||
<include file="common_samples_intree.bkl"/>
|
||||
<set var="DLLFLAG">
|
||||
<if cond="SHARED=='1'">WXUSINGDLL</if>
|
||||
</set>
|
||||
|
||||
<template id="wx_util_b" template="wx">
|
||||
<include>$(SRCDIR)</include>
|
||||
<define>$(DLLFLAG)</define>
|
||||
</template>
|
||||
|
||||
<template id="wx_util" template="wx_util_b">
|
||||
<app-type>gui</app-type>
|
||||
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
|
||||
<!-- resource files includes: -->
|
||||
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
|
||||
<!-- this include is not added via <include> for autoconf, see
|
||||
common.bkl: -->
|
||||
<res-include cond="FORMAT=='autoconf'">
|
||||
$(TOP_SRCDIR)include
|
||||
</res-include>
|
||||
|
||||
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<wx-os2-lib-resource/>
|
||||
</if>
|
||||
|
||||
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<define>NOPCH</define>
|
||||
</if>
|
||||
</template>
|
||||
|
||||
<template id="wx_util_console" template="wx_util_b">
|
||||
<app-type>console</app-type>
|
||||
<define>wxUSE_GUI=0</define>
|
||||
</template>
|
||||
|
||||
<template id="wx_sample" template="wx_util">
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<wx-mac-app-bundle/>
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
||||
</if>
|
||||
</template>
|
||||
<template id="wx_sample_console" template="wx_util_console">
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
||||
</if>
|
||||
</template>
|
||||
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Support for samples data files: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<define-rule name="wx-data" extends="copy-files">
|
||||
<template>
|
||||
<dependency-of>all</dependency-of>
|
||||
<dstdir>$(BUILDDIR)</dstdir>
|
||||
<srcdir>$(SRCDIR)</srcdir>
|
||||
</template>
|
||||
|
||||
<!--
|
||||
VS - FIXME:
|
||||
Don't clean the files because it would wipe out sources files if
|
||||
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
|
||||
but it would be better to delete the files during "make clean" if
|
||||
BUILDDIR!=SRCDIR.
|
||||
|
||||
<define-tag name="files">
|
||||
<clean-files>
|
||||
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
|
||||
</clean-files>
|
||||
</define-tag>
|
||||
-->
|
||||
</define-rule>
|
||||
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Misc platform specialities: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<include file="mac_bundles.bkl"/>
|
||||
|
||||
<!--
|
||||
A hack to include precompiled OS/2 resource file in apps instead of
|
||||
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
|
||||
compiler):
|
||||
-->
|
||||
<define-tag name="wx-os2-lib-resource" rules="exe">
|
||||
<set var="os2_lib_res">
|
||||
<if cond="PLATFORM_OS2=='1'">
|
||||
$(TOP_SRCDIR)include/wx/os2/wx.res
|
||||
</if>
|
||||
</set>
|
||||
<set var="__objects" append="1">$(os2_lib_res)</set>
|
||||
</define-tag>
|
||||
</if>
|
||||
|
||||
|
||||
</makefile>
|
||||
|
@@ -1,121 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<include file="common.bkl"/>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Template for wxWidgets samples: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<set var="MACOSX_RESOURCES">
|
||||
<if cond="TOOLKIT=='MAC'">
|
||||
Carbon.r sample.r
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
<set var="DLLFLAG">
|
||||
<if cond="SHARED=='1'">WXUSINGDLL</if>
|
||||
</set>
|
||||
|
||||
<template id="wx_util_b" template="wx">
|
||||
<include>$(SRCDIR)</include>
|
||||
<define>$(DLLFLAG)</define>
|
||||
</template>
|
||||
|
||||
<template id="wx_util" template="wx_util_b">
|
||||
<app-type>gui</app-type>
|
||||
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
|
||||
<!-- resource files includes: -->
|
||||
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
|
||||
<!-- this include is not added via <include> for autoconf, see
|
||||
common.bkl: -->
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<res-include>$(RCDEFDIR)</res-include>
|
||||
<res-include>$(TOP_SRCDIR)include</res-include>
|
||||
</if>
|
||||
|
||||
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<wx-os2-lib-resource/>
|
||||
</if>
|
||||
|
||||
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<define>NOPCH</define>
|
||||
</if>
|
||||
</template>
|
||||
|
||||
<template id="wx_util_console" template="wx_util_b">
|
||||
<app-type>console</app-type>
|
||||
<define>wxUSE_GUI=0</define>
|
||||
</template>
|
||||
|
||||
<template id="wx_sample" template="wx_util">
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<wx-mac-app-bundle/>
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
||||
</if>
|
||||
</template>
|
||||
<template id="wx_sample_console" template="wx_util_console">
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
|
||||
</if>
|
||||
</template>
|
||||
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Support for samples data files: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<define-rule name="wx-data" extends="copy-files">
|
||||
<template>
|
||||
<dependency-of>all</dependency-of>
|
||||
<dstdir>$(BUILDDIR)</dstdir>
|
||||
<srcdir>$(SRCDIR)</srcdir>
|
||||
</template>
|
||||
|
||||
<!--
|
||||
VS - FIXME:
|
||||
Don't clean the files because it would wipe out sources files if
|
||||
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
|
||||
but it would be better to delete the files during "make clean" if
|
||||
BUILDDIR!=SRCDIR.
|
||||
|
||||
<define-tag name="files">
|
||||
<clean-files>
|
||||
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
|
||||
</clean-files>
|
||||
</define-tag>
|
||||
-->
|
||||
</define-rule>
|
||||
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Misc platform specialities: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<include file="mac_bundles.bkl"/>
|
||||
|
||||
<!--
|
||||
A hack to include precompiled OS/2 resource file in apps instead of
|
||||
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
|
||||
compiler):
|
||||
-->
|
||||
<define-tag name="wx-os2-lib-resource" rules="exe">
|
||||
<set var="os2_lib_res">
|
||||
<if cond="PLATFORM_OS2=='1'">
|
||||
$(TOP_SRCDIR)include/wx/os2/wx.res
|
||||
</if>
|
||||
</set>
|
||||
<set var="__objects" append="1">$(os2_lib_res)</set>
|
||||
</define-tag>
|
||||
</if>
|
||||
|
||||
</makefile>
|
@@ -1,43 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Templates for out-of-tree Unix makefiles for wxWidgets samples: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<include file="wxpresets/presets/wx.bkl"/>
|
||||
|
||||
<template id="wx_app_base" template="wx">
|
||||
<include>$(SRCDIR)</include>
|
||||
</template>
|
||||
|
||||
<template id="wx_util" template="wx_app_base">
|
||||
<app-type>gui</app-type>
|
||||
</template>
|
||||
|
||||
<template id="wx_util_console" template="wx_app_base">
|
||||
<app-type>console</app-type>
|
||||
</template>
|
||||
|
||||
<template id="wx_sample" template="wx_util"/>
|
||||
<template id="wx_sample_console" template="wx_util_console"/>
|
||||
|
||||
|
||||
<define-rule name="wx-gui-plugin" extends="module">
|
||||
<template template="wx_app_base"/>
|
||||
</define-rule>
|
||||
|
||||
|
||||
<!-- empty stubs for things that don't make sense for makefile.unx: -->
|
||||
<template id="wx_append"/>
|
||||
<template id="wx_append_base"/>
|
||||
|
||||
<define-rule name="wx-data" pseudo="1">
|
||||
<define-tag name="files"/>
|
||||
<define-tag name="dstdir"/>
|
||||
<define-tag name="srcdir"/>
|
||||
</define-rule>
|
||||
|
||||
</makefile>
|
@@ -5,29 +5,6 @@
|
||||
|
||||
<set var="BUILDING_LIB" overwrite="0">0</set>
|
||||
|
||||
<set var="CPP_DEFAULT_VALUE">
|
||||
<if cond="FORMAT=='borland'">
|
||||
cpp32 -Sr -oCON
|
||||
</if>
|
||||
<if cond="FORMAT=='mingw'">
|
||||
$(DOLLAR)(CC) -E
|
||||
</if>
|
||||
<if cond="FORMAT=='msvc'">
|
||||
$(DOLLAR)(CC) /EP /nologo
|
||||
</if>
|
||||
<if cond="FORMAT=='watcom'">
|
||||
$(DOLLAR)(CC) -p
|
||||
</if>
|
||||
</set>
|
||||
<option name="CPP">
|
||||
<default-value>
|
||||
$(CPP_DEFAULT_VALUE)
|
||||
</default-value>
|
||||
<description>
|
||||
The C preprocessor
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="SHARED">
|
||||
<values>0,1</values>
|
||||
<values-description>,DLL</values-description>
|
||||
@@ -76,30 +53,12 @@
|
||||
Type of compiled binaries
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<if cond="FORMAT=='msvc'">
|
||||
<option name="TARGET_CPU">
|
||||
<default-value>$(DOLLAR)(CPU)</default-value>
|
||||
<description>
|
||||
The target processor architecture must be specified when it is not X86.
|
||||
This does not affect the compiler output, so you still need to make sure
|
||||
your environment is set up appropriately with the correct compiler in the
|
||||
PATH. Rather it affects some options passed to some of the common build
|
||||
utilities such as the resource compiler and the linker.
|
||||
|
||||
Accepted values: AMD64, IA64.
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
<if cond="FORMAT!='msvc'">
|
||||
<set var="TARGET_CPU"/>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- FIXME: restore this once bakefile is fixed to not use
|
||||
/Gm /GZ (incompatible with /O2) w/ debug-info -->
|
||||
<set var="DEBUG_INFO_DEFAULT">
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
|
||||
</set>
|
||||
-->
|
||||
<set var="DEBUG_INFO_DEFAULT">default</set>
|
||||
@@ -181,14 +140,6 @@ Acts according to BUILD by default.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_MEDIA">
|
||||
<values>0,1</values>
|
||||
<default-value>1</default-value>
|
||||
<description>
|
||||
Build multimedia library (USE_GUI must be 1)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_XRC">
|
||||
<values>0,1</values>
|
||||
<default-value>1</default-value>
|
||||
@@ -197,22 +148,6 @@ Acts according to BUILD by default.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_AUI">
|
||||
<values>0,1</values>
|
||||
<default-value>1</default-value>
|
||||
<description>
|
||||
Build wxAUI library (USE_GUI must be 1)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_RICHTEXT">
|
||||
<values>0,1</values>
|
||||
<default-value>1</default-value>
|
||||
<description>
|
||||
Build wxRichTextCtrl library (USE_GUI must be 1)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_OPENGL">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
@@ -229,14 +164,9 @@ Acts according to BUILD by default.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
|
||||
<set var="USE_QA_DEFAULT">
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
|
||||
</set>
|
||||
<option name="USE_QA">
|
||||
<values>0,1</values>
|
||||
<default-value>$(USE_QA_DEFAULT)</default-value>
|
||||
<default-value>0</default-value>
|
||||
<description>
|
||||
Build quality assurance classes library (USE_GUI must be 1)?
|
||||
</description>
|
||||
@@ -266,16 +196,6 @@ Acts according to BUILD by default.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<option name="USE_GDIPLUS">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
<description>
|
||||
Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
|
||||
<option name="OFFICIAL_BUILD">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
@@ -355,13 +275,11 @@ to run the tests, include CppUnit library here.
|
||||
<option name="WITH_PLUGIN_SDL">
|
||||
<values>0,1</values>
|
||||
</option>
|
||||
|
||||
<option name="wx_top_builddir"/>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- windows/dos/os2 compilers -->
|
||||
<!-- windows compilers -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
@@ -378,10 +296,8 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
|
||||
|
||||
<set var="TOOLKIT" overwrite="0">
|
||||
<if cond="FORMAT!='msevc4prj'">MSW</if>
|
||||
<if cond="FORMAT=='msevc4prj'">WINCE</if>
|
||||
<if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
|
||||
<if cond="PLATFORM_MSDOS=='1'">MGL</if>
|
||||
<if cond="PLATFORM_OS2=='1'">PM</if>
|
||||
</set>
|
||||
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
|
||||
<set var="TOOLKIT_VERSION"/>
|
||||
@@ -393,7 +309,7 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<set var="EXTRALIBS_ODBC"/>
|
||||
<set var="EXTRALIBS_GUI"/>
|
||||
<set var="EXTRALIBS_OPENGL">
|
||||
<if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
|
||||
<if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
|
||||
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
|
||||
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
|
||||
</set>
|
||||
@@ -439,10 +355,7 @@ Set the version of your Mingw installation here.
|
||||
<if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
|
||||
<set var="RUNTIME_LIBS">dynamic</set>
|
||||
<set var="OFFICIAL_BUILD">0</set>
|
||||
<set var="USE_AUI">1</set>
|
||||
<set var="USE_RICHTEXT">1</set>
|
||||
<set var="USE_HTML">1</set>
|
||||
<set var="USE_MEDIA">1</set>
|
||||
<set var="USE_XRC">1</set>
|
||||
<set var="USE_OPENGL">1</set>
|
||||
<set var="USE_ODBC">1</set>
|
||||
@@ -452,7 +365,6 @@ Set the version of your Mingw installation here.
|
||||
<set var="USE_EXCEPTIONS">1</set>
|
||||
<set var="USE_RTTI">1</set>
|
||||
<set var="USE_THREADS">1</set>
|
||||
<if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
|
||||
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
|
||||
<set var="DEBUG_FLAG">default</set>
|
||||
<set var="MSLU">0</set>
|
||||
@@ -489,19 +401,9 @@ Set the version of your Mingw installation here.
|
||||
<if cond="FORMAT=='msevc4prj'">
|
||||
<set var="WXUNIV">0</set>
|
||||
<set var="UNICODE">1</set>
|
||||
<!-- Uploading debug reports from PDAs seems impractical -->
|
||||
<!-- Uploading debug reports from PDAs seems impractical -->
|
||||
<set var="USE_QA">0</set>
|
||||
<set var="MONOLITHIC">1</set> <!-- sic! -->
|
||||
<!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
|
||||
<set var="USE_RTTI">0</set>
|
||||
<set var="USE_EXCEPTIONS">0</set>
|
||||
</if>
|
||||
|
||||
<!-- Need for wxUniv within wxMGL: -->
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
|
||||
<set var="WXUNIV">1</set>
|
||||
<set var="USE_THREADS">0</set>
|
||||
<set var="RUNTIME_LIBS">static</set>
|
||||
</if>
|
||||
|
||||
</makefile>
|
||||
|
@@ -1,6 +1,4 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
@@ -31,12 +29,6 @@
|
||||
<define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
COMPILED_FROM_DSP
|
||||
</define>
|
||||
<define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
|
||||
OS2_32
|
||||
</define>
|
||||
<define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
|
||||
__MSDOS__
|
||||
</define>
|
||||
<cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
|
||||
<sources>
|
||||
src/expat/lib/xmlparse.c
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -6,10 +6,6 @@
|
||||
<include file="presets/fake.bkl"/>
|
||||
<set var="COMPILER">gcc</set>
|
||||
|
||||
<!-- fake.bkl defaults to win32 platform -->
|
||||
<set var="PLATFORM_UNIX">1</set>
|
||||
<set var="PLATFORM_WIN32">0</set>
|
||||
|
||||
<set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
|
||||
|
||||
<output file="../../wxGTK.spec"
|
||||
|
@@ -1,5 +1,5 @@
|
||||
# --- wxBase headers list begins here ---
|
||||
cat <<EOF >wxbase-headers.files
|
||||
cat <<EOF >wxbase-headers-list
|
||||
@('\n'.join(ALL_BASE_HEADERS.split()))
|
||||
EOF
|
||||
# --- wxBase headers list ends here ---
|
||||
|
19
build/bakefiles/formats/wx24dsp.bkl
Normal file
19
build/bakefiles/formats/wx24dsp.bkl
Normal file
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<include file="win32.bkl"/>
|
||||
<set var="COMPILER">vc</set>
|
||||
<include file="presets/fake.bkl"/>
|
||||
|
||||
<set var="ALL_SOURCES" eval="0">
|
||||
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
|
||||
</set>
|
||||
|
||||
<output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
|
||||
<set var="FORMAT_OUTPUT_VARIABLES">
|
||||
ALL_SOURCES ALL_HEADERS
|
||||
</set>
|
||||
|
||||
</makefile>
|
461
build/bakefiles/formats/wx24dsp.empy
Normal file
461
build/bakefiles/formats/wx24dsp.empy
Normal file
@@ -0,0 +1,461 @@
|
||||
@{
|
||||
|
||||
used = {}
|
||||
def mkgroup(lst, name, mask):
|
||||
x = [s for s in lst if s.startswith(mask)]
|
||||
for s in x:
|
||||
used[s] = 1
|
||||
x.sort()
|
||||
return (name,x)
|
||||
|
||||
sources = ALL_SOURCES.split()
|
||||
SOURCES = []
|
||||
SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
|
||||
SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
|
||||
SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
|
||||
SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
|
||||
otherSrcs = [x for x in sources if x not in used]
|
||||
otherSrcs.sort()
|
||||
SOURCES.append(('Other Sources', otherSrcs))
|
||||
|
||||
headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
|
||||
HEADERS = []
|
||||
HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
|
||||
HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
|
||||
HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
|
||||
commonHdrs = [x for x in headers if x not in used]
|
||||
commonHdrs.sort()
|
||||
HEADERS.insert(0, ('Common', commonHdrs))
|
||||
|
||||
}@
|
||||
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
||||
|
||||
CFG=wxWindows - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWindows.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
|
||||
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../ReleaseUnicodeDll"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../DebugUnicodeDll"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../ReleaseUnicode"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../ReleaseUnicode"
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../DebugUnicode"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../DebugUnicode"
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../ReleaseDll"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../ReleaseDll"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../DebugDll"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../DebugDll"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../Release"
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "../lib"
|
||||
# PROP BASE Intermediate_Dir "../Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "../lib"
|
||||
# PROP Intermediate_Dir "../Debug"
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
|
||||
# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDebug"
|
||||
# PROP Intermediate_Dir "ReleaseDebug"
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
|
||||
RSC=rc.exe
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "wxWindows - Win32 Release Unicode DLL"
|
||||
# Name "wxWindows - Win32 Debug Unicode DLL"
|
||||
# Name "wxWindows - Win32 Release Unicode"
|
||||
# Name "wxWindows - Win32 Debug Unicode"
|
||||
# Name "wxWindows - Win32 Release DLL"
|
||||
# Name "wxWindows - Win32 Debug DLL"
|
||||
# Name "wxWindows - Win32 Release"
|
||||
# Name "wxWindows - Win32 Debug"
|
||||
# Name "wxWindows - Win32 Release With Debug Info"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="This project is deprecated, please see install.txt"
|
||||
# End Source File
|
||||
@[for group in SOURCES]@
|
||||
# Begin Group "@group[0]"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
@[for src in group[1]]@
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\@src[4:].replace('/','\\')
|
||||
@[if src=='src/msw/dummy.cpp']@
|
||||
# ADD CPP /Yc"wx/wxprec.h"
|
||||
@[end if]@
|
||||
@[if src.endswith('.c')]@
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
@[end if]@
|
||||
# End Source File
|
||||
@[end for]@
|
||||
# End Group
|
||||
@[end for]@
|
||||
# Begin Group "Headers"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Group "Setup"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\include\wx\msw\setup.h
|
||||
|
||||
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswu\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswud\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\msw\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\mswd\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
|
||||
|
||||
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
|
||||
InputPath=..\include\wx\msw\setup.h
|
||||
|
||||
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy "$(InputPath)" ..\lib\msw\wx\setup.h
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# End Group
|
||||
@[for group in HEADERS]@
|
||||
# Begin Group "@group[0]"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
@[for hdr in group[1]]@
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\include\@hdr.replace('/','\\')
|
||||
# End Source File
|
||||
@[end for]@
|
||||
# End Group
|
||||
@[end for]@
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
@@ -26,53 +26,52 @@
|
||||
<dirname>$(LIBDIRNAME)</dirname>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
|
||||
<cflags-watcom>-wcd=136</cflags-watcom>
|
||||
<sources>
|
||||
src/jpeg/jcomapi.c
|
||||
src/jpeg/jutils.c
|
||||
src/jpeg/jerror.c
|
||||
src/jpeg/jmemmgr.c
|
||||
src/jpeg/jmemnobs.c
|
||||
src/jpeg/jcapimin.c
|
||||
src/jpeg/jcapistd.c
|
||||
src/jpeg/jctrans.c
|
||||
src/jpeg/jcparam.c
|
||||
src/jpeg/jdatadst.c
|
||||
src/jpeg/jcinit.c
|
||||
src/jpeg/jcmaster.c
|
||||
src/jpeg/jcmarker.c
|
||||
src/jpeg/jcmainct.c
|
||||
src/jpeg/jcprepct.c
|
||||
src/jpeg/jccoefct.c
|
||||
src/jpeg/jccolor.c
|
||||
src/jpeg/jcsample.c
|
||||
src/jpeg/jchuff.c
|
||||
src/jpeg/jcphuff.c
|
||||
src/jpeg/jcdctmgr.c
|
||||
src/jpeg/jfdctfst.c
|
||||
src/jpeg/jfdctflt.c
|
||||
src/jpeg/jfdctint.c
|
||||
src/jpeg/jdapimin.c
|
||||
src/jpeg/jdapistd.c
|
||||
src/jpeg/jdtrans.c
|
||||
src/jpeg/jdatasrc.c
|
||||
src/jpeg/jdmaster.c
|
||||
src/jpeg/jdinput.c
|
||||
src/jpeg/jdmarker.c
|
||||
src/jpeg/jdhuff.c
|
||||
src/jpeg/jdphuff.c
|
||||
src/jpeg/jdmainct.c
|
||||
src/jpeg/jdcoefct.c
|
||||
src/jpeg/jdpostct.c
|
||||
src/jpeg/jddctmgr.c
|
||||
src/jpeg/jidctfst.c
|
||||
src/jpeg/jidctflt.c
|
||||
src/jpeg/jidctint.c
|
||||
src/jpeg/jidctred.c
|
||||
src/jpeg/jdsample.c
|
||||
src/jpeg/jdcolor.c
|
||||
src/jpeg/jquant1.c
|
||||
src/jpeg/jquant2.c
|
||||
src/jpeg/jutils.c
|
||||
src/jpeg/jerror.c
|
||||
src/jpeg/jmemmgr.c
|
||||
src/jpeg/jmemnobs.c
|
||||
src/jpeg/jcapimin.c
|
||||
src/jpeg/jcapistd.c
|
||||
src/jpeg/jctrans.c
|
||||
src/jpeg/jcparam.c
|
||||
src/jpeg/jdatadst.c
|
||||
src/jpeg/jcinit.c
|
||||
src/jpeg/jcmaster.c
|
||||
src/jpeg/jcmarker.c
|
||||
src/jpeg/jcmainct.c
|
||||
src/jpeg/jcprepct.c
|
||||
src/jpeg/jccoefct.c
|
||||
src/jpeg/jccolor.c
|
||||
src/jpeg/jcsample.c
|
||||
src/jpeg/jchuff.c
|
||||
src/jpeg/jcphuff.c
|
||||
src/jpeg/jcdctmgr.c
|
||||
src/jpeg/jfdctfst.c
|
||||
src/jpeg/jfdctflt.c
|
||||
src/jpeg/jfdctint.c
|
||||
src/jpeg/jdapimin.c
|
||||
src/jpeg/jdapistd.c
|
||||
src/jpeg/jdtrans.c
|
||||
src/jpeg/jdatasrc.c
|
||||
src/jpeg/jdmaster.c
|
||||
src/jpeg/jdinput.c
|
||||
src/jpeg/jdmarker.c
|
||||
src/jpeg/jdhuff.c
|
||||
src/jpeg/jdphuff.c
|
||||
src/jpeg/jdmainct.c
|
||||
src/jpeg/jdcoefct.c
|
||||
src/jpeg/jdpostct.c
|
||||
src/jpeg/jddctmgr.c
|
||||
src/jpeg/jidctfst.c
|
||||
src/jpeg/jidctflt.c
|
||||
src/jpeg/jidctint.c
|
||||
src/jpeg/jidctred.c
|
||||
src/jpeg/jdsample.c
|
||||
src/jpeg/jdcolor.c
|
||||
src/jpeg/jquant1.c
|
||||
src/jpeg/jquant2.c
|
||||
src/jpeg/jdmerge.c
|
||||
</sources>
|
||||
</lib>
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@
|
||||
<set var="MONOLIB_GUI_SRC">
|
||||
<if cond="USE_GUI=='1'">
|
||||
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
|
||||
$(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
|
||||
$(DBGRID_SRC) $(XRC_SRC)
|
||||
</if>
|
||||
</set>
|
||||
<set var="MONOLIB_SRC">
|
||||
@@ -29,9 +29,6 @@
|
||||
<define>wxUSE_BASE=1</define>
|
||||
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
|
||||
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
|
||||
<if cond="FORMAT=='watcom'">
|
||||
<set var="LIB_PAGESIZE" overwrite="1">8192</set>
|
||||
</if>
|
||||
</lib>
|
||||
|
||||
|
||||
|
@@ -100,7 +100,7 @@
|
||||
<!-- ================================================================= -->
|
||||
|
||||
<dll id="mediadll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_MEDIA</define>
|
||||
<sources>$(MEDIA_SRC)</sources>
|
||||
@@ -110,7 +110,7 @@
|
||||
</dll>
|
||||
|
||||
<lib id="medialib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(MEDIA_SRC)</sources>
|
||||
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
||||
</lib>
|
||||
@@ -263,52 +263,4 @@
|
||||
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
|
||||
|
||||
<!-- ================================================================ -->
|
||||
<!-- AUI -->
|
||||
<!-- ================================================================ -->
|
||||
|
||||
<dll id="auidll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_AUI=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_AUI</define>
|
||||
<sources>$(AUI_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<msvc-headers>$(AUI_HDR)</msvc-headers>
|
||||
</dll>
|
||||
|
||||
<lib id="auilib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_AUI=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(AUI_SRC)</sources>
|
||||
<msvc-headers>$(AUI_HDR)</msvc-headers>
|
||||
</lib>
|
||||
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
|
||||
|
||||
<!-- ================================================================ -->
|
||||
<!-- RICHTEXT -->
|
||||
<!-- ================================================================ -->
|
||||
|
||||
<dll id="richtextdll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_RICHTEXT</define>
|
||||
<sources>$(RICHTEXT_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>htmldll</library>
|
||||
<library>xmldll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
|
||||
</dll>
|
||||
|
||||
<lib id="richtextlib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(RICHTEXT_SRC)</sources>
|
||||
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
|
||||
</lib>
|
||||
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
|
||||
|
||||
</makefile>
|
||||
|
@@ -25,26 +25,25 @@
|
||||
cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
|
||||
<dirname>$(LIBDIRNAME)</dirname>
|
||||
<include>$(INC_ZLIB)</include>
|
||||
<cflags-borland>-w-8004</cflags-borland>
|
||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||
<cflags-borland>-w-8004</cflags-borland>
|
||||
<sources>
|
||||
src/png/png.c
|
||||
src/png/pngerror.c
|
||||
src/png/pnggccrd.c
|
||||
src/png/pngget.c
|
||||
src/png/pngmem.c
|
||||
src/png/pngpread.c
|
||||
src/png/pngread.c
|
||||
src/png/pngrio.c
|
||||
src/png/pngrtran.c
|
||||
src/png/pngrutil.c
|
||||
src/png/pngset.c
|
||||
src/png/pngtrans.c
|
||||
src/png/pngvcrd.c
|
||||
src/png/pngwio.c
|
||||
src/png/pngwrite.c
|
||||
src/png/pngwtran.c
|
||||
src/png/pngwutil.c
|
||||
src/png/png.c
|
||||
src/png/pngerror.c
|
||||
src/png/pnggccrd.c
|
||||
src/png/pngget.c
|
||||
src/png/pngmem.c
|
||||
src/png/pngpread.c
|
||||
src/png/pngread.c
|
||||
src/png/pngrio.c
|
||||
src/png/pngrtran.c
|
||||
src/png/pngrutil.c
|
||||
src/png/pngset.c
|
||||
src/png/pngtrans.c
|
||||
src/png/pngvcrd.c
|
||||
src/png/pngwio.c
|
||||
src/png/pngwrite.c
|
||||
src/png/pngwtran.c
|
||||
src/png/pngwutil.c
|
||||
</sources>
|
||||
</lib>
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<option name="wxUSE_REGEX"/>
|
||||
<set var="LIB_REGEX">
|
||||
@@ -38,7 +38,6 @@
|
||||
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||
<define>__WX$(TOOLKIT)__</define>
|
||||
<define>$(WXUNIV_DEFINE)</define>
|
||||
<define>$(UNICODE_DEFINE)</define>
|
||||
<dirname>$(LIBDIRNAME)</dirname>
|
||||
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
|
||||
|
@@ -1,6 +1,4 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
@@ -30,8 +28,7 @@
|
||||
<set var="TIFF_PLATFORM_SRC">
|
||||
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
|
||||
<if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
|
||||
<if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
|
||||
<if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
|
||||
@@ -44,45 +41,42 @@
|
||||
<include>$(INC_JPEG)</include>
|
||||
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
|
||||
<cflags-dmars>-w2</cflags-dmars>
|
||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||
<define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
|
||||
<define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
|
||||
<sources>
|
||||
$(TIFF_PLATFORM_SRC)
|
||||
src/tiff/tif_aux.c
|
||||
src/tiff/tif_close.c
|
||||
src/tiff/tif_codec.c
|
||||
src/tiff/tif_color.c
|
||||
src/tiff/tif_compress.c
|
||||
src/tiff/tif_dir.c
|
||||
src/tiff/tif_dirinfo.c
|
||||
src/tiff/tif_dirread.c
|
||||
src/tiff/tif_dirwrite.c
|
||||
src/tiff/tif_dumpmode.c
|
||||
src/tiff/tif_error.c
|
||||
src/tiff/tif_extension.c
|
||||
src/tiff/tif_fax3.c
|
||||
src/tiff/tif_fax3sm.c
|
||||
src/tiff/tif_getimage.c
|
||||
src/tiff/tif_jpeg.c
|
||||
src/tiff/tif_flush.c
|
||||
src/tiff/tif_lzw.c
|
||||
src/tiff/tif_luv.c
|
||||
src/tiff/tif_next.c
|
||||
src/tiff/tif_open.c
|
||||
src/tiff/tif_packbits.c
|
||||
src/tiff/tif_pixarlog.c
|
||||
src/tiff/tif_predict.c
|
||||
src/tiff/tif_print.c
|
||||
src/tiff/tif_read.c
|
||||
src/tiff/tif_swab.c
|
||||
src/tiff/tif_strip.c
|
||||
src/tiff/tif_thunder.c
|
||||
src/tiff/tif_tile.c
|
||||
src/tiff/tif_version.c
|
||||
src/tiff/tif_warning.c
|
||||
src/tiff/tif_write.c
|
||||
src/tiff/tif_zip.c
|
||||
src/tiff/tif_aux.c
|
||||
src/tiff/tif_close.c
|
||||
src/tiff/tif_codec.c
|
||||
src/tiff/tif_color.c
|
||||
src/tiff/tif_compress.c
|
||||
src/tiff/tif_dir.c
|
||||
src/tiff/tif_dirinfo.c
|
||||
src/tiff/tif_dirread.c
|
||||
src/tiff/tif_dirwrite.c
|
||||
src/tiff/tif_dumpmode.c
|
||||
src/tiff/tif_error.c
|
||||
src/tiff/tif_extension.c
|
||||
src/tiff/tif_fax3.c
|
||||
src/tiff/tif_fax3sm.c
|
||||
src/tiff/tif_getimage.c
|
||||
src/tiff/tif_jpeg.c
|
||||
src/tiff/tif_flush.c
|
||||
src/tiff/tif_lzw.c
|
||||
src/tiff/tif_luv.c
|
||||
src/tiff/tif_next.c
|
||||
src/tiff/tif_open.c
|
||||
src/tiff/tif_packbits.c
|
||||
src/tiff/tif_pixarlog.c
|
||||
src/tiff/tif_predict.c
|
||||
src/tiff/tif_print.c
|
||||
src/tiff/tif_read.c
|
||||
src/tiff/tif_swab.c
|
||||
src/tiff/tif_strip.c
|
||||
src/tiff/tif_thunder.c
|
||||
src/tiff/tif_tile.c
|
||||
src/tiff/tif_version.c
|
||||
src/tiff/tif_warning.c
|
||||
src/tiff/tif_write.c
|
||||
src/tiff/tif_zip.c
|
||||
</sources>
|
||||
</lib>
|
||||
|
||||
|
@@ -1,85 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- Handling of binary compatiblity: -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<!--
|
||||
We use libtool CURRENT:REVISION:AGE versioning scheme. Here are the
|
||||
rules for updating the values below, this should be done whenever wx
|
||||
version (wx/version.h) changes (we abbreviate WX_CURRENT:REVISION:AGE
|
||||
as C:R:A respectively):
|
||||
|
||||
0. Set C:R:A = 0:0:0 if major or minor version has changed.
|
||||
|
||||
1. If any API has been removed or otherwise changed in backwards
|
||||
incompatible way, then change C:R:A to C+1:0:0
|
||||
|
||||
2. Else, if any API has been added, change C:R:A to C+1:0:A+1
|
||||
|
||||
3. Else, i.e. if there were no changes at all to API but only internal
|
||||
changes, change C:R:A to C:R+1:A
|
||||
-->
|
||||
<set var="WX_CURRENT">1</set>
|
||||
<set var="WX_REVISION">1</set>
|
||||
<set var="WX_AGE">1</set>
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- Library version number: -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<!-- extract wx version number from wx/version.h: -->
|
||||
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
|
||||
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
|
||||
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
|
||||
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- Derived variables: -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<!-- set misc helper variables: -->
|
||||
|
||||
<set var="WX_RELEASE" make_var="1">
|
||||
$(WXVER_MAJOR).$(WXVER_MINOR)
|
||||
</set>
|
||||
<set var="WX_RELEASE_NODOT" make_var="1">
|
||||
$(WXVER_MAJOR)$(WXVER_MINOR)
|
||||
</set>
|
||||
<set var="WX_VERSION" make_var="1">
|
||||
$(WX_RELEASE).$(WXVER_RELEASE)
|
||||
</set>
|
||||
<set var="WX_VERSION_NODOT" make_var="1">
|
||||
$(WX_RELEASE_NODOT)$(WXVER_RELEASE)
|
||||
</set>
|
||||
|
||||
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
|
||||
|
||||
<!-- in unstable branch, binary compat. changes with every release, check
|
||||
for it: -->
|
||||
<if cond="WX_STABLE_BRANCH=='0' and int(WX_CURRENT)!=int(WXVER_RELEASE)">
|
||||
<error>Forgot to update WX_CURRENT/WX_REVISION/WX_AGE?</error>
|
||||
</if>
|
||||
<set var="WXSOVERSION">
|
||||
$(int(WX_CURRENT)-int(WX_AGE)).$(WX_AGE).$(WX_REVISION)
|
||||
</set>
|
||||
|
||||
<!-- FIXME: until libtool scheme is implemented in bakefile -->
|
||||
<set var="WXMACVERSION_CMD">
|
||||
<if cond="PLATFORM_MACOSX=='1'">
|
||||
<!-- Version can't be 0, so add 1 to it to force it to be non null -->
|
||||
-compatibility_version $(int(WX_AGE)+1).0 -current_version $(int(WX_AGE)+1).$(WX_REVISION)
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<set var="WXWIN32DLLVERSION">
|
||||
<if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
|
||||
<if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
|
||||
</set>
|
||||
|
||||
</makefile>
|
@@ -12,39 +12,39 @@
|
||||
</phony>
|
||||
|
||||
<set var="BUILDING_LIB">1</set>
|
||||
|
||||
|
||||
<!-- common rules, names etc. for wx: -->
|
||||
<include file="common.bkl"/>
|
||||
|
||||
|
||||
<!-- list of files sorted into categories: -->
|
||||
<include file="files.bkl"/>
|
||||
|
||||
|
||||
<!-- wxWidgets variant where everything is in one library: -->
|
||||
<include file="monolithic.bkl"/>
|
||||
<!-- ...and when there are multiple libraries: -->
|
||||
<include file="multilib.bkl"/>
|
||||
|
||||
<if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
|
||||
<if cond="FORMAT in ['msvc6prj','msevc4prj']">
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS">
|
||||
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
|
||||
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
|
||||
</set>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- OpenGL canvas is built as separate library in both cases: -->
|
||||
<include file="opengl.bkl"/>
|
||||
<!-- Dynamically loadable plugins: -->
|
||||
<include file="plugins.bkl"/>
|
||||
|
||||
|
||||
<!-- Samples target (not dependency of 'all'): -->
|
||||
<subproject id="samples">
|
||||
<installable>no</installable>
|
||||
<dir cond="FORMAT=='autoconf'">samples</dir>
|
||||
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
|
||||
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
|
||||
</subproject>
|
||||
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
|
||||
|
||||
<!-- WXRC compiler is built by default: -->
|
||||
<!-- FIXME: this is dirty hack, better bakefile support for
|
||||
conditional and optional subprojects is needed -->
|
||||
@@ -59,25 +59,25 @@
|
||||
<depends>baselib</depends>
|
||||
<depends>xmldll</depends>
|
||||
<depends>xmllib</depends>
|
||||
|
||||
|
||||
<command>
|
||||
(if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi)
|
||||
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true
|
||||
</command>
|
||||
</action>
|
||||
<action id="clean-wxrc" cond="USE_XRC=='1'">
|
||||
<dependency-of>clean</dependency-of>
|
||||
<command>
|
||||
(if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi)
|
||||
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) clean) || true
|
||||
</command>
|
||||
</action>
|
||||
<action id="install-wxrc" cond="USE_XRC=='1'">
|
||||
<dependency-of>install</dependency-of>
|
||||
<depends>wxrc</depends>
|
||||
<command>
|
||||
(if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi)
|
||||
(test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true
|
||||
</command>
|
||||
</action>
|
||||
|
||||
|
||||
<!-- "make install": -->
|
||||
|
||||
<data-files>
|
||||
@@ -85,36 +85,21 @@
|
||||
<install-to>$(DATADIR)/aclocal</install-to>
|
||||
</data-files>
|
||||
|
||||
<data-files>
|
||||
<srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
|
||||
<files>wx.bkl wx_unix.bkl wx_win32.bkl</files>
|
||||
<install-to>$(DATADIR)/bakefile/presets</install-to>
|
||||
</data-files>
|
||||
|
||||
<action id="install-wxconfig">
|
||||
<dependency-of>install</dependency-of>
|
||||
<command>
|
||||
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
|
||||
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
|
||||
(cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
|
||||
(cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
|
||||
</command>
|
||||
</action>
|
||||
|
||||
<set var="RCDEFS_H">
|
||||
<if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
|
||||
</set>
|
||||
<headers>
|
||||
<srcdir>
|
||||
$(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
|
||||
</srcdir>
|
||||
<files>
|
||||
setup.h $(RCDEFS_H)
|
||||
</files>
|
||||
<install-to>
|
||||
$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
|
||||
</install-to>
|
||||
</headers>
|
||||
<data-files>
|
||||
<srcdir>$(BUILDDIR)</srcdir>
|
||||
<files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
|
||||
<install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
|
||||
</data-files>
|
||||
|
||||
<headers>
|
||||
<srcdir>$(SRCDIR)/include</srcdir>
|
||||
@@ -135,13 +120,6 @@
|
||||
</linguas>
|
||||
<install-to>$(LOCALEDIR)</install-to>
|
||||
</gettext-catalogs>
|
||||
<gettext-catalogs id="locale_msw">
|
||||
<srcdir>$(SRCDIR)/locale/msw</srcdir>
|
||||
<catalog-name>wxmsw</catalog-name>
|
||||
<linguas>it</linguas>
|
||||
<install-to>$(LOCALEDIR)</install-to>
|
||||
</gettext-catalogs>
|
||||
|
||||
|
||||
<!-- Mac OS X resources: -->
|
||||
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
|
||||
@@ -150,7 +128,7 @@
|
||||
<dependency-of>all</dependency-of>
|
||||
<set var="__targetname">$(MACOS_R)</set>
|
||||
<command>
|
||||
$(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
|
||||
$(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
|
||||
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
|
||||
</command>
|
||||
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
|
||||
@@ -167,27 +145,26 @@
|
||||
</if>
|
||||
|
||||
|
||||
<!-- copy setup.h on DOS/OS2/Windows: -->
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
||||
<!-- copy setup.h on DOS/Windows: -->
|
||||
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
|
||||
<mkdir id="libdir">
|
||||
<dir>$(LIBDIRNAME)</dir>
|
||||
</mkdir>
|
||||
<mkdir id="libdir_setup">
|
||||
<depends>libdir</depends>
|
||||
<dir>$(SETUPHDIR)</dir>
|
||||
<dir>$(SETUPHDIR)</dir>
|
||||
</mkdir>
|
||||
<mkdir id="libdir_setup_wx">
|
||||
<depends>libdir_setup</depends>
|
||||
<dependency-of>setup_h</dependency-of>
|
||||
<dir>$(SETUPHDIR)/wx</dir>
|
||||
<dir>$(SETUPHDIR)/wx</dir>
|
||||
</mkdir>
|
||||
|
||||
<set var="SETUP_H_SUBDIR">
|
||||
<if cond="WXUNIV=='1'">univ</if>
|
||||
<if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
|
||||
<if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
|
||||
<if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
|
||||
</set>
|
||||
|
||||
|
||||
<copy-file-to-file-if-not-exist id="master_setup.h">
|
||||
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
|
||||
<dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
|
||||
@@ -202,33 +179,6 @@
|
||||
</if>
|
||||
|
||||
|
||||
<!-- create rcdefs.h on Windows: -->
|
||||
<if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
|
||||
|
||||
<mkdir id="libdir_setup_wx_msw">
|
||||
<depends>libdir_setup_wx</depends>
|
||||
<dir>$(SETUPHDIR)/wx/msw</dir>
|
||||
</mkdir>
|
||||
|
||||
<action id="rcdefs.h">
|
||||
|
||||
<!-- Can't seem to set id to a name with a dollar sign
|
||||
so use __targetname as a temporary work around -->
|
||||
<set var="__targetname">$(SETUPHDIR)\wx\msw\rcdefs.h</set>
|
||||
|
||||
<dependency-of>setup_h</dependency-of>
|
||||
<depends>libdir_setup_wx_msw</depends>
|
||||
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
|
||||
|
||||
<command>
|
||||
$(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
</command>
|
||||
|
||||
</action>
|
||||
|
||||
</if>
|
||||
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
|
||||
<!-- Show this banner after installation: -->
|
||||
@@ -254,12 +204,12 @@
|
||||
|
||||
<!-- add "make dist" target to autoconf: -->
|
||||
<set var="VARS_DONT_ELIMINATE" append="1">
|
||||
ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
|
||||
ALL_BASE_SOURCES WX_VERSION
|
||||
</set>
|
||||
<fragment format="autoconf" file="make_dist.mk"/>
|
||||
|
||||
</if>
|
||||
|
||||
|
||||
<include file="build_cfg.bkl"/>
|
||||
|
||||
</makefile>
|
||||
|
@@ -149,7 +149,7 @@ built. In Bakefile, you specify the target by creating a tag named with the
|
||||
target type. The possible names for targets are:
|
||||
|
||||
exe create an executable file
|
||||
dll create a shared library
|
||||
dll create a shared libary
|
||||
lib create a static library
|
||||
module create a library that is loaded at runtime (i.e. a plugin)
|
||||
|
||||
@@ -235,8 +235,6 @@ options are:
|
||||
|
||||
Option Values Description
|
||||
------ ------ -------------
|
||||
WX_MONOLITHIC 0(default),1 Set this to 1 if you built wx
|
||||
as a monolithic library
|
||||
WX_SHARED 0(default),1 Specify static or dynamic wx libs
|
||||
WX_UNICODE 0(defualt),1 Use ANSI or UNICODE wx libs
|
||||
WX_DEBUG 0,1(default) Use release or debug wx libs
|
||||
|
@@ -2,50 +2,14 @@
|
||||
<!-- $Id$ -->
|
||||
|
||||
<!--
|
||||
Presets for building wxWidgets applications.
|
||||
Presents for building wxWidgets applications.
|
||||
|
||||
FIXME: docs
|
||||
FIXME: docs
|
||||
-->
|
||||
|
||||
|
||||
<makefile>
|
||||
|
||||
<!-- this variable identifies the version of the wx presets.
|
||||
this is changed only when major changes to wxpresets take place. -->
|
||||
<set var="WX_PRESETS_VERSION">3</set>
|
||||
|
||||
<!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
|
||||
<set var="LIB_LIST">
|
||||
base core net xml odbc xrc html adv media gl dbgrid qa aui richtext
|
||||
</set>
|
||||
|
||||
<!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
|
||||
(which is already in LIB_LIST) -->
|
||||
<set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
|
||||
<set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>
|
||||
|
||||
<!-- this is a temporary variable until there is non general -->
|
||||
<!-- function in bakefiles for returning native markup for -->
|
||||
<!-- reading envrionment variables -->
|
||||
<set var="ENV_VAR">
|
||||
<if cond="FORMAT=='watcom'">%</if>
|
||||
<if cond="FORMAT!='watcom'"></if>
|
||||
</set>
|
||||
|
||||
|
||||
<!-- The directory where wxWidgets is installed: -->
|
||||
<if cond="not isdefined('WX_DIR')">
|
||||
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
|
||||
<option name="WX_DIR" category="path">
|
||||
<default-value>$(WX_DIR_DEFAULT)</default-value>
|
||||
<description>
|
||||
The directory where wxWidgets library is installed
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- this is just a wrapper that includes the real implementation: -->
|
||||
|
||||
<set var="__wx_included_impl">0</set>
|
||||
|
@@ -7,7 +7,7 @@ See wx.bkl for platform-independent notes.
|
||||
|
||||
Usage:
|
||||
Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
|
||||
|
||||
|
||||
|
||||
Format-specific notes:
|
||||
|
||||
@@ -23,24 +23,22 @@ Format-specific notes:
|
||||
<!-- ============================================================== -->
|
||||
<!-- Autoconf -->
|
||||
<!-- ============================================================== -->
|
||||
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<!-- Autoconf backend is simplicity itself thanks to wx-config... -->
|
||||
<option name="WX_CFLAGS"/>
|
||||
<option name="WX_CXXFLAGS"/>
|
||||
<option name="WX_CPPFLAGS"/>
|
||||
<option name="WX_LIBS"/>
|
||||
<option name="WX_RESCOMP"/>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- ============================================================== -->
|
||||
<!-- GNU makefiles for Unix -->
|
||||
<!-- ============================================================== -->
|
||||
|
||||
<if cond="FORMAT=='gnu'">
|
||||
<set var="WX_CONFIG_DEFAULT" overwrite="0">wx-config</set>
|
||||
<option name="WX_CONFIG">
|
||||
<default-value>$(WX_CONFIG_DEFAULT)</default-value>
|
||||
<default-value>wx-config</default-value>
|
||||
<description>Location and arguments of wx-config script</description>
|
||||
</option>
|
||||
<option name="WX_CFLAGS">
|
||||
@@ -55,82 +53,36 @@ Format-specific notes:
|
||||
<default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
|
||||
<description>C preprocessor flags to use with wxWidgets code</description>
|
||||
</option>
|
||||
<option name="WX_RESCOMP">
|
||||
<default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
|
||||
<description>wxWidgets resource compiler and flags</description>
|
||||
<option name="WX_LIBS">
|
||||
<default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
|
||||
<description>wxWidgets libraries to link against</description>
|
||||
</option>
|
||||
|
||||
<!-- we need this but the trick used in default-values above
|
||||
prevents bakefile from detecting it: -->
|
||||
<set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- ============================================================== -->
|
||||
<!-- Common code -->
|
||||
<!-- ============================================================== -->
|
||||
|
||||
|
||||
<if cond="FORMAT not in ['gnu','autoconf']">
|
||||
<error>
|
||||
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
|
||||
</error>
|
||||
</if>
|
||||
|
||||
<!--
|
||||
We need to re-define the WINDRES resource compiler name to the resource compiler
|
||||
returned by 'wx-config - -rescomp' since this option returns both the name of the
|
||||
resource compiler to use (windres) and the flags required for that compiler.
|
||||
|
||||
This line typically does something *only* when the Makefile.in generated
|
||||
using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
|
||||
are not compiled at all).
|
||||
Without this line, in fact, when compiling with MSYS on Windows, the - -include-dir
|
||||
option which tells windres to look in wxWidgets\include folder would be missing and
|
||||
then windres would fail to find the wxMSW resources.
|
||||
|
||||
NOTE: overwriting the WINDRES variable we add wxWidgets resource flags to
|
||||
all targets which include this bakefile; this could be useless to those
|
||||
targets which are not wx-based eventually present in that bakefile but
|
||||
in any case it shouldn't do any harm.
|
||||
-->
|
||||
<set var="WINDRES">$(WX_RESCOMP)</set>
|
||||
|
||||
|
||||
<template id="wx-lib">
|
||||
<cxxflags>$(WX_CXXFLAGS)</cxxflags>
|
||||
<cflags>$(WX_CFLAGS)</cflags>
|
||||
</template>
|
||||
|
||||
<template id="wx" template="wx-lib">
|
||||
<!--
|
||||
Don't include the $(WX_LIBS) variable in linker options here since
|
||||
it would make impossible for the user to obtain the right library
|
||||
order when he needs to specify, *before* WX_LIBS, its own libraries
|
||||
that depend on wxWidgets libraries; to avoid this, we include
|
||||
$(WX_LIBS) as soon as we found the <wx-lib>base</wx-lib> tag which
|
||||
the user should always put *after* all other wx-dependent libraries
|
||||
-->
|
||||
<ldlibs>$(WX_LIBS)</ldlibs>
|
||||
</template>
|
||||
|
||||
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
|
||||
in all your bakefiles !!
|
||||
-->
|
||||
<define-tag name="wx-lib" rules="exe,dll,module">
|
||||
<if cond="FORMAT=='autoconf' and value=='base'">
|
||||
<!-- all wx-dependent libraries should have been already listed
|
||||
thus we can now add WX_LIBS to the linker line -->
|
||||
<ldlibs>$(WX_LIBS)</ldlibs>
|
||||
</if>
|
||||
<if cond="FORMAT=='gnu' and value=='base'">
|
||||
<!-- all wx libraries should have been already specified, thus
|
||||
$(__liblist) should contain the full list... -->
|
||||
<set var="__liblist" append="1">base</set>
|
||||
<ldlibs>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldlibs>
|
||||
</if>
|
||||
<if cond="FORMAT=='gnu' and value!='base'">
|
||||
<set var="__liblist" append="1">$(value)</set>
|
||||
</if>
|
||||
<if cond="value not in ALLLIB_LIST.split()">
|
||||
<error>Unknown wxWidgets library given in the wx-lib tag</error>
|
||||
</if>
|
||||
</define-tag>
|
||||
<!-- not used together with wx-config: -->
|
||||
<define-tag name="wx-lib" rules="exe,dll,module"/>
|
||||
|
||||
</makefile>
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" ?>
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<!-- Original source: http://wiki.wxwidgets.org/wiki.pl?Bakefile -->
|
||||
@@ -34,7 +34,7 @@ FIXME: this template has (at least) the following bugs:
|
||||
<!-- In MSVC these are the different build -->
|
||||
<!-- configurations you can have (in the build menu), -->
|
||||
<!-- and in autoconf is enabled with enable-xxx=xx. -->
|
||||
<!-- For other compilers a separate configuration -->
|
||||
<!-- For other compilers a seperate configuration -->
|
||||
<!-- file is created (such as config.gcc on gcc) -->
|
||||
<!-- which has several options a user can modify. -->
|
||||
<!-- -->
|
||||
@@ -42,200 +42,104 @@ FIXME: this template has (at least) the following bugs:
|
||||
<!-- is not constant, i.e. if it cannot be determined -->
|
||||
<!-- by bakefile itself. -->
|
||||
|
||||
<!-- Presets for limited dmars make.exe format: -->
|
||||
<if cond="FORMAT=='dmars'">
|
||||
<set var="WX_UNICODE">0</set>
|
||||
<set var="WX_DEBUG">1</set>
|
||||
<set var="WX_SHARED">0</set>
|
||||
<set var="WX_PYTHON">0</set>
|
||||
</if>
|
||||
|
||||
<!-- this is a temporary variable until there is non general -->
|
||||
<!-- function in bakefiles for returning native markup for -->
|
||||
<!-- reading envrionment variables -->
|
||||
<set var="ENV_VAR">
|
||||
<if cond="FORMAT=='watcom'">%</if>
|
||||
<if cond="FORMAT!='watcom'"></if>
|
||||
</set>
|
||||
|
||||
<!-- The directory where wxWidgets is installed: -->
|
||||
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
|
||||
<option name="WX_DIR" category="path">
|
||||
<default-value>$(WX_DIR_DEFAULT)</default-value>
|
||||
<description>
|
||||
The directory where wxWidgets library is installed
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<!-- This is a standard option that determines -->
|
||||
<!-- whether the user wants to build this library as -->
|
||||
<!-- a dll or as a static library. -->
|
||||
<if cond="not isdefined('WX_SHARED')">
|
||||
<set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
|
||||
<option name="WX_SHARED">
|
||||
<values>0,1</values>
|
||||
<values-description>,DLL</values-description>
|
||||
<default-value>$(WX_SHARED_DEFAULT)</default-value>
|
||||
<description>
|
||||
Use DLL build of wx library to use?
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
<set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
|
||||
<option name="WX_SHARED">
|
||||
<values>0,1</values>
|
||||
<values-description>,DLL</values-description>
|
||||
<default-value>$(WX_SHARED_DEFAULT)</default-value>
|
||||
<description>
|
||||
Use DLL build of wx library to use?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<!-- Configuration for building the bakefile with -->
|
||||
<!-- unicode strings or not (unicode or ansi). -->
|
||||
<if cond="not isdefined('WX_UNICODE')">
|
||||
<set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
|
||||
<option name="WX_UNICODE">
|
||||
<values>0,1</values>
|
||||
<values-description>,Unicode</values-description>
|
||||
<default-value>$(WX_UNICODE_DEFAULT)</default-value>
|
||||
<description>
|
||||
Compile Unicode build of wxWidgets?
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
<set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
|
||||
<option name="WX_UNICODE">
|
||||
<values>0,1</values>
|
||||
<values-description>,Unicode</values-description>
|
||||
<default-value>$(WX_UNICODE_DEFAULT)</default-value>
|
||||
<description>
|
||||
Compile Unicode build of wxWidgets?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<if cond="not isdefined('WX_DEBUG')">
|
||||
<set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
|
||||
<option name="WX_DEBUG">
|
||||
<values>0,1</values>
|
||||
<values-description>Release,Debug</values-description>
|
||||
<default-value>$(WX_DEBUG_DEFAULT)</default-value>
|
||||
<description>
|
||||
Use debug build of wxWidgets (define __WXDEBUG__)?
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
<set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
|
||||
<option name="WX_DEBUG">
|
||||
<values>0,1</values>
|
||||
<values-description>,Debug</values-description>
|
||||
<default-value>$(WX_DEBUG_DEFAULT)</default-value>
|
||||
<description>
|
||||
Use debug build of wxWidgets (define __WXDEBUG__)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<if cond="not isdefined('WX_VERSION')">
|
||||
<set var="WX_VERSION_DEFAULT" overwrite="0">28</set>
|
||||
<option name="WX_VERSION">
|
||||
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||
<description>
|
||||
Version of the wx library to build against.
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
|
||||
<if cond="not isdefined('WX_MONOLITHIC')">
|
||||
<set var="WX_MONOLITHIC_DEFAULT" overwrite="0">0</set>
|
||||
<option name="WX_MONOLITHIC">
|
||||
<values>0,1</values>
|
||||
<values-description>Multilib,Monolithic</values-description>
|
||||
<default-value>$(WX_MONOLITHIC_DEFAULT)</default-value>
|
||||
<description>
|
||||
Use monolithic build of wxWidgets?
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
|
||||
<!-- set this to 1 to use specific settings for wxPython -->
|
||||
<if cond="not isdefined('WX_PYTHON')">
|
||||
<option name="WX_PYTHON" category="path">
|
||||
<values>0,1</values>
|
||||
<default-value>0</default-value>
|
||||
<description>
|
||||
Whether or not we're building against wxPython libraries.
|
||||
</description>
|
||||
</option>
|
||||
</if>
|
||||
<set var="WX_VERSION_DEFAULT" overwrite="0">26</set>
|
||||
<option name="WX_VERSION">
|
||||
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||
<description>
|
||||
Version of the wx library to build against.
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<!-- HELPER VARIABLES -->
|
||||
<!-- -->
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- The unicode define we want. By default bakefile -->
|
||||
<!-- makes variables an empty string, so if unicode -->
|
||||
<!-- is not defined $(UNICODE_DEFINE) would expand -->
|
||||
<!-- to nothing (literally). -->
|
||||
<set var="WXUNICODE_DEFINE">
|
||||
<if cond="WX_UNICODE=='1'">_UNICODE</if>
|
||||
</set>
|
||||
|
||||
<!-- The debug define we need with win32 compilers -->
|
||||
<!-- (on Linux, the wx-config program is used). -->
|
||||
<set var="WXDEBUG_DEFINE">
|
||||
<if cond="WX_PYTHON=='1'">__WXDEBUG__</if>
|
||||
<if cond="WX_PYTHON=='0' and WX_DEBUG=='1'">__WXDEBUG__</if>
|
||||
</set>
|
||||
|
||||
<!-- The debug define we need with win32 compilers -->
|
||||
<!-- (on Linux, the wx-config program is used). -->
|
||||
<set var="WXDEBUG_DEFINE">
|
||||
<if cond="WX_DEBUG=='1'">__WXDEBUG__</if>
|
||||
</set>
|
||||
|
||||
<!-- These are handy ways of dealing with the -->
|
||||
<!-- extensions in the library names of the -->
|
||||
<!-- extensions in the library names of the -->
|
||||
<!-- wxWindows library. -->
|
||||
<set var="WXLIBPOSTFIX">
|
||||
<if cond="WX_PYTHON=='1' and WX_UNICODE=='1'">uh</if>
|
||||
<if cond="WX_PYTHON=='1' and WX_UNICODE=='0'">h</if>
|
||||
<if cond="WX_PYTHON=='0' and WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
|
||||
<if cond="WX_PYTHON=='0' and WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
|
||||
<if cond="WX_PYTHON=='0' and WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
|
||||
<if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
|
||||
<if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
|
||||
<if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
|
||||
</set>
|
||||
<set var="WX3RDPARTYLIBPOSTFIX">
|
||||
<if cond="WX_PYTHON==0 and WX_DEBUG=='1'">d</if>
|
||||
<if cond="WX_PYTHON==1">h</if>
|
||||
</set>
|
||||
|
||||
<set var="WXCPU">
|
||||
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
|
||||
<set var="WX3RDPARTLIBPOSTFIX">
|
||||
<if cond="WX_DEBUG=='1'">d</if>
|
||||
</set>
|
||||
|
||||
<set var="WXLIBPATH">
|
||||
<if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_lib</if>
|
||||
<if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if>
|
||||
<if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_lib</if>
|
||||
<if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_dll</if>
|
||||
</set>
|
||||
|
||||
<set var="WXPORT">
|
||||
<if cond="FORMAT=='msevc4prj'">wince</if>
|
||||
<if cond="FORMAT!='msevc4prj'">msw</if>
|
||||
</set>
|
||||
<set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX)</set>
|
||||
|
||||
|
||||
<!-- All the possible mixes for the wx library names -->
|
||||
<set var="WXLIB_BASE_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
|
||||
|
||||
<!--
|
||||
the trick used to support monolithic builds is here: when the
|
||||
<wx-lib>base</wx-lib> tag is found, and user selected
|
||||
WX_MONOLITHIC=1, then the base library is translated to the
|
||||
monolithic library
|
||||
-->
|
||||
<if cond="WX_MONOLITHIC=='1'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
|
||||
</set>
|
||||
|
||||
<!-- Libraries whose name is prefixed with 'wxbase' -->
|
||||
<set var="WXLIB_NET_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net</if>
|
||||
</set>
|
||||
<set var="WXLIB_XML_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml</if>
|
||||
</set>
|
||||
<set var="WXLIB_ODBC_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_odbc</if>
|
||||
</set>
|
||||
|
||||
<!-- Libraries whose name is prefixed with 'wx' only -->
|
||||
<set var="WXLIB_CORE_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_core</if>
|
||||
</set>
|
||||
<set var="WXLIB_MEDIA_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_media</if>
|
||||
</set>
|
||||
<set var="WXLIB_XRC_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_xrc</if>
|
||||
</set>
|
||||
<set var="WXLIB_HTML_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_html</if>
|
||||
</set>
|
||||
<set var="WXLIB_ADV_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_adv</if>
|
||||
</set>
|
||||
<set var="WXLIB_QA_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_qa</if>
|
||||
</set>
|
||||
<set var="WXLIB_DBGRID_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_dbgrid</if>
|
||||
</set>
|
||||
<set var="WXLIB_GL_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_gl</if>
|
||||
</set>
|
||||
<set var="WXLIB_AUI_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_aui</if>
|
||||
</set>
|
||||
<set var="WXLIB_RICHTEXT_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)($WXLIBPOSTFIX)_richtext</if>
|
||||
</set>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX)</set>
|
||||
|
||||
|
||||
<!-- WX TEMPLATE -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@@ -251,36 +155,21 @@ FIXME: this template has (at least) the following bugs:
|
||||
<!-- -->
|
||||
<!-- The "base class" of all our build targets -->
|
||||
<!-- This links with the appropriate native -->
|
||||
<!-- libraries required by the platform, the libraries -->
|
||||
<!-- libraries required by the platform, the libaries -->
|
||||
<!-- we want for our stuff, and the wxWindows libs. -->
|
||||
|
||||
|
||||
|
||||
<!-- this tag is used to include wx libraries: -->
|
||||
<define-tag name="wx-lib" rules="exe,dll,module">
|
||||
<if cond="value=='base'"><sys-lib>$(WXLIB_BASE_NAME)</sys-lib></if>
|
||||
<if cond="value=='core'"><sys-lib>$(WXLIB_CORE_NAME)</sys-lib></if>
|
||||
|
||||
<if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
|
||||
<if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
|
||||
<if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
|
||||
|
||||
<if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
|
||||
<if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
|
||||
<if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
|
||||
<if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
|
||||
<if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
|
||||
<if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
|
||||
<if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
|
||||
<if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
|
||||
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
|
||||
|
||||
<!-- wx-lib can be used also to link against contrib libraries
|
||||
(which always have the same name, regardless of WX_MONOLITHIC value) -->
|
||||
<if cond="value in CONTRIBLIB_LIST.split()">
|
||||
<sys-lib>wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
|
||||
<if cond="value=='base'">
|
||||
<sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
|
||||
</if>
|
||||
|
||||
<if cond="value not in ALLLIB_LIST.split()">
|
||||
<error>Unknown wxWidgets library given in the wx-lib tag</error>
|
||||
<if cond="value in ['net','xml', 'odbc']">
|
||||
<sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
|
||||
</if>
|
||||
<if cond="value not in ['base','net','xml']">
|
||||
<sys-lib>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
@@ -291,49 +180,48 @@ FIXME: this template has (at least) the following bugs:
|
||||
position="before:__wx-libs-point"/>
|
||||
<tag-info name="__wx-syslibs"
|
||||
position="after:__wx-libs-point"/>
|
||||
|
||||
|
||||
|
||||
<!-- template for static wx libraries: -->
|
||||
<template id="wx-lib">
|
||||
<!-- MISCELLANEOUS -->
|
||||
<if cond="FORMAT=='mingw'">
|
||||
<if cond="FORMAT=='mingw'">
|
||||
<define>HAVE_W32API_H</define>
|
||||
<ldflags>-mthreads</ldflags>
|
||||
</if>
|
||||
|
||||
<define>$(WXUNICODE_DEFINE)</define>
|
||||
<define>$(WXDEBUG_DEFINE)</define>
|
||||
<define>$(WXDEBUG_DEFINE)</define>
|
||||
<define>__WXMSW__</define>
|
||||
|
||||
<include>$(WX_DIR)$(WXLIBINCLUDE)</include>
|
||||
<include>$(WX_DIR)/include</include>
|
||||
</template>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- this ugly tag contains all sys-lib tags used by "wx" template,
|
||||
in order to make sure they are not reorder when wx-lib is moved
|
||||
after __wx-libs-point: -->
|
||||
<define-tag name="__wx-syslibs" rules="exe,dll,module">
|
||||
<!-- wx 3rd party libs, always use them: -->
|
||||
<sys-lib cond="FORMAT!='msevc4prj'">wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
|
||||
<!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix:
|
||||
<sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxpng$(WX3RDPARTLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxzlib$(WX3RDPARTLIBPOSTFIX)</sys-lib>
|
||||
<!-- For regex we won't use the WX3RDPARTLIBPOSTIX postfix:
|
||||
unliked tiff, jpeg, png, zlib, expat, when building
|
||||
in Unicode mode, the "u" suffix is appended to regex -->
|
||||
<sys-lib cond="FORMAT!='msevc4prj'">wxregex$(WXLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
|
||||
|
||||
<sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib>
|
||||
<sys-lib>wxexpat$(WX3RDPARTLIBPOSTFIX)</sys-lib>
|
||||
|
||||
<!-- link-in system libs that wx depends on: -->
|
||||
<!-- If on borland, we don't need to do much -->
|
||||
<if cond="FORMAT=='borland'">
|
||||
<sys-lib>ole2w32</sys-lib>
|
||||
<sys-lib>odbc32</sys-lib>
|
||||
</if>
|
||||
|
||||
<!-- Non-borland, on the other hand... -->
|
||||
<if cond="FORMAT not in ['borland','msevc4prj']">
|
||||
<if cond="FORMAT!='borland'">
|
||||
<sys-lib>kernel32</sys-lib>
|
||||
<sys-lib>user32</sys-lib>
|
||||
<sys-lib>gdi32</sys-lib>
|
||||
@@ -356,7 +244,7 @@ FIXME: this template has (at least) the following bugs:
|
||||
<sys-lib>oleacc</sys-lib>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
|
||||
<!-- template for wx executables/dlls: -->
|
||||
<template id="wx" template="wx-lib">
|
||||
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
|
||||
|
@@ -38,7 +38,7 @@ if test "$WXFOUND" != 1; then
|
||||
])
|
||||
fi
|
||||
|
||||
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
|
||||
AC_BAKEFILE
|
||||
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
|
@@ -40,10 +40,10 @@ def mk_wxid(id):
|
||||
|
||||
# All libs that are part of the main library (i.e. non-contrib):
|
||||
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
|
||||
'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext']
|
||||
'media', 'odbc', 'qa', 'dbgrid', 'xrc']
|
||||
# List of library names/ids for categories with different names:
|
||||
LIBS_NOGUI = ['xml', 'net', 'odbc']
|
||||
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media', 'aui', 'richtext']
|
||||
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media']
|
||||
# Additional libraries that must be linked in:
|
||||
EXTRALIBS = {
|
||||
'gl' : '$(EXTRALIBS_OPENGL)',
|
||||
@@ -109,11 +109,11 @@ def getVersion():
|
||||
major = minor = release = None
|
||||
for l in lines:
|
||||
if not l.startswith('#define'): continue
|
||||
splitline = l.strip().split()
|
||||
if splitline[0] != '#define': continue
|
||||
if len(splitline) < 3: continue
|
||||
name = splitline[1]
|
||||
value = splitline[2]
|
||||
splitted = l.strip().split()
|
||||
if splitted[0] != '#define': continue
|
||||
if len(splitted) < 3: continue
|
||||
name = splitted[1]
|
||||
value = splitted[2]
|
||||
if value == None: continue
|
||||
if name == 'wxMAJOR_VERSION': major = int(value)
|
||||
if name == 'wxMINOR_VERSION': minor = int(value)
|
||||
@@ -151,7 +151,3 @@ def headersOnly(files):
|
||||
def makeDspDependency(lib):
|
||||
"""Returns suitable entry for <depends-on-dsp> for main libs."""
|
||||
return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)
|
||||
|
||||
def makeContribDspDependency(lib):
|
||||
"""Returns suitable entry for <depends-on-dsp> for contrib libs."""
|
||||
return '%s:$(nativePaths(WXTOPDIR))contrib\\build\\%s\\%s.dsp' % (lib,lib,lib)
|
||||
|
@@ -1,62 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<bakefile-gen>
|
||||
|
||||
<!--
|
||||
|
||||
This file contains eperimental build specification for wxMGL port
|
||||
build with Open Watcom for DOS extenders. In order to get complete
|
||||
build, please setup:
|
||||
|
||||
1. wxWidgets CVS Head
|
||||
2. SCITECH/MGL toolkit
|
||||
3. OpenWatcom compiler
|
||||
4. Bakefile later than 0.1.9.1 (CVS at time of writing this)
|
||||
|
||||
To get Open Watcom makefiles for wxMGL port: open console under Windows,
|
||||
setup environment for toolkits listed above and then run:
|
||||
|
||||
cd %WXWIN%\build\bakefiles
|
||||
bakefile_gen -f watcom -d ../mgl/Bakefiles.mgl.bkgen
|
||||
|
||||
cd %WXWIN%\build\mgl
|
||||
wmake -h -f makefile.wat
|
||||
|
||||
cd %WXWIN%\samples\minimal
|
||||
wmake -h -f makefile.wat
|
||||
|
||||
Default build settings are located in %WXWIN%\build\mgl\config.wat
|
||||
|
||||
Note that currently you can't have watcom makefiles for building samples
|
||||
for different platforms in the same tree.
|
||||
|
||||
-->
|
||||
|
||||
<add-flags formats="watcom">
|
||||
-DPLATFORM_MSDOS=1
|
||||
</add-flags>
|
||||
|
||||
<include file="../bakefiles/Bakefiles.bkgen"/>
|
||||
|
||||
<add-flags files="wx.bkl" formats="watcom">
|
||||
-o../mgl/makefile.wat
|
||||
</add-flags>
|
||||
|
||||
<add-flags files="../bakefiles/wx.bkl" formats="watcom">
|
||||
-DOPTIONS_FILE=config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../build/mgl/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../build/mgl/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../../build/mgl/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../../../build/mgl/config.wat
|
||||
</add-flags>
|
||||
|
||||
</bakefile-gen>
|
@@ -1,130 +0,0 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# DOS32 mode/extender [X32VM,X32,PMODEW,CAUSEWAY,DOS32A,DOS4GW]
|
||||
# X32VM - FlashTek X-32VM DOS extender
|
||||
# X32 - FlashTek X-32 DOS extender
|
||||
# PMODEW - PMODE/W
|
||||
# CAUSEWAY - CauseWay DOS extender
|
||||
# DOS32A - DOS32/A
|
||||
# DOS4GW - Tenberry/Watcom 32-bit DOS extender
|
||||
DOS32 = DOS4GW
|
||||
|
||||
# C compiler
|
||||
CC = wcc386
|
||||
|
||||
# C++ compiler
|
||||
CXX = wpp386
|
||||
|
||||
# Standard flags for CC
|
||||
CFLAGS =
|
||||
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) -p
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
# 1 - DLL
|
||||
SHARED = 0
|
||||
|
||||
# Compile Unicode build of wxWidgets? [0,1]
|
||||
# 1 - Unicode
|
||||
UNICODE = 0
|
||||
|
||||
# Type of compiled binaries [debug,release]
|
||||
BUILD = debug
|
||||
|
||||
# Should debugging info be included in the executables? The default value
|
||||
# "default" means that debug info will be included if BUILD=debug
|
||||
# and not included if BUILD=release. [0,1,default]
|
||||
DEBUG_INFO = default
|
||||
|
||||
# Should __WXDEBUG__ be defined? The default value "default" means that it will
|
||||
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
|
||||
DEBUG_FLAG = default
|
||||
|
||||
# Multiple libraries or single huge monolithic one? [0,1]
|
||||
# 0 - Multilib
|
||||
# 1 - Monolithic
|
||||
MONOLITHIC = 1
|
||||
|
||||
# Build GUI libraries? [0,1]
|
||||
# 0 - Base
|
||||
# 1 - GUI
|
||||
USE_GUI = 1
|
||||
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
|
||||
USE_ODBC = 0
|
||||
|
||||
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
|
||||
USE_QA = 0
|
||||
|
||||
# Enable exceptions in compiled code. [0,1]
|
||||
USE_EXCEPTIONS = 1
|
||||
|
||||
# Enable run-time type information (RTTI) in compiled code. [0,1]
|
||||
USE_RTTI = 1
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
USE_GDIPLUS = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
# Use this to name your customized DLLs differently
|
||||
VENDOR = custom
|
||||
|
||||
#
|
||||
WX_FLAVOUR =
|
||||
|
||||
#
|
||||
WX_LIB_FLAVOUR =
|
||||
|
||||
# Name of your custom configuration. This affects directory
|
||||
# where object files are stored as well as the location of
|
||||
# compiled .lib files and setup.h under the lib/ toplevel directory.
|
||||
CFG =
|
||||
|
||||
# Compiler flags needed to compile test suite in tests directory. If you want
|
||||
# to run the tests, set it so that the compiler can find CppUnit headers.
|
||||
CPPUNIT_CFLAGS =
|
||||
|
||||
# Linker flags needed to link test suite in tests directory. If you want
|
||||
# to run the tests, include CppUnit library here.
|
||||
CPPUNIT_LIBS =
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,2 @@
|
||||
.m*
|
||||
config.dmc
|
||||
makefile.dmc
|
||||
vc_mswhdll
|
||||
vc_mswuhdll
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
@@ -40,11 +40,6 @@ CPPFLAGS = -a8 -g0
|
||||
LDFLAGS =
|
||||
!endif
|
||||
|
||||
# The C preprocessor
|
||||
!ifndef CPP
|
||||
CPP = cpp32 -Sr -oCON
|
||||
!endif
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
!ifndef SHARED
|
||||
SHARED = 0
|
||||
@@ -98,26 +93,11 @@ USE_GUI = 1
|
||||
USE_HTML = 1
|
||||
!endif
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
!ifndef USE_MEDIA
|
||||
USE_MEDIA = 1
|
||||
!endif
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
!ifndef USE_XRC
|
||||
USE_XRC = 1
|
||||
!endif
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
!ifndef USE_AUI
|
||||
USE_AUI = 1
|
||||
!endif
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
!ifndef USE_RICHTEXT
|
||||
USE_RICHTEXT = 1
|
||||
!endif
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
!ifndef USE_OPENGL
|
||||
USE_OPENGL = 0
|
||||
@@ -148,11 +128,6 @@ USE_RTTI = 1
|
||||
USE_THREADS = 1
|
||||
!endif
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
!ifndef USE_GDIPLUS
|
||||
USE_GDIPLUS = 0
|
||||
!endif
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
!ifndef OFFICIAL_BUILD
|
||||
OFFICIAL_BUILD = 0
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
@@ -28,9 +28,6 @@ CPPFLAGS =
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) -E
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
SHARED = 0
|
||||
|
||||
@@ -64,18 +61,9 @@ USE_GUI = 1
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
@@ -94,9 +82,6 @@ USE_RTTI = 1
|
||||
# Enable threading in compiled code. [0,1]
|
||||
USE_THREADS = 1
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
USE_GDIPLUS = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
@@ -28,9 +28,6 @@ CPPFLAGS =
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) /EP /nologo
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
SHARED = 0
|
||||
|
||||
@@ -46,15 +43,6 @@ MSLU = 0
|
||||
# Type of compiled binaries [debug,release]
|
||||
BUILD = debug
|
||||
|
||||
# The target processor architecture must be specified when it is not X86.
|
||||
# This does not affect the compiler output, so you still need to make sure
|
||||
# your environment is set up appropriately with the correct compiler in the
|
||||
# PATH. Rather it affects some options passed to some of the common build
|
||||
# utilities such as the resource compiler and the linker.
|
||||
#
|
||||
# Accepted values: AMD64, IA64.
|
||||
TARGET_CPU = $(CPU)
|
||||
|
||||
# Should debugging info be included in the executables? The default value
|
||||
# "default" means that debug info will be included if BUILD=debug
|
||||
# and not included if BUILD=release. [0,1,default]
|
||||
@@ -77,18 +65,9 @@ USE_GUI = 1
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
@@ -96,7 +75,7 @@ USE_OPENGL = 0
|
||||
USE_ODBC = 0
|
||||
|
||||
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
|
||||
USE_QA = 1
|
||||
USE_QA = 0
|
||||
|
||||
# Enable exceptions in compiled code. [0,1]
|
||||
USE_EXCEPTIONS = 1
|
||||
@@ -107,9 +86,6 @@ USE_RTTI = 1
|
||||
# Enable threading in compiled code. [0,1]
|
||||
USE_THREADS = 1
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
USE_GDIPLUS = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
@@ -28,19 +28,13 @@ CPPFLAGS =
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) -p
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
# 1 - DLL
|
||||
SHARED = 0
|
||||
|
||||
# Build wxUniversal instead of native port? [0,1]
|
||||
# 1 - Universal
|
||||
WXUNIV = 0
|
||||
|
||||
# Compile Unicode build of wxWidgets? [0,1]
|
||||
# 1 - Unicode
|
||||
UNICODE = 0
|
||||
|
||||
# Type of compiled binaries [debug,release]
|
||||
@@ -56,30 +50,17 @@ DEBUG_INFO = default
|
||||
DEBUG_FLAG = default
|
||||
|
||||
# Multiple libraries or single huge monolithic one? [0,1]
|
||||
# 0 - Multilib
|
||||
# 1 - Monolithic
|
||||
MONOLITHIC = 1
|
||||
|
||||
# Build GUI libraries? [0,1]
|
||||
# 0 - Base
|
||||
# 1 - GUI
|
||||
USE_GUI = 1
|
||||
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
@@ -98,9 +79,6 @@ USE_RTTI = 1
|
||||
# Enable threading in compiled code. [0,1]
|
||||
USE_THREADS = 1
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
USE_GDIPLUS = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user