Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the amount of the code which needs to be updated for every global change. Also remove tests for VisualAge compiler which isn't used since ages. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -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 =====================
|
||||
])
|
||||
@@ -73,7 +73,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
||||
PLATFORM_MAC=0
|
||||
PLATFORM_MACOS=0
|
||||
PLATFORM_MACOSX=0
|
||||
PLATFORM_OS2=0
|
||||
PLATFORM_BEOS=0
|
||||
|
||||
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
|
||||
@@ -84,9 +83,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
||||
*-pc-msdosdjgpp )
|
||||
PLATFORM_MSDOS=1
|
||||
;;
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
PLATFORM_OS2=1
|
||||
;;
|
||||
*-*-darwin* )
|
||||
PLATFORM_MAC=1
|
||||
PLATFORM_MACOSX=1
|
||||
@@ -110,9 +106,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
||||
msdos )
|
||||
PLATFORM_MSDOS=1
|
||||
;;
|
||||
os2 )
|
||||
PLATFORM_OS2=1
|
||||
;;
|
||||
darwin )
|
||||
PLATFORM_MAC=1
|
||||
PLATFORM_MACOSX=1
|
||||
@@ -135,7 +128,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
||||
AC_SUBST(PLATFORM_MAC)
|
||||
AC_SUBST(PLATFORM_MACOS)
|
||||
AC_SUBST(PLATFORM_MACOSX)
|
||||
AC_SUBST(PLATFORM_OS2)
|
||||
AC_SUBST(PLATFORM_BEOS)
|
||||
])
|
||||
|
||||
@@ -148,10 +140,6 @@ dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
|
||||
[
|
||||
AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf],
|
||||
[use OMF object format (OS/2)]),
|
||||
[bk_os2_use_omf="$enableval"])
|
||||
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-*-darwin* )
|
||||
dnl For Unix to MacOS X porting instructions, see:
|
||||
@@ -166,19 +154,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
|
||||
fi
|
||||
;;
|
||||
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
if test "x$bk_os2_use_omf" = "xyes" ; then
|
||||
AR=emxomfar
|
||||
RANLIB=:
|
||||
LDFLAGS="-Zomf $LDFLAGS"
|
||||
CFLAGS="-Zomf $CFLAGS"
|
||||
CXXFLAGS="-Zomf $CXXFLAGS"
|
||||
OS2_LIBEXT="lib"
|
||||
else
|
||||
OS2_LIBEXT="a"
|
||||
fi
|
||||
;;
|
||||
|
||||
i*86-*-beos* )
|
||||
LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS"
|
||||
;;
|
||||
@@ -243,16 +218,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
|
||||
DLLPREFIX=""
|
||||
dlldir="$bindir"
|
||||
;;
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
SO_SUFFIX="dll"
|
||||
SO_SUFFIX_MODULE="dll"
|
||||
DLLIMP_SUFFIX=$OS2_LIBEXT
|
||||
EXEEXT=".exe"
|
||||
DLLPREFIX=""
|
||||
LIBPREFIX=""
|
||||
LIBEXT=".$OS2_LIBEXT"
|
||||
dlldir="$bindir"
|
||||
;;
|
||||
*-*-darwin* )
|
||||
SO_SUFFIX="dylib"
|
||||
SO_SUFFIX_MODULE="bundle"
|
||||
@@ -432,14 +397,6 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
|
||||
WINDOWS_IMPLIB=1
|
||||
;;
|
||||
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
|
||||
SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
|
||||
PIC_FLAG=""
|
||||
AC_BAKEFILE_CREATE_FILE_DLLAR_SH
|
||||
chmod +x dllar.sh
|
||||
;;
|
||||
|
||||
powerpc-apple-macos* | \
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
|
||||
*-*-mirbsd* | \
|
||||
|
||||
@@ -54,7 +54,6 @@ ACLOCAL_SOURCES = \
|
||||
build/aclocal/ac_raf_func_which_getservbyname_r.m4 \
|
||||
build/aclocal/atomic_builtins.m4 \
|
||||
build/aclocal/ax_func_which_gethostbyname_r.m4 \
|
||||
build/aclocal/bakefile-dllar.m4 \
|
||||
build/aclocal/bakefile-lang.m4 \
|
||||
build/aclocal/bakefile.m4 \
|
||||
build/aclocal/cppunit.m4 \
|
||||
|
||||
@@ -558,13 +558,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
|
||||
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
|
||||
|
||||
<!-- system libraries on os2: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
|
||||
<if cond="FORMAT=='watcom'">
|
||||
<sys-lib>upm32</sys-lib>
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<!-- system libraries on windows: -->
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
||||
|
||||
@@ -31,9 +31,6 @@
|
||||
</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'">
|
||||
@@ -104,20 +101,6 @@
|
||||
|
||||
<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>
|
||||
|
||||
@@ -445,7 +445,7 @@ to run the tests, include CppUnit library here.
|
||||
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- windows/dos/os2 compilers -->
|
||||
<!-- windows/dos compilers -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
@@ -477,7 +477,6 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
|
||||
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
|
||||
<if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">PM</if>
|
||||
</set>
|
||||
<set var="TOOLKIT_LOWERCASE">
|
||||
<if cond="FORMAT=='msevc4prj'">wince</if>
|
||||
@@ -486,7 +485,6 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if>
|
||||
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if>
|
||||
<if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">pm</if>
|
||||
</set>
|
||||
<if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
|
||||
<set var="TOOLKIT_VERSION">
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
<define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||
COMPILED_FROM_DSP
|
||||
</define>
|
||||
<define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
|
||||
OS2_32
|
||||
</define>
|
||||
<define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
|
||||
__MSDOS__
|
||||
</define>
|
||||
|
||||
@@ -241,38 +241,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(BASE_COREFOUNDATION_HDR)
|
||||
</set>
|
||||
|
||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||
<!-- OS/2 -->
|
||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||
|
||||
<set var="BASE_OS2_SRC" hints="files">
|
||||
src/common/fdiodispatcher.cpp
|
||||
src/common/selectdispatcher.cpp
|
||||
src/unix/appunix.cpp
|
||||
src/unix/evtloopunix.cpp
|
||||
src/unix/timerunx.cpp
|
||||
src/os2/dir.cpp
|
||||
src/os2/mimetype.cpp
|
||||
src/os2/snglinst.cpp
|
||||
src/os2/stdpaths.cpp
|
||||
src/os2/thread.cpp
|
||||
src/os2/utils.cpp
|
||||
src/os2/utilsexc.cpp
|
||||
</set>
|
||||
<set var="BASE_AND_GUI_OS2_SRC" hints="files">
|
||||
</set>
|
||||
<set var="BASE_OS2_HDR" hints="files">
|
||||
wx/unix/app.h
|
||||
wx/os2/apptbase.h
|
||||
wx/os2/apptrait.h
|
||||
wx/unix/evtloop.h
|
||||
wx/os2/mimetype.h
|
||||
wx/os2/private.h
|
||||
wx/os2/stdpaths.h
|
||||
wx/os2/chkconf.h
|
||||
wx/os2/wxrsc.h
|
||||
</set>
|
||||
|
||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||
<!-- MSDOS -->
|
||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||
@@ -581,10 +549,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
|
||||
</set>
|
||||
|
||||
<set var="NET_OS2_SRC" hints="files">
|
||||
src/unix/sockunix.cpp
|
||||
</set>
|
||||
|
||||
<set var="NET_CMN_SRC" hints="files">
|
||||
src/common/fs_inet.cpp
|
||||
src/common/ftp.cpp
|
||||
@@ -2060,183 +2024,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</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>
|
||||
<set var="OS2_SRC" hints="files">
|
||||
<!-- Generic implementations used by wxOS2: -->
|
||||
src/generic/caret.cpp
|
||||
src/generic/clrpickerg.cpp
|
||||
src/generic/collpaneg.cpp
|
||||
src/generic/colrdlgg.cpp
|
||||
src/generic/dirdlgg.cpp
|
||||
src/generic/fdrepdlg.cpp
|
||||
src/generic/filepickerg.cpp
|
||||
src/generic/fontpickerg.cpp
|
||||
src/generic/imaglist.cpp
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/mdig.cpp
|
||||
src/generic/prntdlgg.cpp
|
||||
src/generic/statusbr.cpp
|
||||
src/generic/textmeasure.cpp
|
||||
<!-- OS/2 specific files: -->
|
||||
src/os2/accel.cpp
|
||||
src/os2/app.cpp
|
||||
src/os2/bitmap.cpp
|
||||
src/os2/bmpbuttn.cpp
|
||||
src/os2/brush.cpp
|
||||
src/os2/button.cpp
|
||||
src/os2/checkbox.cpp
|
||||
src/os2/checklst.cpp
|
||||
src/os2/choice.cpp
|
||||
src/os2/clipbrd.cpp
|
||||
src/os2/colour.cpp
|
||||
src/os2/combobox.cpp
|
||||
src/os2/control.cpp
|
||||
src/os2/cursor.cpp
|
||||
src/os2/data.cpp
|
||||
src/os2/dataobj.cpp
|
||||
src/os2/dc.cpp
|
||||
src/os2/dcclient.cpp
|
||||
src/os2/dcmemory.cpp
|
||||
src/os2/dcprint.cpp
|
||||
src/os2/dcscreen.cpp
|
||||
src/os2/dialog.cpp
|
||||
src/os2/dnd.cpp
|
||||
src/os2/evtloop.cpp
|
||||
src/os2/filedlg.cpp
|
||||
src/os2/font.cpp
|
||||
src/os2/fontdlg.cpp
|
||||
src/os2/fontenum.cpp
|
||||
src/os2/fontutil.cpp
|
||||
src/os2/frame.cpp
|
||||
src/os2/gauge.cpp
|
||||
src/os2/gdiimage.cpp
|
||||
src/os2/sockpm.cpp
|
||||
src/os2/helpwin.cpp
|
||||
src/os2/icon.cpp
|
||||
src/os2/iniconf.cpp
|
||||
src/os2/listbox.cpp
|
||||
src/os2/main.cpp
|
||||
src/os2/menu.cpp
|
||||
src/os2/menuitem.cpp
|
||||
src/os2/metafile.cpp
|
||||
src/os2/minifram.cpp
|
||||
src/os2/msgdlg.cpp
|
||||
src/os2/nativdlg.cpp
|
||||
src/os2/notebook.cpp
|
||||
src/os2/ownerdrw.cpp
|
||||
src/os2/palette.cpp
|
||||
src/os2/pen.cpp
|
||||
src/os2/popupwin.cpp
|
||||
src/os2/print.cpp
|
||||
src/os2/radiobox.cpp
|
||||
src/os2/radiobut.cpp
|
||||
src/os2/region.cpp
|
||||
src/os2/scrolbar.cpp
|
||||
src/os2/settings.cpp
|
||||
src/os2/slider.cpp
|
||||
src/os2/spinbutt.cpp
|
||||
src/os2/spinctrl.cpp
|
||||
src/os2/statbmp.cpp
|
||||
src/os2/statbox.cpp
|
||||
src/os2/statline.cpp
|
||||
src/os2/stattext.cpp
|
||||
src/os2/textctrl.cpp
|
||||
src/os2/textentry.cpp
|
||||
src/os2/tglbtn.cpp
|
||||
src/os2/timer.cpp
|
||||
src/os2/toolbar.cpp
|
||||
src/os2/tooltip.cpp
|
||||
src/os2/toplevel.cpp
|
||||
src/os2/utilsgui.cpp
|
||||
src/os2/window.cpp
|
||||
</set>
|
||||
<set var="OS2_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
wx/generic/clrpickerg.h
|
||||
wx/generic/collpaneg.h
|
||||
wx/generic/colrdlgg.h
|
||||
wx/generic/dirdlgg.h
|
||||
wx/generic/fdrepdlg.h
|
||||
wx/generic/listctrl.h
|
||||
wx/generic/mdig.h
|
||||
wx/generic/statusbr.h
|
||||
wx/os2/accel.h
|
||||
wx/os2/app.h
|
||||
wx/os2/bitmap.h
|
||||
wx/os2/bmpbuttn.h
|
||||
wx/os2/brush.h
|
||||
wx/os2/button.h
|
||||
wx/os2/checkbox.h
|
||||
wx/os2/checklst.h
|
||||
wx/os2/choice.h
|
||||
wx/os2/clipbrd.h
|
||||
wx/os2/colour.h
|
||||
wx/os2/combobox.h
|
||||
wx/os2/control.h
|
||||
wx/os2/cursor.h
|
||||
wx/os2/dataform.h
|
||||
wx/os2/dataobj.h
|
||||
wx/os2/dataobj2.h
|
||||
wx/os2/dc.h
|
||||
wx/os2/dcclient.h
|
||||
wx/os2/dcmemory.h
|
||||
wx/os2/dcprint.h
|
||||
wx/os2/dcscreen.h
|
||||
wx/os2/dialog.h
|
||||
wx/os2/dnd.h
|
||||
wx/os2/filedlg.h
|
||||
wx/os2/font.h
|
||||
wx/os2/fontdlg.h
|
||||
wx/os2/frame.h
|
||||
wx/os2/gauge.h
|
||||
wx/os2/gdiimage.h
|
||||
wx/os2/helpwin.h
|
||||
wx/os2/icon.h
|
||||
wx/os2/iniconf.h
|
||||
wx/os2/listbox.h
|
||||
wx/os2/menu.h
|
||||
wx/os2/menuitem.h
|
||||
wx/os2/metafile.h
|
||||
wx/os2/minifram.h
|
||||
wx/os2/msgdlg.h
|
||||
wx/os2/notebook.h
|
||||
wx/os2/ownerdrw.h
|
||||
wx/os2/palette.h
|
||||
wx/os2/pen.h
|
||||
wx/os2/pnghand.h
|
||||
wx/os2/pngread.h
|
||||
wx/os2/print.h
|
||||
wx/os2/radiobox.h
|
||||
wx/os2/radiobut.h
|
||||
wx/os2/region.h
|
||||
wx/os2/scrolbar.h
|
||||
wx/os2/settings.h
|
||||
wx/os2/slider.h
|
||||
wx/os2/spinbutt.h
|
||||
wx/os2/spinctrl.h
|
||||
wx/os2/statbmp.h
|
||||
wx/os2/statbox.h
|
||||
wx/os2/statline.h
|
||||
wx/os2/stattext.h
|
||||
wx/os2/textctrl.h
|
||||
wx/os2/textentry.h
|
||||
wx/os2/tglbtn.h
|
||||
wx/os2/toolbar.h
|
||||
wx/os2/tooltip.h
|
||||
wx/os2/toplevel.h
|
||||
wx/os2/window.h
|
||||
</set>
|
||||
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxOSX Common -->
|
||||
<!-- ====================================================================== -->
|
||||
@@ -3152,17 +2939,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/osx/core/joystick.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_OS2_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/os2/joystick.cpp
|
||||
src/os2/sound.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_OS2_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/os2/joystick.h
|
||||
wx/os2/sound.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_UNIX_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/unix/joystick.cpp
|
||||
@@ -3321,11 +3097,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="MEDIA_COCOA_HDR" hints="files">
|
||||
</set>
|
||||
|
||||
<set var="MEDIA_OS2_SRC" hints="files">
|
||||
</set>
|
||||
<set var="MEDIA_OS2_HDR" hints="files">
|
||||
</set>
|
||||
|
||||
<set var="MEDIA_UNIX_SRC" hints="files">
|
||||
src/unix/mediactrl.cpp
|
||||
</set>
|
||||
@@ -3626,7 +3397,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
|
||||
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
|
||||
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
|
||||
<if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
|
||||
</set>
|
||||
|
||||
<set var="OPENGL_SRC" hints="files">
|
||||
@@ -3850,7 +3620,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
|
||||
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
|
||||
</set>
|
||||
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
|
||||
@@ -3884,7 +3653,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
|
||||
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
|
||||
</set>
|
||||
|
||||
<set var="BASE_SRC" hints="files">
|
||||
@@ -3901,7 +3669,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_SRC)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="NET_PLATFORM_HDR" hints="files">
|
||||
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
|
||||
@@ -3925,7 +3692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
|
||||
</set>
|
||||
@@ -3940,7 +3706,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
|
||||
</set>
|
||||
@@ -3961,7 +3726,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="GUI_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
|
||||
@@ -3974,7 +3738,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
|
||||
</set>
|
||||
|
||||
<set var="CORE_SRC" hints="files">
|
||||
@@ -3999,7 +3762,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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=='PM'">$(ADVANCED_OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="ADVANCED_PLATFORM_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
|
||||
@@ -4013,7 +3775,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
|
||||
</set>
|
||||
|
||||
<!-- wxAdv files not used by wxUniv -->
|
||||
@@ -4050,7 +3811,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
|
||||
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="MEDIA_PLATFORM_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
|
||||
@@ -4062,7 +3822,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
|
||||
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
|
||||
</set>
|
||||
<set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
|
||||
<set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
|
||||
@@ -4111,7 +3870,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(BASE_CMN_SRC)
|
||||
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
|
||||
$(BASE_OSX_SRC)
|
||||
$(BASE_OS2_SRC)
|
||||
$(BASE_MSDOS_SRC)
|
||||
$(BASE_AND_GUI_CMN_SRC)
|
||||
$(BASE_AND_GUI_OSX_CARBON_SRC)
|
||||
|
||||
@@ -32,7 +32,6 @@ X11INC = $(WXDIR)/include/wx/x11
|
||||
MOTIFDIR = $(WXDIR)/src/motif
|
||||
MSDOSDIR = $(WXDIR)/src/msdos
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
PMDIR = $(WXDIR)/src/os2
|
||||
MACDIR = $(WXDIR)/src/osx
|
||||
COCOADIR = $(WXDIR)/src/cocoa
|
||||
FTDIR = $(WXDIR)/src/freetype
|
||||
@@ -303,14 +302,12 @@ BASE_DIST: ALL_DIST INTL_DIST
|
||||
mkdir $(DISTDIR)/include/wx/osx
|
||||
mkdir $(DISTDIR)/include/wx/osx/carbon
|
||||
mkdir $(DISTDIR)/include/wx/osx/core
|
||||
mkdir $(DISTDIR)/include/wx/os2
|
||||
mkdir $(DISTDIR)/src/unix
|
||||
mkdir $(DISTDIR)/src/osx
|
||||
mkdir $(DISTDIR)/src/osx/core
|
||||
mkdir $(DISTDIR)/src/osx/carbon
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
mkdir $(DISTDIR)/src/msw
|
||||
mkdir $(DISTDIR)/src/os2
|
||||
$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
|
||||
$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
||||
list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
<set var="TIFF_PLATFORM_SRC">
|
||||
<if cond="PLATFORM_UNIX=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
|
||||
</set>
|
||||
|
||||
@@ -50,7 +49,6 @@
|
||||
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
|
||||
<cflags-dmars>-w2</cflags-dmars>
|
||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||
<define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
|
||||
<define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
|
||||
<if cond="IS_MSVC">
|
||||
<!--
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
</if>
|
||||
|
||||
|
||||
<!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
|
||||
<!-- copy setup.h on DOS/Windows if the format supports it: -->
|
||||
<if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">
|
||||
<mkdir id="libdir">
|
||||
<dir>$(LIBDIRNAME)</dir>
|
||||
@@ -193,8 +193,7 @@
|
||||
|
||||
<set var="SETUP_H_SUBDIR">
|
||||
<if cond="WXUNIV=='1'">univ</if>
|
||||
<if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
|
||||
<if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
|
||||
<if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
|
||||
</set>
|
||||
|
||||
<copy-file-to-file-if-not-exist id="master_setup.h">
|
||||
|
||||
@@ -414,7 +414,7 @@
|
||||
<command cond="TOOLSET=='unix'">
|
||||
@mkdir -p $(_DIRNAME)
|
||||
</command>
|
||||
<command cond="TOOLSET in ['win32','os2','dos']">
|
||||
<command cond="TOOLSET in ['win32','dos']">
|
||||
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
|
||||
</command>
|
||||
</modify-target>
|
||||
|
||||
@@ -17,70 +17,6 @@
|
||||
|
||||
<xi:include href="include/push.xml"/>
|
||||
|
||||
<build>
|
||||
<name>wxOS2 Stable GCC</name>
|
||||
<builddir>psh_os2_stable_gcc</builddir>
|
||||
|
||||
<steps>
|
||||
<extractlogs/>
|
||||
<show log="compiler"/>
|
||||
<show log="update"/>
|
||||
<show log="configure"/>
|
||||
<show log="compile"/>
|
||||
<show log="demos"/>
|
||||
<show log="samples"/>
|
||||
<show log="utils"/>
|
||||
<show log="tests"/>
|
||||
</steps>
|
||||
</build>
|
||||
|
||||
<build>
|
||||
<name>wxOS2 Stable OpenWatcom</name>
|
||||
<builddir>psh_os2_stable_ow</builddir>
|
||||
|
||||
<steps>
|
||||
<extractlogs/>
|
||||
<show log="compiler"/>
|
||||
<show log="update"/>
|
||||
<show log="configure"/>
|
||||
<show log="compile"/>
|
||||
<show log="demos"/>
|
||||
<show log="samples"/>
|
||||
</steps>
|
||||
</build>
|
||||
|
||||
<build>
|
||||
<name>wxOS2 Trunk GCC</name>
|
||||
<builddir>psh_os2_trunk_gcc</builddir>
|
||||
|
||||
<steps>
|
||||
<extractlogs/>
|
||||
<show log="compiler"/>
|
||||
<show log="update"/>
|
||||
<show log="configure"/>
|
||||
<show log="compile"/>
|
||||
<show log="demos"/>
|
||||
<show log="samples"/>
|
||||
<show log="utils"/>
|
||||
<show log="tests"/>
|
||||
</steps>
|
||||
</build>
|
||||
|
||||
<build>
|
||||
<name>wxOS2 Trunk OpenWatcom</name>
|
||||
<builddir>psh_os2_trunk_ow</builddir>
|
||||
|
||||
<steps>
|
||||
<extractlogs/>
|
||||
<show log="compiler"/>
|
||||
<show log="update"/>
|
||||
<show log="configure"/>
|
||||
<show log="compile"/>
|
||||
<show log="demos"/>
|
||||
<show log="samples"/>
|
||||
</steps>
|
||||
</build>
|
||||
|
||||
<build>
|
||||
<name>Solaris HEAD GTK1</name>
|
||||
<builddir>psh_solaris_hd_gtk1</builddir>
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
|
||||
<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
|
||||
|
||||
<add-flags formats="watcom">
|
||||
-DPLATFORM_OS2=1
|
||||
</add-flags>
|
||||
|
||||
<include file="../bakefiles/Bakefiles.bkgen"/>
|
||||
|
||||
<add-flags files="wx.bkl" formats="watcom">
|
||||
-o../os2/makefile.wat
|
||||
</add-flags>
|
||||
|
||||
<add-flags files="../bakefiles/wx.bkl" formats="watcom">
|
||||
-DOPTIONS_FILE=config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../build/os2/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../build/os2/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../../build/os2/config.wat
|
||||
</add-flags>
|
||||
<add-flags files="../../*/*/*/*/*" formats="watcom">
|
||||
-DOPTIONS_FILE=../../../../build/os2/config.wat
|
||||
</add-flags>
|
||||
|
||||
</bakefile-gen>
|
||||
@@ -1,133 +0,0 @@
|
||||
# =========================================================================
|
||||
# This configuration file was generated by
|
||||
# Bakefile 0.2.2 (http://bakefile.sourceforge.net)
|
||||
# Beware that all changes made to this file will be overwritten next
|
||||
# time you run Bakefile!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# C compiler
|
||||
CC = wcc386
|
||||
|
||||
# C++ compiler
|
||||
CXX = wpp386
|
||||
|
||||
# Standard flags for CC
|
||||
CFLAGS =
|
||||
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# The C preprocessor
|
||||
CPP = $(CC) -p
|
||||
|
||||
# What type of library to build? [0,1]
|
||||
# 1 - DLL
|
||||
SHARED = 0
|
||||
|
||||
# Build wxUniversal instead of native port? [0,1]
|
||||
# 1 - Universal
|
||||
WXUNIV = 0
|
||||
|
||||
# Compile Unicode build of wxWidgets? [0,1]
|
||||
# 1 - Unicode
|
||||
UNICODE = 1
|
||||
|
||||
# Type of compiled binaries [debug,release]
|
||||
BUILD = debug
|
||||
|
||||
# Should debugging info be included in the executables? The default value
|
||||
# "default" means that debug info will be included if BUILD=debug
|
||||
# and not included if BUILD=release. [0,1,default]
|
||||
DEBUG_INFO = default
|
||||
|
||||
# Should __WXDEBUG__ be defined? The default value "default" means that it will
|
||||
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
|
||||
DEBUG_FLAG = default
|
||||
|
||||
# Multiple libraries or single huge monolithic one? [0,1]
|
||||
# 0 - Multilib
|
||||
# 1 - Monolithic
|
||||
MONOLITHIC = 1
|
||||
|
||||
# Build GUI libraries? [0,1]
|
||||
# 0 - Base
|
||||
# 1 - GUI
|
||||
USE_GUI = 1
|
||||
|
||||
# Build wxHTML library (USE_GUI must be 1)? [0,1]
|
||||
USE_HTML = 1
|
||||
|
||||
# Build multimedia library (USE_GUI must be 1)? [0,1]
|
||||
USE_MEDIA = 1
|
||||
|
||||
# Build wxXRC library (USE_GUI must be 1)? [0,1]
|
||||
USE_XRC = 1
|
||||
|
||||
# Build wxAUI library (USE_GUI must be 1)? [0,1]
|
||||
USE_AUI = 1
|
||||
|
||||
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_RICHTEXT = 1
|
||||
|
||||
# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
|
||||
USE_STC = 1
|
||||
|
||||
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
|
||||
USE_OPENGL = 0
|
||||
|
||||
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
|
||||
USE_QA = 0
|
||||
|
||||
# Enable exceptions in compiled code. [0,1]
|
||||
USE_EXCEPTIONS = 1
|
||||
|
||||
# Enable run-time type information (RTTI) in compiled code. [0,1]
|
||||
USE_RTTI = 1
|
||||
|
||||
# Enable threading in compiled code. [0,1]
|
||||
USE_THREADS = 1
|
||||
|
||||
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
|
||||
USE_GDIPLUS = 0
|
||||
|
||||
# Is this official build by wxWidgets developers? [0,1]
|
||||
OFFICIAL_BUILD = 0
|
||||
|
||||
# Use this to name your customized DLLs differently
|
||||
VENDOR = custom
|
||||
|
||||
#
|
||||
WX_FLAVOUR =
|
||||
|
||||
#
|
||||
WX_LIB_FLAVOUR =
|
||||
|
||||
# Name of your custom configuration. This affects directory
|
||||
# where object files are stored as well as the location of
|
||||
# compiled .lib files and setup.h under the lib/ toplevel directory.
|
||||
CFG =
|
||||
|
||||
# Compiler flags needed to compile test suite in tests directory. If you want
|
||||
# to run the tests, set it so that the compiler can find CppUnit headers.
|
||||
CPPUNIT_CFLAGS =
|
||||
|
||||
# Linker flags needed to link test suite in tests directory. If you want
|
||||
# to run the tests, include CppUnit library here.
|
||||
CPPUNIT_LIBS =
|
||||
|
||||
# Version of C runtime library to use. You can change this to
|
||||
# static if SHARED=0, but it is highly recommended to not do
|
||||
# it if SHARED=1 unless you know what you are doing. [dynamic,static]
|
||||
RUNTIME_LIBS = dynamic
|
||||
|
||||
12874
build/os2/makefile.wat
12874
build/os2/makefile.wat
File diff suppressed because it is too large
Load Diff
@@ -63,8 +63,6 @@ package_makefiles()
|
||||
do_package zip msvc6prj '*.dsp' '*.dsw'
|
||||
do_package zip msvc7-8prj '*.vcproj' '*.sln'
|
||||
do_package zip evcprj '*.vcp' '*.vcw'
|
||||
(cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen)
|
||||
do_package zip watcom_os2 makefile.wat config.wat
|
||||
}
|
||||
|
||||
copy_files ()
|
||||
|
||||
@@ -44,7 +44,7 @@ SolidCompression=yes
|
||||
|
||||
[Files]
|
||||
; source files
|
||||
Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,os2,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
|
||||
[INI]
|
||||
Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
|
||||
|
||||
@@ -100,7 +100,6 @@ update_common_setup_h include/wx/msw/setup0.h
|
||||
update_common_setup_h include/wx/msw/wince/setup.h
|
||||
update_common_setup_h include/wx/gtk/setup0.h
|
||||
update_common_setup_h include/wx/osx/setup0.h
|
||||
update_common_setup_h include/wx/os2/setup0.h
|
||||
update_common_setup_h include/wx/univ/setup0.h
|
||||
update_common_setup_h setup.h.in
|
||||
|
||||
|
||||
Reference in New Issue
Block a user