3a922bb4bd
recent changes to the 2.2 branch. Rationalised the autoconf scripts again, removed lots of stuff that shouldn't be there anymore and pounded the rest into an even tighter furball. (There's more work to be done here, but we're getting there..) Implemented the library naming scheme outlined in tn0012.txt -- introduced 'toolchain' and 'widget set' into the autoconf scripts, obsoleted the top level wx/setup.h and much of the mess associated with it. More changes for cross compiling and 2.3 debs. s/burnt_name/soname/g ; s/CC/CXX/g ; s/CCC/CC/g ; Just because it's Right. (Thanks Vadim for already doing *FLAGS..) Fixed libfl Makefile to actually work. Removed *_DEPS from tmake templates, in every case they can be determined from the relevant *_OBJS Added BASE_MSW_OBJS, a couple of missing #includes, some missing files to the 'dist' targets, and fixed some compile warnings. Changed setup.py to use wx-config --gl-libs instead of hard coded constants. Modified Files: Makefile.in configure configure.in setup.h.in wx-config.in wxBase.spec wxGTK.spec wxMotif.spec contrib/include/wx/applet/window.h contrib/src/Makefile.in contrib/src/applet/appletwindow.cpp contrib/src/fl/Makefile.in debian/changelog debian/control.in debian/libwxbase-dbg.dirs debian/libwxbase-dbg.links debian/libwxbase-dbg.postinst debian/libwxbase-dbg.prerm debian/libwxbase-dev.dirs debian/libwxbase-dev.files debian/libwxbase-dev.links debian/libwxbase-dev.postinst debian/libwxbase-dev.prerm debian/libwxgtk-dbg.dirs debian/libwxgtk-dbg.links debian/libwxgtk-dbg.postinst debian/libwxgtk-dbg.prerm debian/libwxgtk-dev.dirs debian/libwxgtk-dev.files debian/libwxgtk-dev.links debian/libwxgtk-dev.postinst debian/libwxgtk-dev.prerm debian/rules distrib/msw/tmake/base.t distrib/msw/tmake/gtk.t distrib/msw/tmake/mgl.t distrib/msw/tmake/motif.t distrib/msw/tmake/msw.t distrib/msw/tmake/os2.t distrib/msw/tmake/univ.t docs/motif/install.txt include/wx/msw/private.h include/wx/os2/SETUP.H include/wx/os2/SETUP0.H samples/ipc/Makefile.in samples/sockets/Makefile.in src/files.lst src/make.env.in src/makelib.env.in src/makeprog.env.in src/common/strconv.cpp src/gtk/files.lst src/mgl/files.lst src/motif/files.lst src/msw/files.lst src/msw/gsocket.c src/msw/gsockmsw.c src/msw/toplevel.cpp src/msw/utils.cpp src/os2/files.lst src/univ/files.lst wxPython/setup.py Added Files: debian/libwxbase-msw-dev.dirs debian/libwxbase-msw-dev.links debian/libwxbase-msw-dev.postinst debian/libwxbase-msw-dev.prerm debian/libwxmsw-dev.dirs debian/libwxmsw-dev.links debian/libwxmsw-dev.postinst debian/libwxmsw-dev.prerm debian/wxwin-doc.doc-base debian/wxwin-headers-msw.dirs Removed Files: debian/wxwin-doc.doc-base.in include/wx/setup.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
93 lines
2.6 KiB
Perl
93 lines
2.6 KiB
Perl
#!################################################################################
|
|
#! File: base.t
|
|
#! Purpose: tmake template file from which src/common/files.lst containing the
|
|
#! list of files for wxBase library is generated by tmake
|
|
#! Author: Vadim Zeitlin
|
|
#! Created: 27.01.00
|
|
#! Version: $Id$
|
|
#!################################################################################
|
|
#${
|
|
#! include the code which parses filelist.txt file and initializes
|
|
#! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and
|
|
#! %wxOS2PM hashes.
|
|
IncludeTemplate("filelist.t");
|
|
|
|
#! find all our sources
|
|
foreach $file (sort keys %wxBase) {
|
|
($fileobj = $file) =~ s/cp?p?$/\o/;
|
|
|
|
$project{"BASE_SOURCES"} .= "common/" . $file . " ";
|
|
$project{"BASE_OBJS"} .= $fileobj . " ";
|
|
}
|
|
|
|
foreach $file (sort keys %wxCommon) {
|
|
next unless $wxCommon{$file} =~ /\bB\b/;
|
|
|
|
($fileobj = $file) =~ s/cp?p?$/\o/;
|
|
|
|
$project{"BASE_SOURCES"} .= "common/" . $file . " ";
|
|
$project{"BASE_OBJS"} .= $fileobj . " ";
|
|
}
|
|
|
|
foreach $file (sort keys %wxUNIX) {
|
|
next unless $wxUNIX{$file} =~ /\bB\b/;
|
|
|
|
($fileobj = $file) =~ s/cp?p?$/\o/;
|
|
|
|
$project{"BASE_SOURCES"} .= "unix/" . $file . " ";
|
|
$project{"BASE_UNIX_OBJS"} .= $fileobj . " ";
|
|
}
|
|
|
|
foreach $file (sort keys %wxMSW) {
|
|
next unless $wxMSW{$file} =~ /\bB\b/;
|
|
|
|
($fileobj = $file) =~ s/cp?p?$/\o/;
|
|
|
|
$project{"BASE_SOURCES"} .= "msw/" . $file . " ";
|
|
$project{"BASE_MSW_OBJS"} .= $fileobj . " ";
|
|
}
|
|
|
|
#! find all our headers
|
|
foreach $file (sort keys %wxWXINCLUDE) {
|
|
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
|
|
|
|
$project{"BASE_HEADERS"} .= $file . " "
|
|
}
|
|
|
|
foreach $file (sort keys %wxUNIXINCLUDE) {
|
|
next unless $wxUNIXINCLUDE{$file} =~ /\bB\b/;
|
|
|
|
$project{"BASE_HEADERS"} .= "unix/" . $file . " "
|
|
}
|
|
|
|
foreach $file (sort keys %wxMSWINCLUDE) {
|
|
next unless $wxMSWINCLUDE{$file} =~ /\bB\b/;
|
|
|
|
$project{"BASE_HEADERS"} .= "msw/" . $file . " "
|
|
}
|
|
|
|
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
|
|
next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;
|
|
|
|
$project{"BASE_HEADERS"} .= "protocol/" . $file . " "
|
|
}
|
|
#$}
|
|
# This file was automatically generated by tmake at #$ Now()
|
|
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
|
|
ALL_SOURCES = \
|
|
#$ ExpandList("BASE_SOURCES");
|
|
|
|
ALL_HEADERS = \
|
|
#$ ExpandList("BASE_HEADERS");
|
|
|
|
BASE_OBJS = \
|
|
#$ ExpandList("BASE_OBJS");
|
|
|
|
BASE_UNIX_OBJS = \
|
|
#$ ExpandList("BASE_UNIX_OBJS");
|
|
|
|
BASE_MSW_OBJS = \
|
|
#$ ExpandList("BASE_MSW_OBJS");
|
|
|
|
|