BSDBuild

Author: vedge Date: 2012-08-21 02:27:36 -0400 (Tue, 21 Aug 2012) New Revision: 996 Added: trunk/BSDBuild/nanosleep.pm Modified: trunk/BSDBuild/Makefile Log: test for nanosleep() Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2012-08-20 02:39:51 UTC (rev 995) +++ trunk/BSDBuild/Makefile2012-08-21 06:27:36 UTC (rev 996) < at >< at > -113,7 +113,8 < at >< at > winsock.pm \ siocgifconf.pm \ fontconfig.pm \ -rand48.pm +rand48.pm \ +nanosleep.pm all: Added: trunk/BSDBuild/nanosleep.pm =================================================================== --- trunk/BSDBuild/nanosleep.pm (rev 0) +++ trunk/BSDBuild/nanosleep.pm2012-08-21 06:27:36 UTC (rev 996) < at >< at > -0,0 +1,61 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2012 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +sub Test +{ +TryCompile 'HAVE_NANOSLEEP', << 'EOF'; +#include <time.h> + +int +main(int argc, char *argv[]) +{ +struct timespec rqtp, rmtp; +int rv; + +rqtp.tv_sec = 1; +rqtp.tv_nsec = 1000000; +rv = nanosleep(&rqtp, &rmtp); +return (rv == -1); +} +EOF +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +MkEmulUnavailSYS('NANOSLEEP'); +return (1); +} + +BEGIN +{ +$TESTS{'nanosleep'} = \&Test; +$DEPS{'nanosleep'} = 'cc'; +$EMUL{'nanosleep'} = \&Emul; +$DESCR{'nanosleep'} = 'the nanosleep() function'; +} + +;1 [Less]

Author: vedge Date: 2012-08-19 22:39:51 -0400 (Sun, 19 Aug 2012) New Revision: 995 Modified: trunk/BSDBuild/getpwnam_r.pm trunk/BSDBuild/getpwuid.pm Log: don't test pw_class and pw_gecos Modified: trunk/BSDBuild/getpwnam_r.pm ... [More] =================================================================== --- trunk/BSDBuild/getpwnam_r.pm2012-08-18 03:44:19 UTC (rev 994) +++ trunk/BSDBuild/getpwnam_r.pm2012-08-20 02:39:51 UTC (rev 995) < at >< at > -49,7 +49,7 < at >< at > if (res == NULL) { return (rv == 0); } -return (pw.pw_class != NULL && pw.pw_gecos != NULL && pw.pw_dir != NULL); +return (pw.pw_dir != NULL); } EOF } Modified: trunk/BSDBuild/getpwuid.pm =================================================================== --- trunk/BSDBuild/getpwuid.pm2012-08-18 03:44:19 UTC (rev 994) +++ trunk/BSDBuild/getpwuid.pm2012-08-20 02:39:51 UTC (rev 995) < at >< at > -39,7 +39,7 < at >< at > uid_t uid = 0; pwd = getpwuid(uid); -return (pwd != NULL && pwd->pw_gecos != NULL && pwd->pw_class != NULL); +return (pwd != NULL && pwd->pw_dir != NULL); } EOF } [Less]

Author: vedge Date: 2012-08-14 01:39:49 -0400 (Tue, 14 Aug 2012) New Revision: 992 Added: trunk/BSDBuild/rand48.pm Modified: trunk/BSDBuild/Makefile Log: test for the rand48 functions Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2012-08-10 14:19:43 UTC (rev 991) +++ trunk/BSDBuild/Makefile2012-08-14 05:39:49 UTC (rev 992) < at >< at > -112,7 +112,8 < at >< at > crypt.pm \ winsock.pm \ siocgifconf.pm \ -fontconfig.pm +fontconfig.pm \ +rand48.pm all: Added: trunk/BSDBuild/rand48.pm =================================================================== --- trunk/BSDBuild/rand48.pm (rev 0) +++ trunk/BSDBuild/rand48.pm2012-08-14 05:39:49 UTC (rev 992) < at >< at > -0,0 +1,62 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2012 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +sub Test +{ +TryCompile 'HAVE_RAND48', << 'EOF'; +#include <stdlib.h> +int +main(int argc, char *argv[]) +{ +double d1, d2; +unsigned short xbuf[3] = { 1,2,3 }; +unsigned short p[7]; +long l1, l2; +d1 = drand48(); d2 = erand48(xbuf); +l1 = lrand48(); l2 = nrand48(xbuf); +srand48(l1); +lcong48(p); +return (0); +} +EOF +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +MkEmulUnavailSYS('RAND48'); +return (1); +} + +BEGIN +{ +$TESTS{'rand48'} = \&Test; +$DEPS{'rand48'} = 'cc'; +$EMUL{'rand48'} = \&Emul; +$DESCR{'rand48'} = 'the rand48(3) family of functions'; +} + +;1 [Less]

Author: vedge Date: 2012-08-10 10:19:43 -0400 (Fri, 10 Aug 2012) New Revision: 991 Added: trunk/ChangeLogs/Release-3.0.txt Modified: trunk/configure trunk/configure.in Log: 3.0 Added: trunk/ChangeLogs/Release-3.0.txt ... [More] =================================================================== --- trunk/ChangeLogs/Release-3.0.txt (rev 0) +++ trunk/ChangeLogs/Release-3.0.txt2012-08-10 14:19:43 UTC (rev 991) < at >< at > -0,0 +1,22 < at >< at > + +Release Notes for BSDBuild 3.0 +------------------------------ +- It is now possible to control conditional compilation from configure + (i.e., a Makefile's ${SRCS} definition may safely reference configure- + script-defined variables). To accomodate this, when using separate builds, + mkconcurrent is now invoked at the very end of configure (and it performs + more extensive parsing of Makefiles as well). +- New mkconfigure(1) directives: MAPPEND(), CHECK_PERL_MODULE(), DEFAULT_DIR(). +- Prevent redundant Makefile.config definitions from being produced. +- Avoid using system the libtool if it is not GNU libtool. +- Added --moduledir, --statedir and --libexecdir (and others for GNU compat). +- mkconfigure(1) now processes long line breaks on input scripts. +- Added macros to simplify Emul() handling, removed unneeded Emul() code.. +- Renamed ${SHAREDIR} -> ${DATADIR} and ${SHARE} -> ${DATAFILES}. +- Compiler attribute tests have been moved to a separate module cc_attributes. +- mkdep(1) now passes any "-m" cflags to the compiler. +- build.prog.mk(5) and build.lib.mk(5) now honor ${OBJC}. +- build.proj.mk(5) now accepts more specific "windows-foo" targets. +- All modules should now honor ${DESTDIR}. +- New tests: objc, gcc, getpwnam_r, gethostbyname, portaudio, mysql, cocoa, + sockopts, crypt, winsock, siocgifconf, fontconfig Modified: trunk/configure =================================================================== --- trunk/configure2012-08-10 07:30:22 UTC (rev 990) +++ trunk/configure2012-08-10 14:19:43 UTC (rev 991) < at >< at > -669,7 +669,7 < at >< at > echo "#define PACKAGE \"$PACKAGE\"" >> config/package.h echo "#endif" >> config/package.h echo "hdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -VERSION="3.0-beta" +VERSION="3.0" echo "#ifndef VERSION" > config/version.h echo "#define VERSION \"$VERSION\"" >> config/version.h echo "#endif" >> config/version.h Modified: trunk/configure.in =================================================================== --- trunk/configure.in2012-08-10 07:30:22 UTC (rev 990) +++ trunk/configure.in2012-08-10 14:19:43 UTC (rev 991) < at >< at > -1,9 +1,7 < at >< at > # Public domain PACKAGE("BSDBuild") -VERSION("3.0-beta") +VERSION("3.0") RELEASE("Blast of Ancient Atmospheres") - DEFAULT_DIR(DATADIR, "$PREFIX/share/bsdbuild") - MDEFINE(CONFIGURE_OK, "yes") [Less]

Author: vedge Date: 2012-08-09 22:22:26 -0400 (Thu, 09 Aug 2012) New Revision: 989 Added: trunk/BSDBuild/fontconfig.pm Modified: trunk/BSDBuild/Makefile Log: test for the fontconfig library Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2012-08-10 02:21:51 UTC (rev 988) +++ trunk/BSDBuild/Makefile2012-08-10 02:22:26 UTC (rev 989) < at >< at > -111,7 +111,8 < at >< at > sockopts.pm \ crypt.pm \ winsock.pm \ -siocgifconf.pm +siocgifconf.pm \ +fontconfig.pm all: Added: trunk/BSDBuild/fontconfig.pm =================================================================== --- trunk/BSDBuild/fontconfig.pm (rev 0) +++ trunk/BSDBuild/fontconfig.pm2012-08-10 02:22:26 UTC (rev 989) < at >< at > -0,0 +1,91 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2012 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +my $testCode = << 'EOF'; +#include <stdio.h> +#include <string.h> +#include <fontconfig/fontconfig.h> + +int +main(int argc, char *argv[]) +{ +FcPattern *pattern, *fpat; + FcResult result = FcResultMatch; +const FcChar8 name[1] = { '\0' }; + FcChar8 *file; + FcMatrix *mat = NULL; + double size; + int idx; + if (!FcInit()) { return (1); } + if ((pattern = FcNameParse(name)) == NULL) { return (1); } + if (!FcConfigSubstitute(NULL, pattern, FcMatchPattern)) { return (1); } + FcDefaultSubstitute(pattern); + if ((fpat = FcFontMatch(NULL, pattern, &result)) == NULL) { return (1); } + if (FcPatternGetString(fpat, FC_FILE, 0, &file) != FcResultMatch) { return (1); } + if (FcPatternGetInteger(fpat, FC_INDEX, 0, &idx) != FcResultMatch) { return (1); } + if (FcPatternGetDouble(fpat, FC_SIZE, 0, &size) != FcResultMatch) { return (1); } + if (FcPatternGetMatrix(fpat, FC_MATRIX, 0, &mat) != FcResultMatch) { return (1); } + return (0); +} +EOF + +sub Test +{ +my ($ver, $pfx) = < at >_; + +MkExecPkgConfig($pfx, 'fontconfig', '--modversion', 'FONTCONFIG_VERSION'); +MkExecPkgConfig($pfx, 'fontconfig', '--cflags', 'FONTCONFIG_CFLAGS'); +MkExecPkgConfig($pfx, 'fontconfig', '--libs', 'FONTCONFIG_LIBS'); +MkIfNE('${FONTCONFIG_VERSION}', ''); +MkFoundVer($pfx, $ver, 'FONTCONFIG_VERSION'); +MkPrintN('checking whether fontconfig works...'); +MkCompileC('HAVE_FONTCONFIG', + '${FONTCONFIG_CFLAGS}', '${FONTCONFIG_LIBS}', + $testCode); +MkSaveIfTrue('${HAVE_FONTCONFIG}', 'FONTCONFIG_CFLAGS', 'FONTCONFIG_LIBS'); +MkElse; +MkNotFound($pfx); +MkSaveUndef('HAVE_FONTCONFIG'); +MkEndif; +return (0); +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +MkEmulUnavail('FONTCONFIG'); +return (1); +} + +BEGIN +{ +$DESCR{'fontconfig'} = 'fontconfig (http://fontconfig.org/)'; +$TESTS{'fontconfig'} = \&Test; +$DEPS{'fontconfig'} = 'cc'; +$EMUL{'fontconfig'} = \&Emul; +} + +;1 [Less]

Author: vedge Date: 2012-08-09 22:21:51 -0400 (Thu, 09 Aug 2012) New Revision: 988 Modified: trunk/man/mkconfigure.1 trunk/mkconfigure.pl Log: process long line breaks in the input script. Modified: trunk/man/mkconfigure.1 ... [More] =================================================================== --- trunk/man/mkconfigure.12012-08-08 14:52:45 UTC (rev 987) +++ trunk/man/mkconfigure.12012-08-10 02:21:51 UTC (rev 988) < at >< at > -45,7 +45,8 < at >< at > .Pa configure.in source can contain a number of special directives, along with Bourne shell code fragments that will be copied verbatim to the configure script. -.Pp +Long lines in the input script can be broken with end-of-line backslash +(\\) characters. .Sh MKCONFIGURE DIRECTIVES .Pp .Nm Modified: trunk/mkconfigure.pl =================================================================== --- trunk/mkconfigure.pl2012-08-08 14:52:45 UTC (rev 987) +++ trunk/mkconfigure.pl2012-08-10 02:21:51 UTC (rev 988) < at >< at > -673,7 +673,7 < at >< at > if ($arg =~ /\"(.*)\"/) { $arg = $1; } if ($descr =~ /\"(.*)\"/) { $descr = $1; } -my $darg = pack('A' x 25, split('', $arg)); +my $darg = pack('A' x 27, split('', $arg)); push < at >Help, "echo \" $darg $descr\""; } < at >< at > -1185,10 +1185,38 < at >< at > my $registers = 1; my < at >INPUT = (); -chop(< at >INPUT = <STDIN>); +# +# Read input, processing long line breaks. +# +my $trunc = 0; +my $truncLine = ''; +while (<STDIN>) { +chop; +if ($trunc) { +$truncLine .= ' '.$_; +if (!/\\$/) { +$truncLine =~ s/\s+/ /g; +push < at >INPUT, $truncLine; +$truncLine = ''; +$trunc = 0; +} else { +chop($truncLine); +} +} else { +if (/\\$/) { +chop; +$truncLine = $_; +$truncLine =~ s/\s+/ /g; +$trunc = 1; +} else { +push < at >INPUT, $_; +} +} +} # -# First pass: scan for directives that will not be processed in order. +# First pass: scan for special directives which will not be processed +# directly into Bourne script fragments. # if ($Verbose) { print STDERR "First pass\n"; [Less]

Author: vedge Date: 2012-08-08 10:52:38 -0400 (Wed, 08 Aug 2012) New Revision: 986 Added: trunk/BSDBuild/siocgifconf.pm Modified: trunk/BSDBuild/Makefile Log: more extensive test for SIOCGIFCONF Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2012-08-08 14:52:06 UTC (rev 985) +++ trunk/BSDBuild/Makefile2012-08-08 14:52:38 UTC (rev 986) < at >< at > -110,7 +110,8 < at >< at > cocoa.pm \ sockopts.pm \ crypt.pm \ -winsock.pm +winsock.pm \ +siocgifconf.pm all: Added: trunk/BSDBuild/siocgifconf.pm =================================================================== --- trunk/BSDBuild/siocgifconf.pm (rev 0) +++ trunk/BSDBuild/siocgifconf.pm2012-08-08 14:52:38 UTC (rev 986) < at >< at > -0,0 +1,84 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2012 Hypertriton, Inc. <http://www.hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +sub Test +{ +TryCompile 'HAVE_SIOCGIFCONF', << 'EOF'; +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <unistd.h> +#include <fcntl.h> +#include <netinet/in.h> +#include <net/if.h> +#include <netdb.h> +int +main(int argc, char *argv[]) +{ +char buf[4096]; +struct ifconf conf; +struct ifreq *ifr; +int sock; +if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { +return (1); +} +conf.ifc_len = sizeof(buf); +conf.ifc_buf = (caddr_t)buf; +if (ioctl(sock, SIOCGIFCONF, &conf) < 0) { +return (1); +} +#if !defined(_SIZEOF_ADDR_IFREQ) +#define _SIZEOF_ADDR_IFREQ sizeof +#endif +for (ifr = (struct ifreq *)buf; + (char *)ifr < &buf[conf.ifc_len]; + ifr = (struct ifreq *)((char *)ifr + _SIZEOF_ADDR_IFREQ(*ifr))) { +if (ifr->ifr_addr.sa_family == AF_INET) +return (1); +} +close(sock); +return (0); +} +EOF +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +MkEmulUnavailSYS('SIOCGIFCONF'); +return (1); +} + +BEGIN +{ +$TESTS{'siocgifconf'} = \&Test; +$DEPS{'siocgifconf'} = 'cc'; +$EMUL{'siocgifconf'} = \&Emul; +$DESCR{'siocgifconf'} = 'the SIOCGIFCONF interface'; +} + +;1 [Less]

Author: vedge Date: 2012-08-08 10:52:06 -0400 (Wed, 08 Aug 2012) New Revision: 985 Modified: trunk/BSDBuild/cocoa.pm Log: remove "-falign-loops=16" Modified: trunk/BSDBuild/cocoa.pm ... [More] =================================================================== --- trunk/BSDBuild/cocoa.pm2012-08-08 04:25:59 UTC (rev 984) +++ trunk/BSDBuild/cocoa.pm2012-08-08 14:52:06 UTC (rev 985) < at >< at > -29,8 +29,7 < at >< at > MkDefine('COCOA_CFLAGS', '-DTARGET_API_MAC_CARBON ' . '-DTARGET_API_MAC_OSX ' . - '-falign-loops=16 -force_cpusubtype_ALL '. - '-fpascal-strings'); + '-force_cpusubtype_ALL -fpascal-strings'); MkDefine('COCOA_LIBS', '-lobjc '. '-Wl,-framework,Cocoa ' . '-Wl,-framework,OpenGL ' . [Less]

Author: vedge Date: 2012-08-01 20:37:49 -0400 (Wed, 01 Aug 2012) New Revision: 981 Modified: trunk/BSDBuild/winsock.pm Log: add missing Test() Modified: trunk/BSDBuild/winsock.pm ... [More] =================================================================== --- trunk/BSDBuild/winsock.pm2012-08-01 14:27:06 UTC (rev 980) +++ trunk/BSDBuild/winsock.pm2012-08-02 00:37:49 UTC (rev 981) < at >< at > -23,6 +23,14 < at >< at > # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. +sub Test +{ +MkDefine('HAVE_WINSOCK1', 'no'); +MkDefine('HAVE_WINSOCK2', 'no'); +MkSaveUndef('HAVE_WINSOCK1', 'HAVE_WINSOCK2'); +return (1); +} + sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -40,6 +48,7 < at >< at > BEGIN { $DESCR{'winsock'} = 'the WinSock interface'; +$TESTS{'winsock'} = \&Test; $EMUL{'winsock'} = \&Emul; } [Less]

Author: vedge Date: 2012-08-01 08:02:59 -0400 (Wed, 01 Aug 2012) New Revision: 979 Modified: trunk/BSDBuild/agar-au.pm trunk/BSDBuild/agar-core.pm trunk/BSDBuild/agar-dev.pm trunk/BSDBuild/agar-math.pm trunk/BSDBuild/agar-rg.pm ... [More] trunk/BSDBuild/agar-vg.pm trunk/BSDBuild/agar.pm trunk/BSDBuild/alsa.pm trunk/BSDBuild/cocoa.pm trunk/BSDBuild/db4.pm trunk/BSDBuild/edacious.pm trunk/BSDBuild/freesg.pm trunk/BSDBuild/freetype.pm trunk/BSDBuild/gettext.pm trunk/BSDBuild/glu.pm trunk/BSDBuild/glx.pm trunk/BSDBuild/iconv.pm trunk/BSDBuild/jpeg.pm trunk/BSDBuild/mysql.pm trunk/BSDBuild/opengl.pm trunk/BSDBuild/png.pm trunk/BSDBuild/portaudio.pm trunk/BSDBuild/pthreads.pm trunk/BSDBuild/sdl.pm trunk/BSDBuild/sndfile.pm trunk/BSDBuild/wgl.pm trunk/BSDBuild/winsock.pm trunk/build.proj.mk trunk/mkconfigure.pl trunk/mkprojfiles.pl Log: get rid of the Link() routines, only Emul() suffices now. Modified: trunk/BSDBuild/agar-au.pm =================================================================== --- trunk/BSDBuild/agar-au.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-au.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -71,28 71,11 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_au') { -return (0); -} -PmLink('ag_au'); -PmLink('ag_au_pa'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $DESCR{'agar-au'} = 'agar-au (http://libagar.org/)'; $DEPS{'agar-au'} = 'cc,agar'; $TESTS{'agar-au'} = \&Test; -$LINK{'agar-au'} = \&Link; $EMUL{'agar-au'} = \&Emul; } Modified: trunk/BSDBuild/agar-core.pm =================================================================== --- trunk/BSDBuild/agar-core.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-core.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -84,26 84,10 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_core') { -return (0); -} -PmLink('ag_core'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $TESTS{'agar-core'} = \&Test; $DEPS{'agar-core'} = 'cc'; -$LINK{'agar-core'} = \&Link; $EMUL{'agar-core'} = \&Emul; $DESCR{'agar-core'} = 'Agar-Core (http://libagar.org/)'; } Modified: trunk/BSDBuild/agar-dev.pm =================================================================== --- trunk/BSDBuild/agar-dev.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-dev.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -75,27 75,11 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_dev') { -return (0); -} -PmLink('ag_dev'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $DESCR{'agar-dev'} = 'agar-dev (http://libagar.org/)'; $DEPS{'agar-dev'} = 'cc,agar'; $TESTS{'agar-dev'} = \&Test; -$LINK{'agar-dev'} = \&Link; $EMUL{'agar-dev'} = \&Emul; } Modified: trunk/BSDBuild/agar-math.pm =================================================================== --- trunk/BSDBuild/agar-math.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-math.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -73,28 73,12 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_math') { -return (0); -} -PmLink('ag_math'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $TESTS{'agar-math'} = \&Test; $DESCR{'agar-math'} = 'Agar-Math library (http://libagar.org/)'; $DEPS{'agar-math'} = 'cc,agar'; $EMUL{'agar-math'} = \&Emul; -$LINK{'agar-math'} = \&Link; } ;1 Modified: trunk/BSDBuild/agar-rg.pm =================================================================== --- trunk/BSDBuild/agar-rg.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-rg.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -73,27 73,11 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_rg') { -return (0); -} -PmLink('ag_rg'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $DESCR{'agar-rg'} = 'agar-rg (http://hypertriton.com/agar-rg/)'; $DEPS{'agar-rg'} = 'cc,agar'; $TESTS{'agar-rg'} = \&Test; -$LINK{'agar-rg'} = \&Link; $EMUL{'agar-rg'} = \&Emul; } Modified: trunk/BSDBuild/agar-vg.pm =================================================================== --- trunk/BSDBuild/agar-vg.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar-vg.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -72,27 72,11 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'ag_vg') { -return (0); -} -PmLink('ag_vg'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmLibPath('$(#agar.lib)'); -} -return (1); -} - BEGIN { $DESCR{'agar-vg'} = 'agar-vg (http://hypertriton.com/agar-vg/)'; $DEPS{'agar-vg'} = 'cc,agar'; $TESTS{'agar-vg'} = \&Test; -$LINK{'agar-vg'} = \&Link; $EMUL{'agar-vg'} = \&Emul; } Modified: trunk/BSDBuild/agar.pm =================================================================== --- trunk/BSDBuild/agar.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/agar.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -71,56 71,29 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var eq 'ag_core') { -PmLink('ag_core'); -PmLink('SDL'); - -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmIncludePath('$(#sdl.include)'); -PmLibPath('$(#agar.lib)'); -PmLibPath('$(#sdl.lib)'); -} -return (1); -} - -if ($var eq 'ag_gui') { -PmLink('ag_gui'); -PmLink('SDL'); -if ($EmulOS =~ /^windows/) { -PmLink('opengl32'); -} else { -PmLink('GL'); -} -PmLink('freetype'); - -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#agar.include)'); -PmIncludePath('$(#sdl.include)'); -PmIncludePath('$(#gl.include)'); -PmIncludePath('$(#freetype.include)'); -PmLibPath('$(#agar.lib)'); -PmLibPath('$(#sdl.lib)'); -PmLibPath('$(#gl.lib)'); -PmLibPath('$(#freetype.lib)'); -} -return (1); -} - -return (0); -} - BEGIN { $TESTS{'agar'} = \&Test; $DEPS{'agar'} = 'cc'; -$LINK{'agar'} = \&Link; $EMUL{'agar'} = \&Emul; $DESCR{'agar'} = 'Agar (http://libagar.org/)'; < at >{$EMULDEPS{'agar'}} = qw( clock_win32 sdl opengl wgl freetype jpeg png winsock db4 mysql pthreads iconv gettext sndfile portaudio ); } ;1 Modified: trunk/BSDBuild/alsa.pm =================================================================== --- trunk/BSDBuild/alsa.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/alsa.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -81,23 81,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'alsa') { -return (0); -} -PmIfHDefined('HAVE_ALSA'); -PmLink('asound'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#alsa.include)'); -PmLibPath('$(#alsa.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -111,7 94,6 < at >< at > $DESCR{'alsa'} = 'ALSA (http://www.alsa-project.org)'; $TESTS{'alsa'} = \&Test; $EMUL{'alsa'} = \&Emul; -$LINK{'alsa'} = \&Link; $DEPS{'alsa'} = 'cc'; } Modified: trunk/BSDBuild/cocoa.pm =================================================================== --- trunk/BSDBuild/cocoa.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/cocoa.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -45,22 45,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'Cocoa') { -return (0); -} -PmIfHDefined('HAVE_COCOA'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#Cocoa.include)'); -PmLibPath('$(#Cocoa.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -73,7 57,6 < at >< at > { $DESCR{'cocoa'} = 'the Cocoa framework'; $TESTS{'cocoa'} = \&Test; -$LINK{'cocoa'} = \&Link; $EMUL{'cocoa'} = \&Emul; $DEPS{'cocoa'} = 'objc'; } Modified: trunk/BSDBuild/db4.pm =================================================================== --- trunk/BSDBuild/db4.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/db4.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -163,11 163,20 < at >< at > return (0); } sub Emul { my ($os, $osrel, $machine) = < at >_; MkEmulUnavail('DB4'); return (1); } BEGIN { $TESTS{'db4'} = \&Test; $DEPS{'db4'} = 'cc'; $DESCR{'db4'} = 'Berkeley DB 4.x'; $EMUL{'db4'} = \&Emul; } ;1 Modified: trunk/BSDBuild/edacious.pm =================================================================== --- trunk/BSDBuild/edacious.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/edacious.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -76,28 76,12 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var ne 'edacious' && $var ne 'es_core') { -return (0); -} -PmLink('es_core'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#edacious.include)'); -PmLibPath('$(#edacious.lib)'); -} -return (1); -} - BEGIN { $TESTS{'edacious'} = \&Test; $DESCR{'edacious'} = 'Edacious (http://edacious.hypertriton.com/)'; $DEPS{'edacious'} = 'cc,agar,agar-vg,agar-math'; $EMUL{'edacious'} = \&Emul; -$LINK{'edacious'} = \&Link; } ;1 Modified: trunk/BSDBuild/freesg.pm =================================================================== --- trunk/BSDBuild/freesg.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/freesg.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -71,45 71,15 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var eq 'freesg') { -PmLink('freesg'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#freesg.include)'); -PmLibPath('$(#freesg.lib)'); -} -return (1); -} -if ($var eq 'freesg_sk') { -PmLink('freesg_sk'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#freesg.include)'); -PmLibPath('$(#freesg.lib)'); -} -return (1); -} -if ($var eq 'freesg_pe') { -PmLink('freesg_pe'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#freesg.include)'); -PmLibPath('$(#freesg.lib)'); -} -return (1); -} - -return (0); -} - BEGIN { $TESTS{'freesg'} = \&Test; $DESCR{'freesg'} = 'FreeSG (http://FreeSG.org/)'; $DEPS{'freesg'} = 'cc,agar'; $EMUL{'freesg'} = \&Emul; -$LINK{'freesg'} = \&Link; < at >{$EMULDEPS{'freesg'}} = qw( agar ); } ;1 Modified: trunk/BSDBuild/freetype.pm =================================================================== --- trunk/BSDBuild/freetype.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/freetype.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -68,23 68,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'freetype') { -return (0); -} -PmIfHDefined('HAVE_FREETYPE'); -PmLink('freetype'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#freetype.include)'); -PmLibPath('$(#freetype.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -103,7 86,6 < at >< at > $DEPS{'freetype'} = 'cc'; $TESTS{'freetype'} = \&Test; $EMUL{'freetype'} = \&Emul; -$LINK{'freetype'} = \&Link; } ;1 Modified: trunk/BSDBuild/gettext.pm =================================================================== --- trunk/BSDBuild/gettext.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/gettext.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -93,11 93,21 < at >< at > MkEndif; } sub Emul { my ($os, $osrel, $machine) = < at >_; MkEmulUnavail('GETTEXT'); return (1); } BEGIN { $DESCR{'gettext'} = 'a gettext library in libc'; $TESTS{'gettext'} = \&Test; $DEPS{'gettext'} = 'cc'; $EMUL{'gettext'} = \&Emul; } ;1 Modified: trunk/BSDBuild/glu.pm =================================================================== --- trunk/BSDBuild/glu.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/glu.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -96,27 96,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'glu') { -return (0); -} -PmIfHDefined('HAVE_GLU'); -if ($EmulOS =~ /^windows/) { -PmLink('glu32'); -} else { -PmLink('GLU'); -} -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#GLU.include)'); -PmLibPath('$(#GLU.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -133,7 112,6 < at >< at > { $DESCR{'glu'} = 'GLU (http://www.opengl.org)'; $TESTS{'glu'} = \&Test; -$LINK{'glu'} = \&Link; $EMUL{'glu'} = \&Emul; $DEPS{'glu'} = 'cc,opengl,math'; } Modified: trunk/BSDBuild/glx.pm =================================================================== --- trunk/BSDBuild/glx.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/glx.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -60,22 60,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'glx') { -return (0); -} -PmIfHDefined('HAVE_GLX'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#GLX.include)'); -PmLibPath('$(#GLX.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -88,7 72,6 < at >< at > { $DESCR{'glx'} = 'the GLX interface'; $TESTS{'glx'} = \&Test; -$LINK{'glx'} = \&Link; $EMUL{'glx'} = \&Emul; $DEPS{'glx'} = 'cc,opengl,x11,math'; } Modified: trunk/BSDBuild/iconv.pm =================================================================== --- trunk/BSDBuild/iconv.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/iconv.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -129,11 129,21 < at >< at > MkEndif; } sub Emul { my ($os, $osrel, $machine) = < at >_; MkEmulUnavail('ICONV'); MkEmulUnavailSYS('ICONV_CONST'); return (1); } BEGIN { $DESCR{'iconv'} = 'iconv() in libc'; $TESTS{'iconv'} = \&Test; $DEPS{'iconv'} = 'cc'; $EMUL{'iconv'} = \&Emul; } ;1 Modified: trunk/BSDBuild/jpeg.pm =================================================================== --- trunk/BSDBuild/jpeg.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/jpeg.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -91,23 91,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'jpeg') { -return (0); -} -PmIfHDefined('HAVE_JPEG'); -PmLink('jpeg'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#jpeg.include)'); -PmLibPath('$(#jpeg.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -121,7 104,6 < at >< at > $DESCR{'jpeg'} = 'libjpeg (ftp://ftp.uu.net/graphics/jpeg/)'; $TESTS{'jpeg'} = \&Test; $EMUL{'jpeg'} = \&Emul; -$LINK{'jpeg'} = \&Link; $DEPS{'jpeg'} = 'cc'; } Modified: trunk/BSDBuild/mysql.pm =================================================================== --- trunk/BSDBuild/mysql.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/mysql.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -65,27 65,10 < at >< at > return (1); } -sub Link -{ -my $var = shift; - -if ($var eq 'mysqlclient') { -PmLink('mysqlclient'); - -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#libmysql.include)'); -PmLibPath('$(#libmysql.lib)'); -} -return (1); -} -return (0); -} - BEGIN { $TESTS{'mysql'} = \&Test; $DEPS{'mysql'} = 'cc'; -$LINK{'mysql'} = \&Link; $EMUL{'mysql'} = \&Emul; $DESCR{'mysql'} = 'MySQL (http://dev.mysql.com/)'; } Modified: trunk/BSDBuild/opengl.pm =================================================================== --- trunk/BSDBuild/opengl.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/opengl.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -130,27 130,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'opengl') { -return (0); -} -PmIfHDefined('HAVE_OPENGL'); -if ($EmulOS =~ /^windows/) { -PmLink('opengl32'); -} else { -PmLink('GL'); -} -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#gl.include)'); -PmLibPath('$(#gl.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -168,7 147,6 < at >< at > $DESCR{'opengl'} = 'OpenGL (http://www.opengl.org)'; $TESTS{'opengl'} = \&Test; $EMUL{'opengl'} = \&Emul; -$LINK{'opengl'} = \&Link; $DEPS{'opengl'} = 'cc'; } Modified: trunk/BSDBuild/png.pm =================================================================== --- trunk/BSDBuild/png.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/png.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -71,23 71,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'png') { -return (0); -} -PmIfHDefined('HAVE_PNG'); -PmLink('png'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#libpng.include)'); -PmLibPath('$(#libpng.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -105,7 88,6 < at >< at > $DESCR{'png'} = 'libpng (http://www.libpng.org)'; $EMUL{'png'} = \&Emul; $TESTS{'png'} = \&Test; -$LINK{'png'} = \&Link; $DEPS{'png'} = 'cc'; } Modified: trunk/BSDBuild/portaudio.pm =================================================================== --- trunk/BSDBuild/portaudio.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/portaudio.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -100,10 100,19 < at >< at > MkEndif; } sub Emul { my ($os, $osrel, $machine) = < at >_; MkEmulUnavail('PORTAUDIO'); return (1); } BEGIN { $TESTS{'portaudio'} = \&Test; $DEPS{'portaudio'} = 'cc,pthreads'; $DESCR{'portaudio'} = 'PortAudio (http://www.portaudio.com/)'; $EMUL{'portaudio'} = \&Emul; } ;1 Modified: trunk/BSDBuild/pthreads.pm =================================================================== --- trunk/BSDBuild/pthreads.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/pthreads.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -280,33 280,11 < at >< at > return (1); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'pthreads') { -return (0); -} -PmIfHDefined('HAVE_PTHREADS'); -if ($EmulOS =~ /^windows/) { -PmLink('pthreadVC2'); -} else { -PmLink('pthread'); -} -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#pthreads.include)'); -PmLibPath('$(#pthreads.lib)'); -} -PmEndif; -return (1); -} - BEGIN { $DESCR{'pthreads'} = 'POSIX threads'; $TESTS{'pthreads'} = \&TestPthreads; $EMUL{'pthreads'} = \&Emul; -$LINK{'pthreads'} = \&Link; $DEPS{'pthreads'} = 'cc'; } Modified: trunk/BSDBuild/sdl.pm =================================================================== --- trunk/BSDBuild/sdl.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/sdl.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -91,24 91,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'SDL' && $lib ne 'SDLmain') { -return (0); -} -PmIfHDefined('HAVE_SDL'); -PmLink('SDL'); -PmLink('SDLmain'); -if ($EmulEnv =~ /^cb-/) { -PmIncludePath('$(#sdl.include)'); -PmLibPath('$(#sdl.lib)'); -} -PmEndif; -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -126,7 108,6 < at >< at > $DESCR{'sdl'} = 'SDL (http://www.libsdl.org)'; $EMUL{'sdl'} = \&Emul; $TESTS{'sdl'} = \&Test; -$LINK{'sdl'} = \&Link; $DEPS{'sdl'} = 'cc'; } Modified: trunk/BSDBuild/sndfile.pm =================================================================== --- trunk/BSDBuild/sndfile.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/sndfile.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -59,11 59,20 < at >< at > return (0); } sub Emul { my ($os, $osrel, $machine) = < at >_; MkEmulUnavail('SNDFILE'); return (1); } BEGIN { $DESCR{'sndfile'} = 'libsndfile (http://www.mega-nerd.com/libsndfile/)'; $TESTS{'sndfile'} = \&Test; $DEPS{'sndfile'} = 'cc'; $EMUL{'sndfile'} = \&Emul; } ;1 Modified: trunk/BSDBuild/wgl.pm =================================================================== --- trunk/BSDBuild/wgl.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/wgl.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -59,16 59,6 < at >< at > return (0); } -sub Link -{ -my $lib = shift; - -if ($lib ne 'wgl') { -return (0); -} -return (1); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -86,7 76,6 < at >< at > $DESCR{'wgl'} = 'the WGL interface'; $TESTS{'wgl'} = \&Test; $EMUL{'wgl'} = \&Emul; -$LINK{'wgl'} = \&Link; $DEPS{'wgl'} = 'cc'; } Modified: trunk/BSDBuild/winsock.pm =================================================================== --- trunk/BSDBuild/winsock.pm2012-08-01 08:14:08 UTC (rev 978) trunk/BSDBuild/winsock.pm2012-08-01 12:02:59 UTC (rev 979) < at >< at > -23,18 23,6 < at >< at > # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. -sub Link -{ -my $lib = shift; - -if ($lib eq 'winsock' || - $lib eq 'ws2_32' || -$lib eq 'iphlpapi') { -return (1); -} -return (0); -} - sub Emul { my ($os, $osrel, $machine) = < at >_; < at >< at > -53,7 41,6 < at >< at > { $DESCR{'winsock'} = 'the WinSock interface'; $EMUL{'winsock'} = \&Emul; -$LINK{'winsock'} = \&Link; } ;1 Modified: trunk/build.proj.mk =================================================================== --- trunk/build.proj.mk2012-08-01 08:14:08 UTC (rev 978) trunk/build.proj.mk2012-08-01 12:02:59 UTC (rev 979) < at >< at > -41,7 41,8 < at >< at > PROJCONFIGDIR?= PROJNOCLEAN?=no -PROJFILES?=windows:vs2005:: PROJFILES?=windows:vs2005:: \ windows-xp:vs2005:: CLEANFILES =${PREMAKEOUT} Modified: trunk/mkconfigure.pl =================================================================== --- trunk/mkconfigure.pl2012-08-01 08:14:08 UTC (rev 978) trunk/mkconfigure.pl2012-08-01 12:02:59 UTC (rev 979) < at >< at > -69,6 69,7 < at >< at > my < at >Help = (); my $ConfigGuess = 'mk/config.guess'; my < at >TestDirs = ("$INSTALLDIR/BSDBuild"); my %EmulDepsTested = (); # Specify software package name sub package < at >< at > -334,11 335,18 < at >< at > } my $c; if ($EmulOS) { -unless (exists($EMUL{$t}) && - defined($EMUL{$t})) { -#print STDERR "Ignoring: $t\n"; -next DIRECTIVE; unless (exists($EMUL{$t}) && defined($EMUL{$t})) { print STDERR "Missing EMUL for $t\n"; exit(1); } if (exists($EMULDEPS{$t})) { foreach my $ed (< at >{$EMULDEPS{$t}}) { if (!exists($EmulDepsTested{$ed})) { test($ed); $EmulDepsTested{$ed} = 1; } } } $c = $EMUL{$t}; < at >args = ($EmulOS, $EmulOSRel, ''); } else { Modified: trunk/mkprojfiles.pl =================================================================== --- trunk/mkprojfiles.pl2012-08-01 08:14:08 UTC (rev 978) trunk/mkprojfiles.pl2012-08-01 12:02:59 UTC (rev 979) < at >< at > -119,13 119,7 < at >< at > } if ($links) { foreach my $ln (split(' ', $links)) { -my $handled = 0; -foreach my $fn (values %linkFn) { -if (&$fn($ln)) { $handled ; } -} -if (!$handled) { -print "tinsert(package.links,{\"$ln\"})\n"; -} print "tinsert(package.links,{\"$ln\"})\n"; } } if (exists($V{'SRCS'}) && $V{'SRCS'}) { [Less]