Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
9aea121b6c |
26660
Makefile.in
26660
Makefile.in
File diff suppressed because it is too large
Load Diff
169
Mingw32-gcc295.patches
Normal file
169
Mingw32-gcc295.patches
Normal file
@@ -0,0 +1,169 @@
|
||||
*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999
|
||||
--- basetyps.h Fri Aug 06 11:14:36 1999
|
||||
***************
|
||||
*** 74,91 ****
|
||||
--- 74,97 ----
|
||||
STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
|
||||
}
|
||||
#define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
|
||||
|
||||
+ #ifndef GUID_DEFINED
|
||||
+ #define GUID_DEFINED
|
||||
typedef struct _GUID
|
||||
{
|
||||
unsigned long Data1;
|
||||
unsigned short Data2;
|
||||
unsigned short Data3;
|
||||
unsigned char Data4[8];
|
||||
} GUID;
|
||||
+ #endif /* GUID_DEFINED */
|
||||
typedef GUID *REFGUID;
|
||||
typedef GUID *LPGUID;
|
||||
+ #ifndef UUID_DEFINED
|
||||
+ #define UUID_DEFINED
|
||||
typedef GUID UUID;
|
||||
+ #endif /* UUID_DEFINED */
|
||||
typedef GUID IID;
|
||||
typedef GUID CLSID;
|
||||
typedef CLSID *LPCLSID;
|
||||
typedef IID *LPIID;
|
||||
|
||||
|
||||
*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999
|
||||
--- oaidl.h Fri Aug 06 13:18:48 1999
|
||||
***************
|
||||
*** 39,44 ****
|
||||
--- 39,53 ----
|
||||
#define IMPLTYPEFLAG_FRESTRICTED 4
|
||||
#define IMPLTYPEFLAG_FDEFAULTVTABLE 8
|
||||
|
||||
+ #define DISPID_UNKNOWN ( -1 )
|
||||
+ #define DISPID_VALUE ( 0 )
|
||||
+ #define DISPID_PROPERTYPUT ( -3 )
|
||||
+ #define DISPID_NEWENUM ( -4 )
|
||||
+ #define DISPID_EVALUATE ( -5 )
|
||||
+ #define DISPID_CONSTRUCTOR ( -6 )
|
||||
+ #define DISPID_DESTRUCTOR ( -7 )
|
||||
+ #define DISPID_COLLECT ( -8 )
|
||||
+
|
||||
typedef interface ITypeLib *LPTYPELIB;
|
||||
typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
|
||||
typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
|
||||
***************
|
||||
*** 49,54 ****
|
||||
--- 58,73 ----
|
||||
typedef interface IDispatch *LPDISPATCH;
|
||||
typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
|
||||
|
||||
+ extern "C" const IID IID_ITypeLib;
|
||||
+ extern "C" const IID IID_ICreateTypeInfo;
|
||||
+ extern "C" const IID IID_ICreateTypeInfo2;
|
||||
+ extern "C" const IID IID_ICreateTypeLib;
|
||||
+ extern "C" const IID IID_ICreateTypeLib2;
|
||||
+ extern "C" const IID IID_ITypeInfo;
|
||||
+ extern "C" const IID IID_IErrorInfo;
|
||||
+ extern "C" const IID IID_IDispatch;
|
||||
+ extern "C" const IID IID_ICreateErrorInfo;
|
||||
+
|
||||
typedef enum tagSYSKIND {
|
||||
SYS_WIN16,SYS_WIN32,SYS_MAC
|
||||
} SYSKIND;
|
||||
***************
|
||||
*** 375,382 ****
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
|
||||
STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
|
||||
! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID)
|
||||
PURE;
|
||||
! STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
--- 394,401 ----
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
|
||||
STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
|
||||
! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*)
|
||||
PURE;
|
||||
! STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
|
||||
*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999
|
||||
--- objidl.h Fri Aug 06 11:00:19 1999
|
||||
***************
|
||||
*** 627,633 ****
|
||||
STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
|
||||
STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
|
||||
STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
|
||||
! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE;
|
||||
STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
|
||||
STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
|
||||
STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
|
||||
--- 627,633 ----
|
||||
STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
|
||||
STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
|
||||
STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
|
||||
! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
|
||||
STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
|
||||
STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
|
||||
STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
|
||||
|
||||
|
||||
--- i386-mingw32\include\stdio.h Sun Aug 1 06:18:20 1999
|
||||
+++ stdio.h Sun Nov 7 03:41:40 1999
|
||||
@@ -203,9 +203,12 @@
|
||||
int fprintf (FILE* filePrintTo, const char* szFormat, ...);
|
||||
int printf (const char* szFormat, ...);
|
||||
int sprintf (char* caBuffer, const char* szFormat, ...);
|
||||
+int _snprintf (char* caBuffer, size_t n, const char* szFormat, ...);
|
||||
int vfprintf (FILE* filePrintTo, const char* szFormat, va_list varg);
|
||||
int vprintf (const char* szFormat, va_list varg);
|
||||
int vsprintf (char* caBuffer, const char* szFormat, va_list varg);
|
||||
+int _vsnprintf (char* caBuffer, size_t n, const char* szFormat,
|
||||
+ va_list varg);
|
||||
|
||||
/* Wide character versions */
|
||||
int fwprintf (FILE* filePrintTo, const wchar_t* wsFormat, ...);
|
||||
|
||||
|
||||
|
||||
--- i386-mingw32\include\winbase.h Sat Jul 31 17:48:48 1999
|
||||
+++ winbase.h Fri Feb 25 01:49:08 2000
|
||||
@@ -989,7 +989,7 @@
|
||||
BOOL WINAPI CopyFileExW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD);
|
||||
#define RtlMoveMemory memmove
|
||||
#define RtlCopyMemory memcpy
|
||||
-#define RtlFillMemory memset
|
||||
+#define RtlFillMemory(d,l,f) memset ((d),(f),(l))
|
||||
#define RtlZeroMemory(d,l) memset((d),0,(l))
|
||||
#define MoveMemory RtlMoveMemory
|
||||
#define CopyMemory RtlCopyMemory
|
||||
|
||||
--- i386-mingw32\include\winsock.h Sat Jul 31 17:48:50 1999
|
||||
+++ winsock.h Mon Mar 20 13:47:12 2000
|
||||
@@ -13,6 +13,10 @@
|
||||
#define _GNU_H_WINDOWS32_SOCKETS
|
||||
#include <windows.h>
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
#ifndef _SYS_TYPES_H
|
||||
typedef unsigned char u_char;
|
||||
typedef unsigned short u_short;
|
||||
@@ -495,4 +499,9 @@
|
||||
typedef struct timeval TIMEVAL;
|
||||
typedef struct timeval *PTIMEVAL;
|
||||
typedef struct timeval *LPTIMEVAL;
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
#endif
|
||||
+#endif
|
||||
+
|
||||
|
||||
|
292
acinclude.m4
292
acinclude.m4
@@ -132,7 +132,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 +227,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([AS_TR_CPP([HAVE_$wx_func])])
|
||||
$2
|
||||
else
|
||||
:
|
||||
$3
|
||||
fi
|
||||
done
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -350,10 +284,6 @@ AC_DEFUN([WX_ARG_CACHE_FLUSH],
|
||||
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
|
||||
])
|
||||
|
||||
dnl return the name of the variable to store the value of the given
|
||||
dnl WX_ARG_WITH/ENABLE option
|
||||
AC_DEFUN([WX_ARG_CACHE_NAME],)
|
||||
|
||||
dnl this macro checks for a three-valued command line --with argument:
|
||||
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
|
||||
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
|
||||
@@ -364,13 +294,13 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
||||
AC_ARG_WITH($1, [$2],
|
||||
[
|
||||
if test "$withval" = yes; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=yes'
|
||||
ac_cv_use_$1='$3=yes'
|
||||
elif test "$withval" = no; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
||||
ac_cv_use_$1='$3=no'
|
||||
elif test "$withval" = sys; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=sys'
|
||||
ac_cv_use_$1='$3=sys'
|
||||
elif test "$withval" = builtin; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=builtin'
|
||||
ac_cv_use_$1='$3=builtin'
|
||||
else
|
||||
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
|
||||
fi
|
||||
@@ -383,12 +313,12 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
||||
ac_cv_use_$1='$3='$DEFAULT_$3
|
||||
])
|
||||
|
||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||
eval "$ac_cv_use_$1"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
||||
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$$3" = yes; then
|
||||
@@ -408,15 +338,15 @@ dnl this macro checks for a command line argument and caches the result
|
||||
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
|
||||
AC_DEFUN([WX_ARG_WITH],
|
||||
[
|
||||
withstring=$4
|
||||
withstring=$4
|
||||
AC_MSG_CHECKING([for --${withstring:-with}-$1])
|
||||
no_cache=0
|
||||
AC_ARG_WITH($1, [$2],
|
||||
[
|
||||
if test "$withval" = yes; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=yes'
|
||||
ac_cv_use_$1='$3=yes'
|
||||
else
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
||||
ac_cv_use_$1='$3=no'
|
||||
fi
|
||||
],
|
||||
[
|
||||
@@ -427,12 +357,12 @@ AC_DEFUN([WX_ARG_WITH],
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
||||
ac_cv_use_$1='$3='$DEFAULT_$3
|
||||
])
|
||||
|
||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||
eval "$ac_cv_use_$1"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
||||
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$$3" = yes; then
|
||||
@@ -450,15 +380,15 @@ 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],
|
||||
[
|
||||
if test "$enableval" = yes; then
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=yes'
|
||||
ac_cv_use_$1='$3=yes'
|
||||
else
|
||||
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
||||
ac_cv_use_$1='$3=no'
|
||||
fi
|
||||
],
|
||||
[
|
||||
@@ -469,12 +399,12 @@ AC_DEFUN([WX_ARG_ENABLE],
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
||||
ac_cv_use_$1='$3='$DEFAULT_$3
|
||||
])
|
||||
|
||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||
eval "$ac_cv_use_$1"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
||||
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$$3" = yes; then
|
||||
@@ -485,47 +415,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 ===========================================================================
|
||||
@@ -539,80 +428,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
|
||||
])
|
||||
|
||||
|
||||
|
9
aclocal.m4
vendored
9
aclocal.m4
vendored
@@ -1,7 +1,7 @@
|
||||
# generated automatically by aclocal 1.10 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||
# 2005, 2006 Free Software Foundation, Inc.
|
||||
# 2005 Free Software Foundation, Inc.
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -11,9 +11,6 @@
|
||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
|
||||
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
|
||||
m4_include([build/aclocal/bakefile-dllar.m4])
|
||||
m4_include([build/aclocal/bakefile-lang.m4])
|
||||
m4_include([build/aclocal/bakefile.m4])
|
||||
m4_include([build/aclocal/cppunit.m4])
|
||||
@@ -21,4 +18,6 @@ m4_include([build/aclocal/gtk-2.0.m4])
|
||||
m4_include([build/aclocal/gtk.m4])
|
||||
m4_include([build/aclocal/pkg.m4])
|
||||
m4_include([build/aclocal/sdl.m4])
|
||||
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
|
||||
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
|
||||
m4_include([acinclude.m4])
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * addbookm_xpm[] = {
|
||||
static char *addbookm_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * back_xpm[] = {
|
||||
static char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * cdrom_xpm[] = {
|
||||
static char *cdrom_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"= c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * copy_xpm[] = {
|
||||
static char *copy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"o c #97C4E7",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * cross_xpm[] = {
|
||||
static char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * cut_xpm[] = {
|
||||
static char *cut_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"6 c #D8BDC0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * deffile_xpm[] = {
|
||||
static char *deffile_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 32 1",
|
||||
"= c #97C4E7",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * delbookm_xpm[] = {
|
||||
static char *delbookm_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * delete_xpm[] = {
|
||||
static char *delete_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"2 c #A5AEBD",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * dir_up_xpm[] = {
|
||||
static char *dir_up_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * down_xpm[] = {
|
||||
static char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * exefile_xpm[] = {
|
||||
static char *exefile_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 51 1",
|
||||
"% c #E8E8EC",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * fileopen_xpm[] = {
|
||||
static char *fileopen_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"6 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * filesave_xpm[] = {
|
||||
static char *filesave_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"O c #FFFFFF",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * filesaveas_xpm[] = {
|
||||
static char *filesaveas_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"X c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * find_xpm[] = {
|
||||
static char *find_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 41 1",
|
||||
"y c #A06959",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * findrepl_xpm[] = {
|
||||
static char *findrepl_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 42 1",
|
||||
"y c #A06959",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * floppy_xpm[] = {
|
||||
static char *floppy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 18 1",
|
||||
"& c #E3E4E6",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * folder_xpm[] = {
|
||||
static char *folder_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"> c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * folder_open_xpm[] = {
|
||||
static char *folder_open_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * forward_xpm[] = {
|
||||
static char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * error_xpm[] = {
|
||||
static char *error_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 4 1",
|
||||
" c None",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * info_xpm[] = {
|
||||
static char *info_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 9 1",
|
||||
"$ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * question_xpm[] = {
|
||||
static char *question_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 21 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * warning_xpm[] = {
|
||||
static char *warning_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 9 1",
|
||||
"@ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * harddisk_xpm[] = {
|
||||
static char *harddisk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"7 c #E3E4E6",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * helpicon_xpm[] = {
|
||||
static char *helpicon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 6 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * home_xpm[] = {
|
||||
static char *home_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * htmbook_xpm[] = {
|
||||
static char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * htmfoldr_xpm[] = {
|
||||
static char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * htmoptns_xpm[] = {
|
||||
static char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * htmpage_xpm[] = {
|
||||
static char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * htmsidep_xpm[] = {
|
||||
static char *htmsidep_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 6 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * listview_xpm[] = {
|
||||
static char *listview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 4 1",
|
||||
" c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * missimg_xpm[] = {
|
||||
static char *missimg_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 5 1",
|
||||
"X c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * error_xpm[] = {
|
||||
static char *error_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 4 1",
|
||||
" c None",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * info_xpm[] = {
|
||||
static char *info_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 9 1",
|
||||
"$ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * question_xpm[] = {
|
||||
static char *question_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 21 1",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * warning_xpm[] = {
|
||||
static char *warning_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"48 48 9 1",
|
||||
"@ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * new_xpm[] = {
|
||||
static char *new_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 29 1",
|
||||
"* c #97C4E7",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * new_dir_xpm[] = {
|
||||
static char *new_dir_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"X c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * paste_xpm[] = {
|
||||
static char *paste_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"< c #FEECE4",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * print_xpm[] = {
|
||||
static char *print_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"< c #E3E4E6",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * quit_xpm[] = {
|
||||
static char *quit_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 69 1",
|
||||
"@ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * redo_xpm[] = {
|
||||
static char *redo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * removable_xpm[] = {
|
||||
static char *removable_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"@ c #C3C3C4",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * repview_xpm[] = {
|
||||
static char *repview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
" c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * tick_xpm[] = {
|
||||
static char *tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * tipicon_xpm[] = {
|
||||
static char *tipicon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 9 1",
|
||||
"$ c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * toparent_xpm[] = {
|
||||
static char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * undo_xpm[] = {
|
||||
static char *undo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * up_xpm[] = {
|
||||
static char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * wxwin16x16_xpm[] = {
|
||||
static char *wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static const char * wxwin32x32_xpm[] = {
|
||||
static char *wxwin32x32_xpm[] = {
|
||||
"32 32 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
368
autoconf_inc.m4
368
autoconf_inc.m4
File diff suppressed because one or more lines are too long
@@ -1,3 +1,2 @@
|
||||
#!/bin/sh
|
||||
#autoconf
|
||||
make -f build/autogen.mk
|
||||
autoconf
|
||||
|
@@ -19,53 +19,41 @@ 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>],
|
||||
[AC_CHECK_FUNC(getservbyname_r,
|
||||
[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_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)
|
||||
(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()
|
||||
]
|
||||
)
|
||||
[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_cv_func_which_getservbyname_r=no
|
||||
)]
|
||||
)]
|
||||
)],
|
||||
ac_cv_func_which_getservbyname_r=no)
|
||||
|
||||
if test $ac_cv_func_which_getservbyname_r = six; then
|
||||
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
|
||||
|
@@ -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,36 +1,74 @@
|
||||
dnl
|
||||
dnl This file is part of Bakefile (http://www.bakefile.org)
|
||||
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 and Vadim Zeitlin
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Compiler detection macros by David Elliott
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Macros to detect different C/C++ compilers
|
||||
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],
|
||||
@@ -51,64 +89,12 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
|
||||
)
|
||||
]
|
||||
)
|
||||
AC_LANG_POP($2)
|
||||
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
|
||||
:; $4
|
||||
else
|
||||
:; $5
|
||||
fi
|
||||
AC_LANG_POP($2)
|
||||
])
|
||||
|
||||
dnl More specific version of the above macro checking whether the compiler
|
||||
dnl version is at least the given one (assumes that we do use this compiler)
|
||||
dnl
|
||||
dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
|
||||
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
|
||||
[
|
||||
AC_LANG_PUSH($2)
|
||||
AC_CACHE_CHECK(
|
||||
[whether we are using $1 $2 compiler v$5 or later],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
|
||||
[AC_TRY_COMPILE(
|
||||
[],
|
||||
[
|
||||
#ifndef $3 || $3 < $4
|
||||
choke me
|
||||
#endif
|
||||
],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
|
||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
|
||||
)
|
||||
]
|
||||
)
|
||||
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
|
||||
:; $6
|
||||
else
|
||||
:; $7
|
||||
fi
|
||||
AC_LANG_POP($2)
|
||||
])
|
||||
|
||||
dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
|
||||
])
|
||||
|
||||
dnl IBM xlC compiler defines __xlC__ for both C and C++
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes)
|
||||
])
|
||||
|
||||
dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
|
||||
@@ -147,29 +133,6 @@ AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
|
||||
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
|
||||
])
|
||||
|
||||
dnl Intel compiler command line options changed in incompatible ways sometimes
|
||||
dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
|
||||
dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
|
||||
dnl its exact version too
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
|
||||
])
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
|
||||
[
|
||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
|
||||
])
|
||||
|
||||
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
|
||||
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
|
||||
[
|
||||
@@ -241,18 +204,7 @@ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
|
||||
AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
||||
[
|
||||
AC_PROG_$1
|
||||
|
||||
dnl Intel compiler can be used under several different OS and even
|
||||
dnl different architectures (x86, amd64 and Itanium) so it's easier to just
|
||||
dnl always test for it
|
||||
AC_BAKEFILE_PROG_INTEL$1
|
||||
|
||||
dnl If we use Intel compiler we also need to know its version
|
||||
if test "$INTEL$1" = "yes"; then
|
||||
AC_BAKEFILE_PROG_INTEL$1_8
|
||||
AC_BAKEFILE_PROG_INTEL$1_10
|
||||
fi
|
||||
|
||||
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
|
||||
@@ -272,23 +224,13 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
||||
|
||||
Darwin)
|
||||
AC_BAKEFILE_PROG_MW$1
|
||||
if test "$MW$1" != "yes"; then
|
||||
AC_BAKEFILE_PROG_XL$1
|
||||
fi
|
||||
AC_BAKEFILE_PROG_XL$1
|
||||
;;
|
||||
|
||||
IRIX*)
|
||||
AC_BAKEFILE_PROG_SGI$1
|
||||
;;
|
||||
|
||||
Linux*)
|
||||
dnl Sun CC is now available under Linux too, test for it unless
|
||||
dnl we already found that we were using a different compiler
|
||||
if test "$INTEL$1" != "yes"; then
|
||||
AC_BAKEFILE_PROG_SUN$1
|
||||
fi
|
||||
;;
|
||||
|
||||
HP-UX*)
|
||||
AC_BAKEFILE_PROG_HP$1
|
||||
;;
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,6 @@ AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix w
|
||||
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`
|
||||
|
@@ -1,156 +1,57 @@
|
||||
# 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
|
||||
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
|
||||
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
|
||||
dnl also defines GSTUFF_PKG_ERRORS on error
|
||||
AC_DEFUN([PKG_CHECK_MODULES], [
|
||||
succeeded=no
|
||||
|
||||
# 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])
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
AC_MSG_CHECKING(for $2)
|
||||
|
||||
# _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
|
||||
if $PKG_CONFIG --exists "$2" ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
succeeded=yes
|
||||
|
||||
# _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
|
||||
AC_MSG_CHECKING($1_CFLAGS)
|
||||
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
|
||||
AC_MSG_RESULT($$1_CFLAGS)
|
||||
|
||||
|
||||
# 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"`
|
||||
AC_MSG_CHECKING($1_LIBS)
|
||||
$1_LIBS=`$PKG_CONFIG --libs "$2"`
|
||||
AC_MSG_RESULT($$1_LIBS)
|
||||
else
|
||||
$1_CFLAGS=""
|
||||
$1_LIBS=""
|
||||
## If we have a custom action on failure, don't print errors, but
|
||||
## do set a variable so people can do so.
|
||||
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
ifelse([$4], ,echo $$1_PKG_ERRORS,)
|
||||
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:
|
||||
AC_SUBST($1_CFLAGS)
|
||||
AC_SUBST($1_LIBS)
|
||||
else
|
||||
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
||||
echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
||||
fi
|
||||
fi
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
if test $succeeded = yes; then
|
||||
ifelse([$3], , :, [$3])
|
||||
else
|
||||
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
|
||||
fi
|
||||
])
|
||||
|
||||
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
|
||||
|
@@ -20,21 +20,20 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
|
||||
, 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
|
||||
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
|
||||
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_REQUIRE([AC_CANONICAL_TARGET])
|
||||
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
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)
|
||||
|
@@ -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
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/Xlib.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/Xlib.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="-lX11 $LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
|
||||
[XrmInitialize ()])],
|
||||
[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/libX11.$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,7 +1,7 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
|
||||
<bakefile-gen>
|
||||
|
||||
<!--
|
||||
Formats listed here are not generated by default. To enable them, either
|
||||
@@ -54,22 +54,22 @@
|
||||
</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: -->
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
<!-- 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
|
||||
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
|
||||
|
||||
@@ -114,9 +114,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,7 +131,7 @@
|
||||
-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>
|
||||
|
||||
@@ -145,6 +142,11 @@
|
||||
-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>
|
||||
|
||||
|
||||
@@ -153,8 +155,7 @@
|
||||
<add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
|
||||
-DWRITE_OPTIONS_FILE=0
|
||||
</add-flags>
|
||||
<del-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom"
|
||||
files="wx.bkl">
|
||||
<del-flags files="wx.bkl">
|
||||
-DWRITE_OPTIONS_FILE=0
|
||||
</del-flags>
|
||||
|
||||
@@ -255,15 +256,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"/>
|
||||
|
4120
build/bakefiles/Makefile
Normal file
4120
build/bakefiles/Makefile
Normal file
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@
|
||||
the library.
|
||||
-->
|
||||
|
||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
|
||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
|
||||
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
||||
|
||||
<set var="BUILD_CFG_FILE" make_var="1">
|
||||
@@ -43,7 +43,6 @@
|
||||
@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.3"/>
|
||||
<requires version="0.1.7"/>
|
||||
|
||||
<!-- bakefile modules we need: -->
|
||||
<using module="datafiles"/>
|
||||
@@ -200,7 +200,7 @@
|
||||
</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>
|
||||
@@ -282,15 +282,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>
|
||||
@@ -347,22 +338,28 @@
|
||||
|
||||
<!-- 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>
|
||||
<!-- 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>
|
||||
|
||||
<set var="msvc_copy_setup_h_script">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
Creating $(SETUPHDIR)\wx\setup.h
|
||||
InputPath=..\..\include\wx\%s
|
||||
InputPath=..\include\wx\%s
|
||||
|
||||
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
|
||||
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
|
||||
@@ -421,9 +418,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
|
||||
</set>
|
||||
<set var="_custom_build_include_wx_msw_genrcdefs_h">
|
||||
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
|
||||
InputPath=..\..\include\wx\msw\genrcdefs.h
|
||||
|
||||
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
|
||||
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
|
||||
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
</set>
|
||||
</if>
|
||||
@@ -482,7 +478,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<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>
|
||||
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
||||
<lib-path>$(LIBDIRNAME)</lib-path>
|
||||
@@ -529,7 +524,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<!-- system libraries on windows: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
||||
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
|
||||
<if cond="FORMAT=='borland'">
|
||||
<sys-lib>ole2w32</sys-lib>
|
||||
</if>
|
||||
@@ -641,10 +635,12 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
|
||||
|
||||
<!-- 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>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<res-include>$(RCDEFDIR)</res-include>
|
||||
<res-include>$(TOP_SRCDIR)include</res-include>
|
||||
</if>
|
||||
</if>
|
||||
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
|
||||
</template>
|
||||
|
@@ -3,17 +3,121 @@
|
||||
|
||||
<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: -->
|
||||
<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,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>
|
@@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
|
||||
<!-- 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>
|
||||
@@ -231,8 +231,8 @@ Acts according to BUILD by default.
|
||||
|
||||
<!-- 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>
|
||||
<if cond="FORMAT in ['msvc','msvc6prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
|
||||
</set>
|
||||
<option name="USE_QA">
|
||||
<values>0,1</values>
|
||||
@@ -266,16 +266,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>
|
||||
@@ -339,7 +329,6 @@ to run the tests, include CppUnit library here.
|
||||
<option name="EXTRALIBS"/>
|
||||
<option name="EXTRALIBS_XML"/>
|
||||
<option name="EXTRALIBS_HTML"/>
|
||||
<option name="EXTRALIBS_MEDIA"/>
|
||||
<option name="EXTRALIBS_ODBC"/>
|
||||
<option name="EXTRALIBS_GUI"/>
|
||||
<option name="EXTRALIBS_OPENGL"/>
|
||||
@@ -356,8 +345,6 @@ to run the tests, include CppUnit library here.
|
||||
<option name="WITH_PLUGIN_SDL">
|
||||
<values>0,1</values>
|
||||
</option>
|
||||
|
||||
<option name="wx_top_builddir"/>
|
||||
</if>
|
||||
|
||||
|
||||
@@ -391,7 +378,6 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<set var="EXTRALIBS"/>
|
||||
<set var="EXTRALIBS_XML"/>
|
||||
<set var="EXTRALIBS_HTML"/>
|
||||
<set var="EXTRALIBS_MEDIA"/>
|
||||
<set var="EXTRALIBS_ODBC"/>
|
||||
<set var="EXTRALIBS_GUI"/>
|
||||
<set var="EXTRALIBS_OPENGL">
|
||||
@@ -404,9 +390,10 @@ it if SHARED=1 unless you know what you are doing.
|
||||
|
||||
<set var="WITH_PLUGIN_SDL">0</set>
|
||||
|
||||
<if cond="BUILDING_LIB=='1'">
|
||||
<set-srcdir>../..</set-srcdir>
|
||||
</if>
|
||||
<set var="SRCDIR">
|
||||
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
|
||||
<if cond="BUILDING_LIB=='0'">.</if>
|
||||
</set>
|
||||
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
|
||||
</if>
|
||||
|
||||
@@ -453,7 +440,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>
|
||||
|
@@ -146,8 +146,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/corefoundation/utilsexc_base.cpp
|
||||
</set>
|
||||
<set var="BASE_COREFOUNDATION_HDR" hints="files">
|
||||
wx/mac/corefoundation/cfdataref.h
|
||||
wx/mac/corefoundation/cfref.h
|
||||
wx/mac/corefoundation/cfstring.h
|
||||
wx/mac/corefoundation/hid.h
|
||||
wx/mac/corefoundation/stdpaths.h
|
||||
@@ -201,7 +199,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(BASE_MAC_SRC)
|
||||
src/unix/baseunix.cpp
|
||||
src/unix/dlunix.cpp
|
||||
src/unix/snglinst.cpp
|
||||
src/unix/stdpaths.cpp
|
||||
</set>
|
||||
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
|
||||
@@ -228,7 +225,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="BASE_OS2_SRC" hints="files">
|
||||
src/os2/dir.cpp
|
||||
src/os2/mimetype.cpp
|
||||
src/os2/snglinst.cpp
|
||||
src/os2/stdpaths.cpp
|
||||
src/os2/thread.cpp
|
||||
src/os2/utils.cpp
|
||||
@@ -293,8 +289,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||
<set var="BASE_CMN_SRC" hints="files">
|
||||
src/common/appbase.cpp
|
||||
src/common/arcall.cpp
|
||||
src/common/arcfind.cpp
|
||||
src/common/archive.cpp
|
||||
src/common/clntdata.cpp
|
||||
src/common/cmdline.cpp
|
||||
@@ -310,16 +304,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/extended.c
|
||||
src/common/ffile.cpp
|
||||
src/common/file.cpp
|
||||
src/common/fileback.cpp
|
||||
src/common/fileconf.cpp
|
||||
src/common/filefn.cpp
|
||||
src/common/filename.cpp
|
||||
src/common/filesys.cpp
|
||||
src/common/filtall.cpp
|
||||
src/common/filtfind.cpp
|
||||
src/common/fmapbase.cpp
|
||||
src/common/fs_arc.cpp
|
||||
src/common/fs_filter.cpp
|
||||
src/common/fs_zip.cpp
|
||||
src/common/hash.cpp
|
||||
src/common/hashmap.cpp
|
||||
src/common/init.cpp
|
||||
@@ -333,7 +323,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/module.cpp
|
||||
src/common/mstream.cpp
|
||||
src/common/object.cpp
|
||||
src/common/platinfo.cpp
|
||||
src/common/powercmn.cpp
|
||||
src/common/process.cpp
|
||||
src/common/regex.cpp
|
||||
@@ -344,7 +333,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/stream.cpp
|
||||
src/common/string.cpp
|
||||
src/common/sysopt.cpp
|
||||
src/common/tarstrm.cpp
|
||||
src/common/textbuf.cpp
|
||||
src/common/textfile.cpp
|
||||
src/common/tokenzr.cpp
|
||||
@@ -381,7 +369,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/config.h
|
||||
wx/convauto.h
|
||||
wx/containr.h
|
||||
wx/cpp.h
|
||||
wx/datetime.h
|
||||
wx/datstrm.h
|
||||
wx/dde.h
|
||||
@@ -404,8 +391,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/filesys.h
|
||||
wx/fontenc.h
|
||||
wx/fontmap.h
|
||||
wx/fs_arc.h
|
||||
wx/fs_filter.h
|
||||
wx/fs_mem.h
|
||||
wx/fs_zip.h
|
||||
wx/hash.h
|
||||
@@ -436,7 +421,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mstream.h
|
||||
wx/object.h
|
||||
wx/platform.h
|
||||
wx/platinfo.h
|
||||
wx/power.h
|
||||
wx/process.h
|
||||
wx/ptr_scpd.h
|
||||
@@ -454,7 +438,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/stream.h
|
||||
wx/string.h
|
||||
wx/sysopt.h
|
||||
wx/tarstrm.h
|
||||
wx/textbuf.h
|
||||
wx/textfile.h
|
||||
wx/thread.h
|
||||
@@ -565,7 +548,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="GUI_CMN_SRC" hints="files">
|
||||
src/common/accesscmn.cpp
|
||||
src/common/anidecod.cpp
|
||||
src/common/appcmn.cpp
|
||||
src/common/artprov.cpp
|
||||
src/common/artstd.cpp
|
||||
@@ -584,8 +566,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/ctrlsub.cpp
|
||||
src/common/datacmn.cpp
|
||||
src/common/dcbase.cpp
|
||||
src/common/dcbufcmn.cpp
|
||||
src/common/dcgraph.cpp
|
||||
src/common/dlgcmn.cpp
|
||||
src/common/dndcmn.cpp
|
||||
src/common/dobjcmn.cpp
|
||||
@@ -608,7 +588,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/gdicmn.cpp
|
||||
src/common/geometry.cpp
|
||||
src/common/gifdecod.cpp
|
||||
src/common/graphcmn.cpp
|
||||
src/common/helpbase.cpp
|
||||
src/common/iconbndl.cpp
|
||||
src/common/imagall.cpp
|
||||
@@ -621,16 +600,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/imagpcx.cpp
|
||||
src/common/imagpng.cpp
|
||||
src/common/imagpnm.cpp
|
||||
src/common/imagtga.cpp
|
||||
src/common/imagtiff.cpp
|
||||
src/common/imagxpm.cpp
|
||||
src/common/layout.cpp
|
||||
src/common/lboxcmn.cpp
|
||||
src/common/listctrlcmn.cpp
|
||||
src/common/matrix.cpp
|
||||
src/common/menucmn.cpp
|
||||
src/common/nbkbase.cpp
|
||||
src/common/overlaycmn.cpp
|
||||
src/common/paper.cpp
|
||||
src/common/pickerbase.cpp
|
||||
src/common/popupcmn.cpp
|
||||
@@ -641,7 +617,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/rgncmn.cpp
|
||||
src/common/settcmn.cpp
|
||||
src/common/sizer.cpp
|
||||
src/common/srchcmn.cpp
|
||||
src/common/statbar.cpp
|
||||
src/common/stockitem.cpp
|
||||
src/common/tbarbase.cpp
|
||||
@@ -659,7 +634,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/choicdgg.cpp
|
||||
src/generic/choicbkg.cpp
|
||||
src/generic/clrpickerg.cpp
|
||||
src/generic/collpaneg.cpp
|
||||
src/generic/combog.cpp
|
||||
src/generic/dcpsg.cpp
|
||||
src/generic/dirctrlg.cpp
|
||||
@@ -677,7 +651,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/selstore.cpp
|
||||
src/generic/spinctlg.cpp
|
||||
src/generic/splitter.cpp
|
||||
src/generic/srchctlg.cpp
|
||||
src/generic/textdlgg.cpp
|
||||
src/generic/tipwin.cpp
|
||||
src/generic/toolbkg.cpp
|
||||
@@ -695,7 +668,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/choicdlg.h
|
||||
wx/choice.h
|
||||
wx/cmndata.h
|
||||
wx/collpane.h
|
||||
wx/combo.h
|
||||
wx/combobox.h
|
||||
wx/control.h
|
||||
@@ -703,7 +675,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/cursor.h
|
||||
wx/dc.h
|
||||
wx/dcclient.h
|
||||
wx/dcgraph.h
|
||||
wx/dcmemory.h
|
||||
wx/dcprint.h
|
||||
wx/dcscreen.h
|
||||
@@ -720,7 +691,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/buttonbar.h
|
||||
wx/generic/choicdgg.h
|
||||
wx/generic/clrpickerg.h
|
||||
wx/generic/collpaneg.h
|
||||
wx/generic/colrdlgg.h
|
||||
wx/generic/combo.h
|
||||
wx/generic/dcpsg.h
|
||||
@@ -730,6 +700,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/filepickerg.h
|
||||
wx/generic/fontdlgg.h
|
||||
wx/generic/fontpickerg.h
|
||||
wx/generic/imaglist.h
|
||||
wx/generic/logg.h
|
||||
wx/generic/msgdlgg.h
|
||||
wx/generic/numdlgg.h
|
||||
@@ -741,11 +712,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/scrolwin.h
|
||||
wx/generic/spinctlg.h
|
||||
wx/generic/splitter.h
|
||||
wx/generic/srchctlg.h
|
||||
wx/generic/textdlgg.h
|
||||
wx/generic/timer.h
|
||||
wx/generic/treectlg.h
|
||||
wx/graphics.h
|
||||
wx/helphtml.h
|
||||
wx/icon.h
|
||||
wx/layout.h
|
||||
@@ -754,7 +723,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/menu.h
|
||||
wx/msgdlg.h
|
||||
wx/numdlg.h
|
||||
wx/overlay.h
|
||||
wx/palette.h
|
||||
wx/panel.h
|
||||
wx/pen.h
|
||||
@@ -782,7 +750,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
wx/accel.h
|
||||
wx/access.h
|
||||
wx/anidecod.h
|
||||
wx/artprov.h
|
||||
wx/bitmap.h
|
||||
wx/bookctrl.h
|
||||
@@ -833,7 +800,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/imagpcx.h
|
||||
wx/imagpng.h
|
||||
wx/imagpnm.h
|
||||
wx/imagtga.h
|
||||
wx/imagtiff.h
|
||||
wx/imagxpm.h
|
||||
wx/listbase.h
|
||||
@@ -860,7 +826,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/spinbutt.h
|
||||
wx/spinctrl.h
|
||||
wx/splitter.h
|
||||
wx/srchctrl.h
|
||||
wx/statline.h
|
||||
wx/tab.h
|
||||
wx/tabctrl.h
|
||||
@@ -889,7 +854,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="XWIN_LOWLEVEL_SRC" hints="files">
|
||||
src/generic/caret.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/unix/dialup.cpp
|
||||
src/unix/fontenum.cpp
|
||||
src/unix/fontutil.cpp
|
||||
@@ -898,7 +862,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="XWIN_LOWLEVEL_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
wx/generic/imaglist.h
|
||||
wx/unix/fontutil.h
|
||||
wx/unix/utilsx11.h
|
||||
</set>
|
||||
@@ -910,10 +873,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="GTK_LOWLEVEL_SRC" hints="files">
|
||||
$(XWIN_LOWLEVEL_SRC)
|
||||
src/generic/icon.cpp
|
||||
src/generic/paletteg.cpp
|
||||
src/gtk/app.cpp
|
||||
src/gtk/assertdlg_gtk.c
|
||||
src/gtk/bitmap.cpp
|
||||
src/gtk/brush.cpp
|
||||
src/gtk/clipbrd.cpp
|
||||
@@ -928,7 +889,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/gtk/dnd.cpp
|
||||
src/gtk/evtloop.cpp
|
||||
src/gtk/font.cpp
|
||||
src/gtk/gdiobj.cpp
|
||||
src/gtk/gsockgtk.cpp
|
||||
src/gtk/icon.cpp
|
||||
src/gtk/main.cpp
|
||||
src/gtk/minifram.cpp
|
||||
src/gtk/pen.cpp
|
||||
@@ -945,10 +908,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="GTK_LOWLEVEL_HDR" hints="files">
|
||||
$(XWIN_LOWLEVEL_HDR)
|
||||
wx/generic/icon.h
|
||||
wx/generic/paletteg.h
|
||||
wx/gtk/app.h
|
||||
wx/gtk/assertdlg_gtk.h
|
||||
wx/gtk/bitmap.h
|
||||
wx/gtk/brush.h
|
||||
wx/gtk/clipbrd.h
|
||||
@@ -963,6 +924,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/gtk/dcscreen.h
|
||||
wx/gtk/dnd.h
|
||||
wx/gtk/font.h
|
||||
wx/gtk/icon.h
|
||||
wx/gtk/minifram.h
|
||||
wx/gtk/pen.h
|
||||
wx/gtk/popupwin.h
|
||||
@@ -980,7 +942,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/dirdlgg.cpp
|
||||
src/generic/fdrepdlg.cpp
|
||||
src/generic/filedlgg.cpp
|
||||
src/generic/graphicc.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/msgdlgg.cpp
|
||||
src/generic/prntdlgg.cpp
|
||||
@@ -995,7 +957,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/gtk/checkbox.cpp
|
||||
src/gtk/checklst.cpp
|
||||
src/gtk/choice.cpp
|
||||
src/gtk/collpane.cpp
|
||||
src/gtk/colordlg.cpp
|
||||
src/gtk/combobox.cpp
|
||||
src/gtk/control.cpp
|
||||
@@ -1044,7 +1005,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/gtk/button.h
|
||||
wx/gtk/checkbox.h
|
||||
wx/gtk/checklst.h
|
||||
wx/gtk/collpane.h
|
||||
wx/gtk/colordlg.h
|
||||
wx/gtk/choice.h
|
||||
wx/gtk/combobox.h
|
||||
@@ -1091,7 +1051,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="GTK1_LOWLEVEL_SRC" hints="files">
|
||||
$(XWIN_LOWLEVEL_SRC)
|
||||
src/generic/icon.cpp
|
||||
src/generic/paletteg.cpp
|
||||
src/gtk1/app.cpp
|
||||
src/gtk1/bitmap.cpp
|
||||
@@ -1108,7 +1067,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/gtk1/dnd.cpp
|
||||
src/gtk1/evtloop.cpp
|
||||
src/gtk1/font.cpp
|
||||
src/gtk1/gdiobj.cpp
|
||||
src/gtk1/gsockgtk.cpp
|
||||
src/gtk1/icon.cpp
|
||||
src/gtk1/main.cpp
|
||||
src/gtk1/minifram.cpp
|
||||
src/gtk1/pen.cpp
|
||||
@@ -1125,7 +1086,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="GTK1_LOWLEVEL_HDR" hints="files">
|
||||
$(XWIN_LOWLEVEL_HDR)
|
||||
wx/generic/icon.h
|
||||
wx/generic/paletteg.h
|
||||
wx/gtk1/app.h
|
||||
wx/gtk1/bitmap.h
|
||||
@@ -1142,6 +1102,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/gtk1/dcscreen.h
|
||||
wx/gtk1/dnd.h
|
||||
wx/gtk1/font.h
|
||||
wx/gtk1/icon.h
|
||||
wx/gtk1/minifram.h
|
||||
wx/gtk1/pen.h
|
||||
wx/gtk1/popupwin.h
|
||||
@@ -1159,6 +1120,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/dirdlgg.cpp
|
||||
src/generic/fdrepdlg.cpp
|
||||
src/generic/filedlgg.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/msgdlgg.cpp
|
||||
src/generic/prntdlgg.cpp
|
||||
@@ -1289,6 +1251,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/motif/font.cpp
|
||||
src/motif/frame.cpp
|
||||
src/motif/gauge.cpp
|
||||
src/motif/gdiobj.cpp
|
||||
src/motif/gsockmot.cpp
|
||||
src/motif/icon.cpp
|
||||
src/motif/listbox.cpp
|
||||
@@ -1321,6 +1284,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/dirdlgg.cpp
|
||||
src/generic/fdrepdlg.cpp
|
||||
src/generic/fontdlgg.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/notebook.cpp
|
||||
src/generic/prntdlgg.cpp
|
||||
@@ -1333,6 +1297,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/dirdlgg.h
|
||||
wx/generic/fdrepdlg.h
|
||||
wx/generic/fontdlgg.h
|
||||
wx/generic/imaglist.h
|
||||
wx/generic/listctrl.h
|
||||
wx/generic/notebook.h
|
||||
wx/generic/prntdlgg.h
|
||||
@@ -1402,8 +1367,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="X11_LOWLEVEL_SRC" hints="files">
|
||||
$(XWIN_LOWLEVEL_SRC)
|
||||
src/common/socketevtdispatch.cpp
|
||||
src/generic/icon.cpp
|
||||
src/generic/timer.cpp
|
||||
src/x11/app.cpp
|
||||
src/x11/bitmap.cpp
|
||||
@@ -1419,6 +1382,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/x11/dcscreen.cpp
|
||||
src/x11/evtloop.cpp
|
||||
src/x11/font.cpp
|
||||
src/x11/gdiobj.cpp
|
||||
src/x11/gsockx11.cpp
|
||||
src/x11/icon.cpp
|
||||
src/x11/minifram.cpp
|
||||
src/x11/nanox.c
|
||||
src/x11/palette.cpp
|
||||
@@ -1434,11 +1400,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="X11_LOWLEVEL_HDR" hints="files">
|
||||
$(XWIN_LOWLEVEL_HDR)
|
||||
wx/generic/icon.h
|
||||
wx/x11/app.h
|
||||
wx/x11/bitmap.h
|
||||
wx/x11/brush.h
|
||||
wx/x11/chkconf.h
|
||||
wx/x11/clipbrd.h
|
||||
wx/x11/colour.h
|
||||
wx/x11/cursor.h
|
||||
@@ -1452,6 +1416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/x11/dcscreen.h
|
||||
wx/x11/dnd.h
|
||||
wx/x11/font.h
|
||||
wx/x11/icon.h
|
||||
wx/x11/minifram.h
|
||||
wx/x11/palette.h
|
||||
wx/x11/pen.h
|
||||
@@ -1496,10 +1461,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/msw/fontutil.cpp
|
||||
src/msw/gdiimage.cpp
|
||||
src/msw/gdiobj.cpp
|
||||
src/msw/graphics.cpp
|
||||
src/msw/gsockmsw.cpp
|
||||
src/msw/icon.cpp
|
||||
src/msw/imaglist.cpp
|
||||
src/msw/minifram.cpp
|
||||
src/msw/ole/dataobj.cpp
|
||||
src/msw/ole/dropsrc.cpp
|
||||
@@ -1557,6 +1520,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/msw/filedlg.cpp
|
||||
src/msw/frame.cpp
|
||||
src/msw/gauge95.cpp
|
||||
src/msw/imaglist.cpp
|
||||
src/msw/iniconf.cpp
|
||||
src/msw/listbox.cpp
|
||||
src/msw/listctrl.cpp
|
||||
@@ -1756,17 +1720,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="MGL_LOWLEVEL_SRC" hints="files">
|
||||
src/common/fontmgrcmn.cpp
|
||||
src/generic/caret.cpp
|
||||
src/generic/colour.cpp
|
||||
src/generic/icon.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/mask.cpp
|
||||
src/generic/timer.cpp
|
||||
src/mgl/app.cpp
|
||||
src/mgl/bitmap.cpp
|
||||
src/mgl/brush.cpp
|
||||
src/mgl/clipbrd.cpp
|
||||
src/mgl/colour.cpp
|
||||
src/mgl/cursor.cpp
|
||||
src/mgl/data.cpp
|
||||
src/mgl/dc.cpp
|
||||
@@ -1777,8 +1737,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mgl/evtloop.cpp
|
||||
src/mgl/font.cpp
|
||||
src/mgl/fontenum.cpp
|
||||
src/mgl/fontmgr.cpp
|
||||
src/mgl/fontutil.cpp
|
||||
src/mgl/gdiobj.cpp
|
||||
src/mgl/icon.cpp
|
||||
src/mgl/palette.cpp
|
||||
src/mgl/pen.cpp
|
||||
src/mgl/region.cpp
|
||||
@@ -1789,22 +1750,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="MGL_LOWLEVEL_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
wx/generic/colour.h
|
||||
wx/generic/icon.h
|
||||
wx/generic/imaglist.h
|
||||
wx/generic/mask.h
|
||||
wx/generic/timer.h
|
||||
wx/mgl/app.h
|
||||
wx/mgl/bitmap.h
|
||||
wx/mgl/brush.h
|
||||
wx/mgl/chkconf.h
|
||||
wx/mgl/clipbrd.h
|
||||
wx/mgl/colour.h
|
||||
wx/mgl/cursor.h
|
||||
wx/mgl/dc.h
|
||||
wx/mgl/dcclient.h
|
||||
wx/mgl/dcmemory.h
|
||||
wx/mgl/dcscreen.h
|
||||
wx/mgl/font.h
|
||||
wx/mgl/fontutil.h
|
||||
wx/mgl/icon.h
|
||||
wx/mgl/palette.h
|
||||
wx/mgl/pen.h
|
||||
wx/mgl/popupwin.h
|
||||
@@ -1815,75 +1775,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxDFB -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="DFB_LOWLEVEL_SRC" hints="files">
|
||||
src/common/fontmgrcmn.cpp
|
||||
src/common/socketevtdispatch.cpp
|
||||
src/generic/caret.cpp
|
||||
src/generic/colour.cpp
|
||||
src/generic/icon.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/mask.cpp
|
||||
src/generic/timer.cpp
|
||||
src/dfb/app.cpp
|
||||
src/dfb/bitmap.cpp
|
||||
src/dfb/brush.cpp
|
||||
src/dfb/cursor.cpp
|
||||
<!-- src/dfb/data.cpp -->
|
||||
src/dfb/dc.cpp
|
||||
src/dfb/dcclient.cpp
|
||||
src/dfb/dcmemory.cpp
|
||||
src/dfb/dcscreen.cpp
|
||||
src/dfb/evtloop.cpp
|
||||
src/dfb/font.cpp
|
||||
src/dfb/fontenum.cpp
|
||||
src/dfb/fontmgr.cpp
|
||||
src/dfb/overlay.cpp
|
||||
src/dfb/pen.cpp
|
||||
src/dfb/region.cpp
|
||||
src/dfb/settings.cpp
|
||||
src/dfb/toplevel.cpp
|
||||
src/dfb/utils.cpp
|
||||
src/dfb/window.cpp
|
||||
src/dfb/wrapdfb.cpp
|
||||
</set>
|
||||
<set var="DFB_LOWLEVEL_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
wx/generic/colour.h
|
||||
wx/generic/icon.h
|
||||
wx/generic/imaglist.h
|
||||
wx/generic/mask.h
|
||||
wx/generic/timer.h
|
||||
wx/dfb/app.h
|
||||
wx/dfb/bitmap.h
|
||||
wx/dfb/brush.h
|
||||
wx/dfb/chkconf.h
|
||||
wx/dfb/cursor.h
|
||||
wx/dfb/dc.h
|
||||
wx/dfb/dcclient.h
|
||||
wx/dfb/dcmemory.h
|
||||
wx/dfb/dcscreen.h
|
||||
wx/dfb/dfbptr.h
|
||||
wx/dfb/evtloop.h
|
||||
wx/dfb/font.h
|
||||
wx/dfb/pen.h
|
||||
wx/dfb/private.h
|
||||
wx/dfb/region.h
|
||||
wx/dfb/toplevel.h
|
||||
wx/dfb/window.h
|
||||
wx/dfb/wrapdfb.h
|
||||
</set>
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxOS/2 -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="OS2_LOWLEVEL_SRC" hints="files">
|
||||
<!-- wxUniv builds not supported under OS/2 -->
|
||||
</set>
|
||||
<set var="OS2_LOWLEVEL_HDR" hints="files">
|
||||
</set>
|
||||
@@ -1931,6 +1827,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/os2/frame.cpp
|
||||
src/os2/gauge.cpp
|
||||
src/os2/gdiimage.cpp
|
||||
src/os2/gdiobj.cpp
|
||||
src/os2/gsockpm.cpp
|
||||
src/os2/helpwin.cpp
|
||||
src/os2/icon.cpp
|
||||
@@ -2054,14 +1951,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
|
||||
<!-- Shared wxMac and wxCocoa files -->
|
||||
src/mac/common/glgrab.c
|
||||
src/mac/corefoundation/gsockosx.cpp
|
||||
src/mac/corefoundation/hid.cpp
|
||||
src/mac/corefoundation/utilsexc_cf.cpp
|
||||
</set>
|
||||
|
||||
<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
|
||||
wx/mac/common/glgrab.h
|
||||
</set>
|
||||
|
||||
<set var="MAC_LOWLEVEL_SRC" hints="files">
|
||||
@@ -2073,13 +1968,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="MAC_OSX_SRC" hints="files">
|
||||
<if cond="PLATFORM_MACOSX=='1'">
|
||||
<!-- Unix files used by wxMac: -->
|
||||
src/unix/snglinst.cpp
|
||||
<!-- wxWebKit files -->
|
||||
src/html/htmlctrl/webkit/webkit.mm
|
||||
<!-- Native color/font dialogs -->
|
||||
src/mac/carbon/fontdlgosx.mm
|
||||
src/mac/carbon/colordlgosx.mm
|
||||
<!-- cocoa bridge -->
|
||||
src/mac/carbon/utilscocoa.mm
|
||||
</if>
|
||||
</set>
|
||||
|
||||
@@ -2121,11 +2016,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/carbon/frame.cpp
|
||||
src/mac/carbon/gauge.cpp
|
||||
src/mac/carbon/gdiobj.cpp
|
||||
src/mac/carbon/graphics.cpp
|
||||
src/mac/carbon/icon.cpp
|
||||
src/mac/carbon/imaglist.cpp
|
||||
src/mac/carbon/listbox.cpp
|
||||
src/mac/carbon/listctrl_mac.cpp
|
||||
src/mac/carbon/mdi.cpp
|
||||
src/mac/carbon/menu.cpp
|
||||
src/mac/carbon/menuitem.cpp
|
||||
@@ -2133,7 +2026,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/carbon/minifram.cpp
|
||||
src/mac/carbon/msgdlg.cpp
|
||||
src/mac/carbon/notebmac.cpp
|
||||
src/mac/carbon/overlay.cpp
|
||||
src/mac/carbon/palette.cpp
|
||||
src/mac/carbon/pen.cpp
|
||||
src/mac/carbon/printdlg.cpp
|
||||
@@ -2147,7 +2039,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/carbon/slider.cpp
|
||||
src/mac/carbon/spinbutt.cpp
|
||||
src/mac/carbon/spinctrl.cpp
|
||||
src/mac/carbon/srchctrl.cpp
|
||||
src/mac/carbon/statbmp.cpp
|
||||
src/mac/carbon/statbox.cpp
|
||||
src/mac/carbon/statbrma.cpp
|
||||
@@ -2240,7 +2131,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/sound.h
|
||||
wx/mac/spinbutt.h
|
||||
wx/mac/spinctrl.h
|
||||
wx/mac/srchctrl.h
|
||||
wx/mac/statbmp.h
|
||||
wx/mac/statbox.h
|
||||
wx/mac/statline.h
|
||||
@@ -2317,9 +2207,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/carbon/printdlg.h
|
||||
wx/mac/carbon/printmac.h
|
||||
wx/mac/carbon/private.h
|
||||
wx/mac/carbon/private/mactext.h
|
||||
wx/mac/carbon/private/overlay.h
|
||||
wx/mac/carbon/private/print.h
|
||||
wx/mac/carbon/radiobox.h
|
||||
wx/mac/carbon/radiobut.h
|
||||
wx/mac/carbon/region.h
|
||||
@@ -2327,7 +2214,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/carbon/slider.h
|
||||
wx/mac/carbon/spinbutt.h
|
||||
wx/mac/carbon/spinctrl.h
|
||||
wx/mac/carbon/srchctrl.h
|
||||
wx/mac/carbon/statbmp.h
|
||||
wx/mac/carbon/statbox.h
|
||||
wx/mac/carbon/statline.h
|
||||
@@ -2374,7 +2260,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/cocoa/NSMenu.mm
|
||||
src/cocoa/NSPanel.mm
|
||||
src/cocoa/NSScroller.mm
|
||||
src/cocoa/NSSlider.mm
|
||||
src/cocoa/NSTabView.mm
|
||||
src/cocoa/NSTableView.mm
|
||||
src/cocoa/NSTextField.mm
|
||||
@@ -2407,12 +2292,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/cocoa/drawer.mm
|
||||
src/cocoa/evtloop.mm
|
||||
src/cocoa/filedlg.mm
|
||||
src/cocoa/font.mm
|
||||
src/cocoa/font.cpp
|
||||
src/cocoa/fontdlg.mm
|
||||
src/cocoa/fontenum.mm
|
||||
src/cocoa/fontutil.cpp
|
||||
src/cocoa/frame.mm
|
||||
src/cocoa/gauge.mm
|
||||
src/cocoa/gdiobj.cpp
|
||||
src/cocoa/icon.mm
|
||||
src/cocoa/listbox.mm
|
||||
src/cocoa/main.cpp
|
||||
@@ -2440,7 +2326,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/cocoa/toolbar.mm
|
||||
src/cocoa/tooltip.mm
|
||||
src/cocoa/toplevel.mm
|
||||
src/cocoa/utils.mm
|
||||
src/cocoa/utils.cpp
|
||||
src/cocoa/utilsexc.mm
|
||||
src/cocoa/window.mm
|
||||
<!-- Generic implementations used by wxCocoa: -->
|
||||
@@ -2465,7 +2351,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/cocoa/NSMenu.h
|
||||
wx/cocoa/NSPanel.h
|
||||
wx/cocoa/NSScroller.h
|
||||
wx/cocoa/NSSlider.h
|
||||
wx/cocoa/NSTabView.h
|
||||
wx/cocoa/NSTableView.h
|
||||
wx/cocoa/NSTextField.h
|
||||
@@ -2527,11 +2412,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/cocoa/textctrl.h
|
||||
wx/cocoa/timer.h
|
||||
wx/cocoa/toolbar.h
|
||||
wx/cocoa/tooltip.h
|
||||
wx/cocoa/toplevel.h
|
||||
wx/cocoa/window.h
|
||||
<!-- Semi-private headers -->
|
||||
wx/cocoa/objc/objc_uniquifying.h
|
||||
<!-- Generic implementations used by wxCocoa: -->
|
||||
wx/generic/caret.h
|
||||
wx/generic/fdrepdlg.h
|
||||
@@ -2554,7 +2436,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="UNIV_THEMES_SRC" hints="files">
|
||||
src/univ/themes/gtk.cpp
|
||||
src/univ/themes/metal.cpp
|
||||
src/univ/themes/mono.cpp
|
||||
src/univ/themes/win32.cpp
|
||||
</set>
|
||||
|
||||
@@ -2565,6 +2446,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/fdrepdlg.cpp
|
||||
src/generic/filedlgg.cpp
|
||||
src/generic/fontdlgg.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/mdig.cpp
|
||||
src/generic/msgdlgg.cpp
|
||||
@@ -2599,7 +2481,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/univ/statline.cpp
|
||||
src/univ/stattext.cpp
|
||||
src/univ/statusbr.cpp
|
||||
src/univ/stdrend.cpp
|
||||
src/univ/textctrl.cpp
|
||||
src/univ/tglbtn.cpp
|
||||
src/univ/theme.cpp
|
||||
@@ -2621,7 +2502,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/univ/button.h
|
||||
wx/univ/checkbox.h
|
||||
wx/univ/checklst.h
|
||||
wx/univ/chkconf.h
|
||||
wx/univ/choice.h
|
||||
wx/univ/colschem.h
|
||||
wx/univ/combobox.h
|
||||
@@ -2649,25 +2529,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/univ/statline.h
|
||||
wx/univ/stattext.h
|
||||
wx/univ/statusbr.h
|
||||
wx/univ/stdrend.h
|
||||
wx/univ/textctrl.h
|
||||
wx/univ/theme.h
|
||||
wx/univ/tglbtn.h
|
||||
wx/univ/toolbar.h
|
||||
wx/univ/toplevel.h
|
||||
wx/univ/window.h
|
||||
</set>
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxAdvanced -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="ADVANCED_CMN_SRC" hints="files">
|
||||
src/common/animatecmn.cpp
|
||||
src/common/datavcmn.cpp
|
||||
src/generic/aboutdlgg.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/generic/bmpcboxg.cpp
|
||||
src/generic/calctrl.cpp
|
||||
src/generic/datavgen.cpp
|
||||
src/generic/datectlg.cpp
|
||||
@@ -2686,18 +2561,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_CMN_HDR" hints="files">
|
||||
wx/animate.h
|
||||
wx/animdecod.h
|
||||
wx/bmpcbox.h
|
||||
wx/calctrl.h
|
||||
wx/dataview.h
|
||||
wx/datectrl.h
|
||||
wx/dateevt.h
|
||||
wx/dcbuffer.h
|
||||
wx/aboutdlg.h
|
||||
wx/generic/aboutdlgg.h
|
||||
wx/generic/animate.h
|
||||
wx/generic/bmpcbox.h
|
||||
wx/generic/calctrl.h
|
||||
wx/generic/datectrl.h
|
||||
wx/generic/dataview.h
|
||||
@@ -2725,9 +2592,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/wizard.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
|
||||
wx/datectrl.h
|
||||
wx/dataview.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_MSW_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/msw/aboutdlg.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/taskbar.cpp
|
||||
</set>
|
||||
@@ -2754,7 +2625,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="ADVANCED_MAC_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/mac/carbon/aboutdlg.cpp
|
||||
src/mac/carbon/drawer.cpp
|
||||
src/mac/carbon/sound.cpp
|
||||
src/mac/carbon/taskbar.cpp
|
||||
@@ -2799,21 +2669,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_GTK_SRC" hints="files">
|
||||
src/gtk/aboutdlg.cpp
|
||||
src/gtk/animate.cpp
|
||||
src/gtk/dataview.cpp
|
||||
src/gtk/taskbar.cpp
|
||||
src/gtk/dataview.cpp
|
||||
src/gtk/eggtrayicon.c
|
||||
</set>
|
||||
<set var="ADVANCED_GTK_HDR" hints="files">
|
||||
wx/gtk/animate.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_GTK1_SRC" hints="files">
|
||||
src/gtk1/eggtrayicon.c
|
||||
src/gtk1/taskbar.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_GTK1_HDR" hints="files">
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@@ -2831,7 +2691,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="MEDIA_MSW_SRC" hints="files">
|
||||
src/msw/mediactrl_am.cpp
|
||||
src/msw/mediactrl_wmp10.cpp
|
||||
src/msw/mediactrl_qt.cpp
|
||||
src/msw/ole/activex.cpp
|
||||
</set>
|
||||
<set var="MEDIA_MSW_HDR" hints="files">
|
||||
@@ -2914,9 +2773,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<!-- wxHTML users: -->
|
||||
src/generic/htmllbox.cpp
|
||||
</set>
|
||||
<set var="MSW_HTML_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">wx/msw/helpbest.h</if>
|
||||
</set>
|
||||
<set var="HTML_HDR" hints="files">
|
||||
wx/html/helpctrl.h
|
||||
wx/html/helpdata.h
|
||||
@@ -2936,7 +2792,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/wxhtml.h
|
||||
<!-- wxHTML users: -->
|
||||
wx/htmllbox.h
|
||||
$(MSW_HTML_HDR)
|
||||
wx/msw/helpbest.h
|
||||
</set>
|
||||
|
||||
|
||||
@@ -2946,10 +2802,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="XRC_SRC" hints="files">
|
||||
src/xrc/xh_animatctrl.cpp
|
||||
src/xrc/xh_bmp.cpp
|
||||
src/xrc/xh_bmpcbox.cpp
|
||||
src/xrc/xh_bmpbt.cpp
|
||||
src/xrc/xh_bmp.cpp
|
||||
src/xrc/xh_bttn.cpp
|
||||
src/xrc/xh_cald.cpp
|
||||
src/xrc/xh_chckb.cpp
|
||||
@@ -2957,7 +2811,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/xrc/xh_choic.cpp
|
||||
src/xrc/xh_choicbk.cpp
|
||||
src/xrc/xh_clrpicker.cpp
|
||||
src/xrc/xh_collpane.cpp
|
||||
src/xrc/xh_combo.cpp
|
||||
src/xrc/xh_datectrl.cpp
|
||||
src/xrc/xh_dirpicker.cpp
|
||||
@@ -2978,14 +2831,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/xrc/xh_notbk.cpp
|
||||
src/xrc/xh_odcombo.cpp
|
||||
src/xrc/xh_panel.cpp
|
||||
src/xrc/xh_propdlg.cpp
|
||||
src/xrc/xh_radbt.cpp
|
||||
src/xrc/xh_radbx.cpp
|
||||
<!-- disabled until linking problems are fixed -->
|
||||
<!-- src/xrc/xh_richtext.cpp -->
|
||||
src/xrc/xh_scrol.cpp
|
||||
src/xrc/xh_scwin.cpp
|
||||
src/xrc/xh_htmllbox.cpp
|
||||
src/xrc/xh_sizer.cpp
|
||||
src/xrc/xh_slidr.cpp
|
||||
src/xrc/xh_spin.cpp
|
||||
@@ -3007,10 +2856,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</set>
|
||||
<set var="XRC_HDR" hints="files">
|
||||
wx/xrc/xh_all.h
|
||||
wx/xrc/xh_animatctrl.h
|
||||
wx/xrc/xh_bmpbt.h
|
||||
wx/xrc/xh_bmp.h
|
||||
wx/xrc/xh_bmpcbox.h
|
||||
wx/xrc/xh_bttn.h
|
||||
wx/xrc/xh_cald.h
|
||||
wx/xrc/xh_chckb.h
|
||||
@@ -3018,7 +2865,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/xrc/xh_choic.h
|
||||
wx/xrc/xh_choicbk.h
|
||||
wx/xrc/xh_clrpicker.h
|
||||
wx/xrc/xh_collpane.h
|
||||
wx/xrc/xh_combo.h
|
||||
wx/xrc/xh_datectrl.h
|
||||
wx/xrc/xh_dirpicker.h
|
||||
@@ -3039,13 +2885,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/xrc/xh_notbk.h
|
||||
wx/xrc/xh_odcombo.h
|
||||
wx/xrc/xh_panel.h
|
||||
wx/xrc/xh_propdlg.h
|
||||
wx/xrc/xh_radbt.h
|
||||
wx/xrc/xh_radbx.h
|
||||
<!-- wx/xrc/xh_richtext.h -->
|
||||
wx/xrc/xh_scrol.h
|
||||
wx/xrc/xh_scwin.h
|
||||
wx/xrc/xh_htmllbox.h
|
||||
wx/xrc/xh_sizer.h
|
||||
wx/xrc/xh_slidr.h
|
||||
wx/xrc/xh_spin.h
|
||||
@@ -3152,7 +2995,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/aui/floatpane.cpp
|
||||
src/aui/auibook.cpp
|
||||
src/aui/tabmdi.cpp
|
||||
src/aui/auibar.cpp
|
||||
</set>
|
||||
<set var="AUI_HDR" hints="files">
|
||||
wx/aui/framemanager.h
|
||||
@@ -3160,7 +3002,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/aui/floatpane.h
|
||||
wx/aui/auibook.h
|
||||
wx/aui/tabmdi.h
|
||||
wx/aui/auibar.h
|
||||
wx/aui/aui.h
|
||||
</set>
|
||||
|
||||
@@ -3174,21 +3015,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/richtext/richtextstyles.cpp
|
||||
src/richtext/richtextxml.cpp
|
||||
src/richtext/richtexthtml.cpp
|
||||
src/richtext/richtextformatdlg.cpp
|
||||
src/richtext/richtextsymboldlg.cpp
|
||||
src/richtext/richtextstyledlg.cpp
|
||||
src/richtext/richtextprint.cpp
|
||||
</set>
|
||||
<set var="RICHTEXT_HDR" hints="files">
|
||||
wx/richtext/richtextctrl.h
|
||||
wx/richtext/richtextbuffer.h
|
||||
wx/richtext/richtexthtml.h
|
||||
wx/richtext/richtextstyles.h
|
||||
wx/richtext/richtextxml.h
|
||||
wx/richtext/richtextformatdlg.h
|
||||
wx/richtext/richtextsymboldlg.h
|
||||
wx/richtext/richtextstyledlg.h
|
||||
wx/richtext/richtextprint.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@@ -3299,7 +3131,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
|
||||
</set>
|
||||
<set var="LOWLEVEL_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
|
||||
@@ -3312,7 +3143,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
|
||||
</set>
|
||||
|
||||
<set var="GUI_SRC" hints="files">
|
||||
@@ -3355,7 +3185,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
|
||||
<if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="ADVANCED_PLATFORM_HDR" hints="files">
|
||||
@@ -3364,10 +3193,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
|
||||
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
|
||||
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
|
||||
</set>
|
||||
|
||||
@@ -3386,7 +3213,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
|
||||
</set>
|
||||
<set var="ADVANCED_HDR" hints="files">
|
||||
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
|
||||
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
|
||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
|
||||
</set>
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" ?>
|
||||
|
||||
<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
|
||||
<bakefile-manifest>
|
||||
|
||||
<format id="wx24dsp">
|
||||
<description>
|
||||
|
@@ -4,8 +4,6 @@
|
||||
<makefile>
|
||||
|
||||
<include file="presets/fake.bkl"/>
|
||||
|
||||
<set var="EOL_STYLE">unix</set>
|
||||
<set var="COMPILER">gcc</set>
|
||||
|
||||
<!-- fake.bkl defaults to win32 platform -->
|
||||
|
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/common/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/common/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
|
@@ -31,9 +31,8 @@
|
||||
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
|
||||
</set>
|
||||
|
||||
<add-target target="$(BUNDLE_TGT)" type="action"
|
||||
cond="target and PLATFORM_MACOSX=='1'"/>
|
||||
|
||||
<add-target target="$(BUNDLE_TGT)" type="action"/>
|
||||
<modify-target target="$(BUNDLE_TGT)">
|
||||
<!-- required data: -->
|
||||
<depends>$(id)</depends>
|
||||
@@ -65,7 +64,7 @@
|
||||
|
||||
<!-- add pseudo target id_bundle: -->
|
||||
<add-target target="$(id)_bundle" type="phony"
|
||||
cond="target and PLATFORM_MACOSX=='1'"/>
|
||||
cond="PLATFORM_MACOSX=='1'"/>
|
||||
<modify-target target="$(id)_bundle">
|
||||
<dependency-of>all</dependency-of>
|
||||
<depends>$(BUNDLE_TGT_REF)</depends>
|
||||
|
@@ -62,7 +62,6 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
|
||||
|
||||
DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
|
||||
DISTDIR=./_dist_dir/$(DISTDIRNAME)
|
||||
BASEDISTDIR=./_dist_dir/wxBase-$(WX_VERSION)
|
||||
|
||||
########################## Tools ###############################
|
||||
|
||||
@@ -131,9 +130,7 @@ ALL_DIST: distrib_clean
|
||||
# copy some files from include/ that are not installed:
|
||||
mkdir $(DISTDIR)/include
|
||||
mkdir $(DISTDIR)/include/wx
|
||||
mkdir $(DISTDIR)/include/wx/private
|
||||
$(CP_P) $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
|
||||
$(CP_P) $(INCDIR)/wx/private/*.h $(DISTDIR)/include/wx/private
|
||||
# copy wxpresets
|
||||
mkdir $(DISTDIR)/build
|
||||
mkdir $(DISTDIR)/build/bakefiles
|
||||
@@ -158,10 +155,6 @@ ALL_GUI_DIST: ALL_DIST
|
||||
if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
|
||||
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
|
||||
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
|
||||
if test -d $(INCDIR)/wx/$(TOOLKITDIR)/private; then \
|
||||
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)/private && \
|
||||
$(CP_P) $(INCDIR)/wx/$(TOOLKITDIR)/private/*.h $(DISTDIR)/include/wx/$(TOOLKITDIR)/private; \
|
||||
fi
|
||||
mkdir $(DISTDIR)/include/wx/generic
|
||||
mkdir $(DISTDIR)/include/wx/html
|
||||
mkdir $(DISTDIR)/include/wx/richtext
|
||||
@@ -218,7 +211,7 @@ ALL_GUI_DIST: ALL_DIST
|
||||
$(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
|
||||
$(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff
|
||||
|
||||
BASE_DIST: ALL_DIST INTL_DIST
|
||||
BASE_DIST: ALL_DIST
|
||||
# make --disable-gui the default
|
||||
rm $(DISTDIR)/configure.in
|
||||
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
|
||||
@@ -288,8 +281,6 @@ BASE_DIST: ALL_DIST INTL_DIST
|
||||
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
|
||||
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
|
||||
|
||||
mv $(DISTDIR) $(BASEDISTDIR)
|
||||
|
||||
GTK_DIST: UNIV_DIST
|
||||
$(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
|
||||
$(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
|
||||
@@ -324,8 +315,6 @@ GTK_DIST: UNIV_DIST
|
||||
X11_DIST: UNIV_DIST
|
||||
$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
|
||||
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
|
||||
mkdir $(DISTDIR)/include/wx/gtk/private
|
||||
$(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
|
||||
$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
|
||||
$(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
|
||||
$(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
|
||||
@@ -403,6 +392,7 @@ COCOA_DIST: ALL_GUI_DIST
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MSW_DIST: UNIV_DIST
|
||||
$(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
|
||||
mkdir $(DISTDIR)/include/wx/msw/ole
|
||||
mkdir $(DISTDIR)/include/wx/msw/wince
|
||||
$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
|
||||
@@ -422,6 +412,7 @@ MSW_DIST: UNIV_DIST
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
mkdir $(DISTDIR)/include/wx/msw/ole
|
||||
mkdir $(DISTDIR)/include/wx/msw/wince
|
||||
@@ -531,7 +522,7 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
|
||||
mkdir -p $$t; \
|
||||
$(CP_P) $$s/Makefile.in \
|
||||
`find $$s -maxdepth 1 -name 'makefile.*' -o -name descrip.mms -o \
|
||||
`find $$s -name 'makefile.*' -o -name descrip.mms -o \
|
||||
-name '*.cpp' -o -name '*.h' -o \
|
||||
-name '*.bmp' -o -name '*.ico' -o -name '*.png' -o \
|
||||
-name '*.rc' -o -name '*.xpm'` $$t; \
|
||||
@@ -545,9 +536,6 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
done
|
||||
|
||||
# copy the rest, not covered by the above loop
|
||||
$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani
|
||||
$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
|
||||
|
||||
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
|
||||
|
||||
$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
|
||||
@@ -621,6 +609,21 @@ UTILS_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
|
||||
-$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
|
||||
|
||||
mkdir $(DISTDIR)/utils/configtool
|
||||
mkdir $(DISTDIR)/utils/configtool/configs
|
||||
mkdir $(DISTDIR)/utils/configtool/docs
|
||||
mkdir $(DISTDIR)/utils/configtool/src
|
||||
mkdir $(DISTDIR)/utils/configtool/src/bitmaps
|
||||
mkdir $(DISTDIR)/utils/configtool/scripts
|
||||
$(CP_P) $(UTILSDIR)/configtool/*.in $(DISTDIR)/utils/configtool
|
||||
$(CP_P) $(UTILSDIR)/configtool/configs/*.wxs $(DISTDIR)/utils/configtool/configs
|
||||
$(CP_P) $(UTILSDIR)/configtool/docs/*.txt $(DISTDIR)/utils/configtool/docs
|
||||
$(CP_P) $(UTILSDIR)/configtool/src/*.h $(DISTDIR)/utils/configtool/src
|
||||
$(CP_P) $(UTILSDIR)/configtool/src/*.in $(DISTDIR)/utils/configtool/src
|
||||
$(CP_P) $(UTILSDIR)/configtool/src/*.cpp $(DISTDIR)/utils/configtool/src
|
||||
$(CP_P) $(UTILSDIR)/configtool/src/bitmaps/*.xpm $(DISTDIR)/utils/configtool/src/bitmaps
|
||||
$(CP_P) $(UTILSDIR)/configtool/scripts/????* $(DISTDIR)/utils/configtool/scripts
|
||||
|
||||
mkdir $(DISTDIR)/utils/emulator
|
||||
mkdir $(DISTDIR)/utils/emulator/src
|
||||
mkdir $(DISTDIR)/utils/emulator/docs
|
||||
@@ -809,7 +812,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
|
||||
-o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
|
||||
-o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
|
||||
-o -name "*.pro" \
|
||||
-o -name "*.vpj" \
|
||||
-o -name "*.vpj" -o -name "*.sc" \
|
||||
-o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
|
||||
\) -print0 | xargs -0 rm -rf
|
||||
|
||||
|
@@ -19,7 +19,6 @@
|
||||
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
|
||||
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
|
||||
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
|
||||
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
|
||||
|
@@ -81,6 +81,8 @@
|
||||
<define>WXMAKINGDLL_ADV</define>
|
||||
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
|
||||
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
|
||||
<library>htmldll</library>
|
||||
<library>xmldll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
|
||||
@@ -107,7 +109,6 @@
|
||||
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
||||
</dll>
|
||||
|
||||
<lib id="medialib" template="wx_lib"
|
||||
|
248
build/bakefiles/regenMakefile.py
Executable file
248
build/bakefiles/regenMakefile.py
Executable file
@@ -0,0 +1,248 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
#
|
||||
# Generates Makefile that is used to regenerate native makefiles from
|
||||
# bakefiles.
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
import string, os.path, copy
|
||||
|
||||
# list of files that should _not_ be generated even thought we could do it:
|
||||
DONT_GENERATE = [
|
||||
'../../samples/Makefile.in',
|
||||
'../../samples/samples.dsw',
|
||||
'../../demos/demos.dsw',
|
||||
'../../samples/html/html_samples.dsw',
|
||||
'../../samples/opengl/opengl_samples.dsw',
|
||||
'../../samples/mobile/mobile_samples.dsw',
|
||||
'../../utils/utils.dsw',
|
||||
]
|
||||
|
||||
file = open('Makefile', 'wt')
|
||||
file.write("""
|
||||
# Generated by regenMakefile.py
|
||||
|
||||
BAKEFILE = bakefile -v
|
||||
|
||||
|
||||
CDEPS = config.bkl common.bkl common_contrib.bkl
|
||||
SDEPS = config.bkl common.bkl common_samples.bkl
|
||||
MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
|
||||
|
||||
DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
|
||||
-DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
|
||||
-DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
|
||||
|
||||
COMPAT_TARGETS = ../../src/wxWindows.dsp
|
||||
|
||||
""")
|
||||
|
||||
lines = {}
|
||||
all = {}
|
||||
all['autoconf'] = []
|
||||
|
||||
linesCur = None
|
||||
|
||||
def addMakefile(bake, makedirs, deps=[], args={}):
|
||||
"""Adds rules to regenerate native makefile in directory 'makedir' from
|
||||
bakefiles 'bake'. 'deps' contains additional dependencies (bakefiles
|
||||
other than 'bake'."""
|
||||
print 'adding %s...' % bake
|
||||
global linesCur
|
||||
linesCur = ['\n']
|
||||
|
||||
def add(bake, makedirs, make, dep, format, args={}):
|
||||
global linesCur
|
||||
a = ''
|
||||
if 'all' in args: a += ' %s' % args['all']
|
||||
if format in args: a += ' %s' % args[format]
|
||||
if format != 'autoconf' and 'not_autoconf' in args:
|
||||
a += ' %s' % args['not_autoconf']
|
||||
if format in makedirs:
|
||||
makedir = makedirs[format]
|
||||
else:
|
||||
makedir = makedirs['all']
|
||||
tfile = '%s/%s' % (makedir, make)
|
||||
|
||||
if tfile in DONT_GENERATE: return
|
||||
|
||||
linesCur.append('%s: %s' % (tfile, dep))
|
||||
linesCur.append('\t$(BAKEFILE) -f%s -o$@ %s %s' % (format, a, bake))
|
||||
linesCur.append('\ttouch $@')
|
||||
if format not in all: all[format] = []
|
||||
all[format].append(tfile)
|
||||
|
||||
dep = string.join(deps + [bake], ' ')
|
||||
|
||||
add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)
|
||||
add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)
|
||||
add(bake, makedirs, 'makefile.vc', dep, 'msvc', args)
|
||||
add(bake, makedirs, 'makefile.gcc', dep, 'mingw', args)
|
||||
add(bake, makedirs, 'makefile.wat', dep, 'watcom', args)
|
||||
add(bake, makedirs,
|
||||
(bake[1+bake.rfind('/'):]).replace('.bkl','.dsw'),
|
||||
dep, 'msvc6prj', args)
|
||||
|
||||
lines[bake] = linesCur
|
||||
|
||||
|
||||
|
||||
# -----------------------------------------------
|
||||
# Add the makefiles:
|
||||
# -----------------------------------------------
|
||||
|
||||
# main makefile:
|
||||
addMakefile('wx.bkl', {'all':'../msw','autoconf':'../..'}, [ '$(MDEPS)' ],
|
||||
args={
|
||||
'borland':'-DOPTIONS_FILE=config.bcc',
|
||||
'msvc':'-DOPTIONS_FILE=config.vc',
|
||||
'mingw':'-DOPTIONS_FILE=config.gcc',
|
||||
'watcom':'-DOPTIONS_FILE=config.wat',
|
||||
'msvc6prj':'$(DSWFLAGS)',
|
||||
})
|
||||
|
||||
# samples main makefile:
|
||||
addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
|
||||
args={
|
||||
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
|
||||
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
|
||||
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
|
||||
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
|
||||
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
|
||||
})
|
||||
addMakefile('../../demos/demos.bkl', {'all':'../../demos'},
|
||||
args={
|
||||
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
|
||||
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
|
||||
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
|
||||
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
|
||||
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
|
||||
})
|
||||
addMakefile('../../utils/utils.bkl', {'all':'../../utils'},
|
||||
args={
|
||||
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
|
||||
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
|
||||
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
|
||||
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
|
||||
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
|
||||
})
|
||||
|
||||
|
||||
CONTRIB_DIR = 1
|
||||
SAMPLES_DIR = 2
|
||||
|
||||
def onSubmakefile(type, dirname, names):
|
||||
bakes = [x for x in names if x.endswith('.bkl')]
|
||||
if len(bakes) == 0: return
|
||||
bakes.sort()
|
||||
dirname = dirname.replace(os.sep, '/')
|
||||
depth = dirname.count('/') - 2
|
||||
if depth <= 0: return
|
||||
|
||||
if type==SAMPLES_DIR:
|
||||
prefix = ''.join(['../' for i in range(0,depth)])
|
||||
topdirflags = '-DWXTOPDIR=%s../' % prefix
|
||||
srcdirflags = ''
|
||||
cfgbase = '%s../build/msw/config.' % prefix
|
||||
elif type==CONTRIB_DIR:
|
||||
srcdirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
|
||||
topdirflags = ' -DWXTOPDIR=../../../'
|
||||
cfgbase = '../../../build/msw/config.'
|
||||
|
||||
args = {
|
||||
'all':topdirflags,
|
||||
'not_autoconf':srcdirflags,
|
||||
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
|
||||
'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
|
||||
'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',
|
||||
'borland':'-DOPTIONS_FILE='+cfgbase+'bcc -DWRITE_OPTIONS_FILE=0',
|
||||
'watcom':'-DOPTIONS_FILE='+cfgbase+'wat -DWRITE_OPTIONS_FILE=0',
|
||||
'msvc6prj':'$(DSWFLAGS)',
|
||||
}
|
||||
|
||||
for bake in bakes:
|
||||
if type==CONTRIB_DIR:
|
||||
acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
|
||||
ruledep = '$(CDEPS)'
|
||||
else:
|
||||
acdir = dirname
|
||||
ruledep = '$(SDEPS)'
|
||||
addMakefile('%s/%s' % (dirname, bake),
|
||||
{'all':dirname,'autoconf':acdir}, deps=[ruledep],
|
||||
args=args)
|
||||
|
||||
os.path.walk(os.path.join('..','..','samples'),
|
||||
onSubmakefile, SAMPLES_DIR)
|
||||
os.path.walk(os.path.join('..','..','demos'),
|
||||
onSubmakefile, SAMPLES_DIR)
|
||||
os.path.walk(os.path.join('..','..','utils'),
|
||||
onSubmakefile, SAMPLES_DIR)
|
||||
os.path.walk(os.path.join('..','..','contrib','build'),
|
||||
onSubmakefile, CONTRIB_DIR)
|
||||
os.path.walk(os.path.join('..','..','contrib','samples'),
|
||||
onSubmakefile, SAMPLES_DIR)
|
||||
os.path.walk(os.path.join('..','..','contrib','utils'),
|
||||
onSubmakefile, SAMPLES_DIR)
|
||||
|
||||
|
||||
cleanCmds = ''
|
||||
allK = all.keys()
|
||||
allK.sort()
|
||||
cleanList = []
|
||||
|
||||
for f in allK:
|
||||
all[f].sort()
|
||||
|
||||
for f in allK:
|
||||
for i in all[f]:
|
||||
cleanList.append('\trm -f %s\n' % i)
|
||||
cleanCmds = ''.join(cleanList)
|
||||
|
||||
for f in allK:
|
||||
var = '%s_ALL' % f.upper()
|
||||
file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f])))
|
||||
|
||||
file.write('\nall: $(COMPAT_TARGETS)')
|
||||
for f in allK:
|
||||
file.write(' %s' % f)
|
||||
file.write('\n\n')
|
||||
for f in allK:
|
||||
file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
|
||||
|
||||
file.write("""
|
||||
clean:
|
||||
\trm -f ../../autoconf_inc.m4
|
||||
\trm -f $(COMPAT_TARGETS)
|
||||
%s
|
||||
|
||||
library: ../../Makefile.in\\
|
||||
../msw/makefile.bcc\\
|
||||
../msw/makefile.vc\\
|
||||
../msw/makefile.wat\\
|
||||
../msw/makefile.gcc\\
|
||||
../msw/wx.dsw\\
|
||||
../../src/wxWindows.dsp
|
||||
|
||||
../../autoconf_inc.m4: ../../Makefile.in
|
||||
|
||||
../../src/wxWindows.dsp: monolithic.bkl files.bkl
|
||||
\t$(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl
|
||||
\ttouch $@
|
||||
|
||||
Makefile: regenMakefile.py
|
||||
\t./regenMakefile.py
|
||||
\t@echo
|
||||
\t@echo -------------------------------------------
|
||||
\t@echo Please rerun make, Makefile was regenerated
|
||||
\t@echo -------------------------------------------
|
||||
\t@echo
|
||||
\t@exit 1
|
||||
""" % cleanCmds)
|
||||
linesK = lines.keys()
|
||||
linesK.sort()
|
||||
for lk in linesK:
|
||||
for l in lines[lk]:
|
||||
file.write('%s\n' % l)
|
||||
file.close()
|
@@ -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>
|
||||
|
@@ -23,9 +23,9 @@
|
||||
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">6</set>
|
||||
<set var="WX_CURRENT">0</set>
|
||||
<set var="WX_REVISION">0</set>
|
||||
<set var="WX_AGE">6</set>
|
||||
<set var="WX_AGE">0</set>
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
|
@@ -24,7 +24,7 @@
|
||||
<!-- ...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>
|
||||
@@ -97,7 +97,7 @@
|
||||
$(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>
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
|
||||
|
||||
<command>
|
||||
$(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
$(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
</command>
|
||||
|
||||
</action>
|
||||
|
@@ -15,9 +15,7 @@
|
||||
<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>
|
||||
<set var="LIB_LIST">base core net xml odbc xrc html adv media gl dbgrid qa</set>
|
||||
|
||||
<!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
|
||||
(which is already in LIB_LIST) -->
|
||||
|
@@ -117,13 +117,13 @@ Format-specific notes:
|
||||
<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 -->
|
||||
<ldflags>$(WX_LIBS)</ldflags>
|
||||
<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>
|
||||
<ldflags>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldflags>
|
||||
<ldlibs>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldlibs>
|
||||
</if>
|
||||
<if cond="FORMAT=='gnu' and value!='base'">
|
||||
<set var="__liblist" append="1">$(value)</set>
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" ?>
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<!-- Original source: http://wiki.wxwidgets.org/wiki.pl?Bakefile -->
|
||||
@@ -47,7 +47,6 @@ FIXME: this template has (at least) the following bugs:
|
||||
<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>
|
||||
|
||||
|
||||
@@ -93,7 +92,7 @@ FIXME: this template has (at least) the following bugs:
|
||||
</if>
|
||||
|
||||
<if cond="not isdefined('WX_VERSION')">
|
||||
<set var="WX_VERSION_DEFAULT" overwrite="0">28</set>
|
||||
<set var="WX_VERSION_DEFAULT" overwrite="0">27</set>
|
||||
<option name="WX_VERSION">
|
||||
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||
<description>
|
||||
@@ -114,16 +113,6 @@ FIXME: this template has (at least) the following bugs:
|
||||
</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>
|
||||
|
||||
<!-- HELPER VARIABLES -->
|
||||
<!-- -->
|
||||
@@ -140,23 +129,19 @@ FIXME: this template has (at least) the following bugs:
|
||||
<!-- 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>
|
||||
<if cond="WX_DEBUG=='1'">__WXDEBUG__</if>
|
||||
</set>
|
||||
|
||||
<!-- These are handy ways of dealing with 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>
|
||||
<if cond="WX_DEBUG=='1'">d</if>
|
||||
</set>
|
||||
|
||||
<set var="WXCPU">
|
||||
@@ -177,7 +162,10 @@ FIXME: this template has (at least) the following bugs:
|
||||
|
||||
<!-- All the possible mixes for the wx library names -->
|
||||
<set var="WXLIB_BASE_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
|
||||
|
||||
<!--
|
||||
the trick used to support monolithic builds is here: when the
|
||||
@@ -185,50 +173,80 @@ FIXME: this template has (at least) the following bugs:
|
||||
WX_MONOLITHIC=1, then the base library is translated to the
|
||||
monolithic library
|
||||
-->
|
||||
<if cond="WX_MONOLITHIC=='1'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
|
||||
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)</if>
|
||||
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d</if>
|
||||
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u</if>
|
||||
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud</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>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_net</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_net</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_net</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_net</if>
|
||||
</set>
|
||||
<set var="WXLIB_XML_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_xml</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_xml</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_xml</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_xml</if>
|
||||
</set>
|
||||
<set var="WXLIB_ODBC_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_odbc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_odbc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_odbc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_odbc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_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>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_core</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_core</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_core</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_core</if>
|
||||
</set>
|
||||
<set var="WXLIB_MEDIA_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_media</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_media</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_media</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_media</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_media</if>
|
||||
</set>
|
||||
<set var="WXLIB_XRC_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_xrc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_xrc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_xrc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_xrc</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_xrc</if>
|
||||
</set>
|
||||
<set var="WXLIB_HTML_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_html</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_html</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_html</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_html</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_html</if>
|
||||
</set>
|
||||
<set var="WXLIB_ADV_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_adv</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_adv</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_adv</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_adv</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_adv</if>
|
||||
</set>
|
||||
<set var="WXLIB_QA_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_qa</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_qa</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_qa</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_qa</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_qa</if>
|
||||
</set>
|
||||
<set var="WXLIB_DBGRID_NAME">
|
||||
<if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_dbgrid</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_dbgrid</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_dbgrid</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_dbgrid</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_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>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_gl</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_gl</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_gl</if>
|
||||
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_gl</if>
|
||||
</set>
|
||||
|
||||
|
||||
@@ -270,8 +288,6 @@ FIXME: this template has (at least) the following bugs:
|
||||
<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) -->
|
||||
|
@@ -51,7 +51,6 @@ EXTRALIBS = {
|
||||
'html' : '$(EXTRALIBS_HTML)',
|
||||
'odbc' : '$(EXTRALIBS_ODBC)',
|
||||
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
|
||||
'media' : '$(EXTRALIBS_MEDIA)',
|
||||
}
|
||||
|
||||
def mkLibName(wxid):
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
@@ -100,9 +100,6 @@ 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
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user