Menu
▾
▴
lincity-commits — Commits to the lincity CVS archive will be posted to this list.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(20) |
Sep
(29) |
Oct
|
Nov
|
Dec
(41) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(9) |
Feb
(5) |
Mar
(21) |
Apr
|
May
(18) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(17) |
Nov
|
Dec
(1) |
| 2003 |
Jan
(15) |
Feb
(11) |
Mar
(9) |
Apr
(7) |
May
(17) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(2) |
Oct
(15) |
Nov
(14) |
Dec
(2) |
| 2004 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(35) |
Jul
(12) |
Aug
(24) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2005 |
Jan
(4) |
Feb
(5) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: maximilian t. <ch...@fe...> - 2006-09-28 17:18:53
|
hi, ive just visited your lincity project page and i would like to support your free/open simcity like project. at the moment iam producing a lot of 3d objects just for nothing - for training. so i thought i could produce something usefull. maybe. iam used to autocad, maya and some others, so i wanted to know what kind of 3d/2d data you are using for your buildings and graphics? and of course, if you still need some graphics? regards, max |
|
From: Gregory S. <gre...@us...> - 2005-03-27 20:19:21
|
Update of /cvsroot/lincity/lincity/autopackage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21935 Modified Files: default.apspec.in Log Message: Got upgraded version from Taj. Index: default.apspec.in =================================================================== RCS file: /cvsroot/lincity/lincity/autopackage/default.apspec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** default.apspec.in 27 Mar 2005 20:16:33 -0000 1.1 --- default.apspec.in 27 Mar 2005 20:19:08 -0000 1.2 *************** *** 2,11 **** RootName: @lincity.sourceforge.net/lincity:$SOFTWAREVERSION DisplayName: Lincity Simulation Game ! DisplayName[es]: Estrategia Juego de Lincity ShortName: lincity Maintainer: Lincity Developers Packager: Taj Morton <ta...@wi...> ! Summary: City Simulation Game ! Summary[es]: Juego Ciudad Simulación SoftwareVersion: @VERSION@ URL: http://lincity.sourceforge.net --- 2,11 ---- RootName: @lincity.sourceforge.net/lincity:$SOFTWAREVERSION DisplayName: Lincity Simulation Game ! DisplayName[es]: Lincity, Juego de simulación ShortName: lincity Maintainer: Lincity Developers Packager: Taj Morton <ta...@wi...> ! Summary: Build & maintain a city/country ! Summary[es]: Construya y mantenga una ciudad o un país SoftwareVersion: @VERSION@ URL: http://lincity.sourceforge.net *************** *** 22,32 **** [Description:es] ! Lincity es un juego ciudad simulación. Le requieren construir y mantener ! una ciudad. Usted debe alimentar, contener, proporciona trabajos y las ! mercancías para sus residentes. Usted puede construir una economía ! sostenible con la ayuda de energía reanudable y del reciclaje, o usted ! puede ir para se rompió y la estructura alcanza gran altura rápida y ! súbitamente para escaparse de una contaminación montada y planeta muerto ! de hambre recurso, está hasta usted. [BuildPrepare] --- 22,33 ---- [Description:es] ! Usted debe construir y mantener una ciudad. Debe proporcionar comida, hogar, ! trabajo y mercancías a sus residentes. Puede construir una economía ! sustentable con la ayuda de las energías renovables y el reciclaje, o puede ! gastarlo todo y construir cohetes para escapar de un planeta lleno de polución ! y vacío de recursos, es su decisión. Debido a los recursos finitos disponibles ! en cualquier parte, este no es un juego que pueda dejar por largos períodos de ! tiempo. Este juego es parecido al juego comercial de simulación, que lleva un ! nombre simil. [BuildPrepare] *************** *** 35,40 **** mkdir -p $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION mkdir -p $build_root/share/icons ! cp ABOUT-NLS Acknowledgements CHANGES COPYRIGHT COPYING README ! README.profiling TODO \ $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION cp lincity.png lincity.desktop $build_root/share/icons --- 36,41 ---- mkdir -p $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION mkdir -p $build_root/share/icons ! cp ABOUT-NLS Acknowledgements CHANGES COPYRIGHT COPYING README \ ! README.profiling TODO $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION cp lincity.png lincity.desktop $build_root/share/icons *************** *** 46,49 **** --- 47,53 ---- [Prepare] + require @libpng.org/libpng 3 + require @xfree86.org/xlib 6 + require @zlib.org/zlib 1 [Install] *************** *** 51,54 **** --- 55,61 ---- installMan 6 man/man6/* + outputStatus "$intl_INSTALLING_DATA" + copyFiles share/lincity share/locale "$PREFIX/share" + copyFiles share/doc "$PREFIX/share" *************** *** 56,62 **** installDesktop "Games" share/icons/lincity.desktop - outputStatus "$intl_INSTALLING_DATA" - copyFiles share/lincity share/locale "$PREFIX/share" - [Uninstall] uninstallFromLog --- 63,66 ---- |
|
From: Gregory S. <gre...@us...> - 2005-03-27 20:16:45
|
Update of /cvsroot/lincity/lincity/autopackage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20411 Added Files: default.apspec.in Log Message: Forgot to commit this. --- NEW FILE: default.apspec.in --- [Meta] RootName: @lincity.sourceforge.net/lincity:$SOFTWAREVERSION DisplayName: Lincity Simulation Game DisplayName[es]: Estrategia Juego de Lincity ShortName: lincity Maintainer: Lincity Developers Packager: Taj Morton <ta...@wi...> Summary: City Simulation Game Summary[es]: Juego Ciudad Simulación SoftwareVersion: @VERSION@ URL: http://lincity.sourceforge.net PackageVersion: 1 License: GNU General Public License, Version 2 AutopackageTarget: 1.0 [Description] Lincity is a city simulation game. You are required to build and maintain a city. You must feed, house, provide jobs and goods for your residents. You can build a sustainable economy with the help of renewable energy and recycling, or you can go for broke and build rockets to escape from a pollution ridden and resource starved planet, it's up to you. [Description:es] Lincity es un juego ciudad simulación. Le requieren construir y mantener una ciudad. Usted debe alimentar, contener, proporciona trabajos y las mercancías para sus residentes. Usted puede construir una economía sostenible con la ayuda de energía reanudable y del reciclaje, o usted puede ir para se rompió y la estructura alcanza gran altura rápida y súbitamente para escaparse de una contaminación montada y planeta muerto de hambre recurso, está hasta usted. [BuildPrepare] export APBUILD_DISABLE_BOGUS_DETECTOR=1 prepareBuild --enable-binreloc mkdir -p $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION mkdir -p $build_root/share/icons cp ABOUT-NLS Acknowledgements CHANGES COPYRIGHT COPYING README README.profiling TODO \ $build_root/share/doc/$SHORTNAME-$SOFTWAREVERSION cp lincity.png lincity.desktop $build_root/share/icons [BuildUnprepare] unprepareBuild [Imports] echo '*' | import [Prepare] [Install] installExe bin/* installMan 6 man/man6/* copyFiles share/doc "$PREFIX/share" installIcon share/icons/lincity.png installDesktop "Games" share/icons/lincity.desktop outputStatus "$intl_INSTALLING_DATA" copyFiles share/lincity share/locale "$PREFIX/share" [Uninstall] uninstallFromLog |
|
From: Gregory S. <gre...@us...> - 2005-02-10 03:54:23
|
Update of /cvsroot/lincity/lincity/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22063 Modified Files: delete_cruft.bat Log Message: Delete more cruft for windows packaging. Index: delete_cruft.bat =================================================================== RCS file: /cvsroot/lincity/lincity/tools/delete_cruft.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** delete_cruft.bat 1 Aug 2004 16:54:39 -0000 1.11 --- delete_cruft.bat 10 Feb 2005 03:54:02 -0000 1.12 *************** *** 57,60 **** --- 57,64 ---- deltree /y locale deltree /y gettext-w32 + deltree /y autopackage + erase lincity.png + erase lincity.desktop + deltree /y doc rem ------------------------------------------------- |
|
From: Gregory S. <gre...@us...> - 2005-02-10 03:46:02
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18749 Modified Files: configure.ac Log Message: Update version number (again). Index: configure.ac =================================================================== RCS file: /cvsroot/lincity/lincity/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.ac 10 Feb 2005 03:44:10 -0000 1.17 --- configure.ac 10 Feb 2005 03:45:53 -0000 1.18 *************** *** 2,6 **** dnl Initialization ! AC_INIT([Lincity],[1.13.2],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AC_AIX --- 2,6 ---- dnl Initialization ! AC_INIT([Lincity],[1.13.3],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AC_AIX |
|
From: Gregory S. <gre...@us...> - 2005-02-10 03:44:23
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18138 Modified Files: configure.ac Log Message: Update version number. Index: configure.ac =================================================================== RCS file: /cvsroot/lincity/lincity/configure.ac,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** configure.ac 21 Jan 2005 04:56:38 -0000 1.16 --- configure.ac 10 Feb 2005 03:44:10 -0000 1.17 *************** *** 2,6 **** dnl Initialization ! AC_INIT([Lincity],[1.13.1],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AC_AIX --- 2,6 ---- dnl Initialization ! AC_INIT([Lincity],[1.13.2],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AC_AIX |
|
From: Gregory S. <gre...@us...> - 2005-02-04 03:43:16
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15184 Modified Files: CHANGES confw32.h geometry.c lincity.dsp Log Message: Updates for 1.13.3. Index: CHANGES =================================================================== RCS file: /cvsroot/lincity/lincity/CHANGES,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CHANGES 1 Aug 2004 16:17:13 -0000 1.9 --- CHANGES 4 Feb 2005 03:43:07 -0000 1.10 *************** *** 1,3 **** --- 1,9 ---- + 1.13.3 + ****** + - Fix problem loading iso-8859-2 font + - Revise pollution code for tech > 1000 + - Add Taj's autopackage & binreloc patch + 1.13.2 (win32 only) ******************* Index: confw32.h =================================================================== RCS file: /cvsroot/lincity/lincity/confw32.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** confw32.h 1 Aug 2004 16:17:13 -0000 1.10 --- confw32.h 4 Feb 2005 03:43:07 -0000 1.11 *************** *** 93,95 **** /* Version number of package */ ! #define VERSION "1.13.2" --- 93,95 ---- /* Version number of package */ ! #define VERSION "1.13.3" Index: geometry.c =================================================================== RCS file: /cvsroot/lincity/lincity/geometry.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** geometry.c 3 Jul 2004 06:08:49 -0000 1.24 --- geometry.c 4 Feb 2005 03:43:07 -0000 1.25 *************** *** 188,200 **** scr->time_for_year.w = 0; /* unused */ ! scr->status_message_1.x = scr->main_win.x; scr->status_message_1.y = STATUS_MESSAGE_1_Y; scr->status_message_1.h = 8; ! scr->status_message_1.w = scr->main_win.w; ! scr->status_message_2.x = scr->main_win.x; scr->status_message_2.y = STATUS_MESSAGE_2_Y; scr->status_message_2.h = 8; ! scr->status_message_2.w = scr->main_win.w; scr->mini_map.x = MINI_SCREEN_X; --- 188,200 ---- scr->time_for_year.w = 0; /* unused */ ! scr->status_message_1.x = scr->main_win.x + 32; scr->status_message_1.y = STATUS_MESSAGE_1_Y; scr->status_message_1.h = 8; ! scr->status_message_1.w = scr->main_win.w - 32; ! scr->status_message_2.x = scr->main_win.x + 32; scr->status_message_2.y = STATUS_MESSAGE_2_Y; scr->status_message_2.h = 8; ! scr->status_message_2.w = scr->main_win.w - 32; scr->mini_map.x = MINI_SCREEN_X; *************** *** 319,325 **** scr.time_for_year.y = TIME_FOR_YEAR_Y + (scr.client_h - 480); scr.status_message_1.y = STATUS_MESSAGE_1_Y + (scr.client_h - 480); ! scr.status_message_1.w = scr.main_win.w; scr.status_message_2.y = STATUS_MESSAGE_2_Y + (scr.client_h - 480); ! scr.status_message_2.w = scr.main_win.w; scr.date.y = scr.main_win.y + scr.main_win.h + 16; --- 319,325 ---- scr.time_for_year.y = TIME_FOR_YEAR_Y + (scr.client_h - 480); scr.status_message_1.y = STATUS_MESSAGE_1_Y + (scr.client_h - 480); ! scr.status_message_1.w = scr.main_win.w - 32; scr.status_message_2.y = STATUS_MESSAGE_2_Y + (scr.client_h - 480); ! scr.status_message_2.w = scr.main_win.w - 32; scr.date.y = scr.main_win.y + scr.main_win.h + 16; Index: lincity.dsp =================================================================== RCS file: /cvsroot/lincity/lincity/lincity.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lincity.dsp 1 Aug 2004 16:17:13 -0000 1.3 --- lincity.dsp 4 Feb 2005 03:43:07 -0000 1.4 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,49 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /W3 /GX /O2 /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c ! # SUBTRACT CPP /nologo /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 70,74 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 71,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /W3 /Gm /GX /ZI /Od /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /FD /GZ /c ! # SUBTRACT CPP /nologo /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 349,352 **** --- 351,358 ---- # Begin Source File + SOURCE=.\confw32.h + # End Source File + # Begin Source File + SOURCE=.\getopt.h # End Source File |
|
From: Gregory S. <gre...@us...> - 2005-02-04 03:31:01
|
Update of /cvsroot/lincity/lincity/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12888 Modified Files: light_industry.c Log Message: Fix bug in computing polution change when tech_level > 1000. Index: light_industry.c =================================================================== RCS file: /cvsroot/lincity/lincity/modules/light_industry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** light_industry.c 1 Aug 2004 02:55:26 -0000 1.5 --- light_industry.c 4 Feb 2005 03:30:53 -0000 1.6 *************** *** 163,167 **** tmp_pol = (float)(INDUSTRY_L_POL_PER_GOOD * goods); ! if (tech_level > 1000) { double d; d = (tech_level - 1000); --- 163,167 ---- tmp_pol = (float)(INDUSTRY_L_POL_PER_GOOD * goods); ! if (tech_level > 1000) { double d; d = (tech_level - 1000); *************** *** 171,175 **** tmp_pol -= (tmp_pol * d); if (tmp_pol < 0) ! tmp_pol == 0; } --- 171,175 ---- tmp_pol -= (tmp_pol * d); if (tmp_pol < 0) ! tmp_pol = 0; } |
|
From: Taj M. <taj...@us...> - 2005-01-30 16:55:34
|
Update of /cvsroot/lincity/lincity/doc/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27135 Modified Files: index.asc Log Message: Updated webpage to new stable version (1.12.1) and added link to Autopackage <http://www.autopackage.org>. Index: index.asc =================================================================== RCS file: /cvsroot/lincity/lincity/doc/web/index.asc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.asc 4 Aug 2004 21:08:03 -0000 1.2 --- index.asc 30 Jan 2005 16:55:25 -0000 1.3 *************** *** 8,15 **** Microsoft Windows. The current stable release of lincity ! is version 1.12.0 (Dec. 18, 2003). The current development (unstable) release of lincity is ! version 1.13.1 (July 9, 2003). icon:splash.jpg[Image of lincity splash screen] --- 8,15 ---- Microsoft Windows. The current stable release of lincity ! is version 1.12.1 (Aug. 13, 2004). The current development (unstable) release of lincity is ! version 1.13.1 (July 7, 2003). icon:splash.jpg[Image of lincity splash screen] *************** *** 115,118 **** --- 115,119 ---- A special thanks to all of the UNIX binary maintainers out there! + - Autopackage: http://prdownloads.sourceforge.net/lincity/lincity-1.13.1.x86.package?download[] - Cygwin: http://sourceforge.net/projects/cygwin-ports/[] - FreeBSD: http://www.freshports.org/games/lincity/[] *************** *** 120,127 **** - IRIX: http://www.nekochan.net/downloads/[] - Linux/Debian: http://packages.debian.org/lincity[] - - - Linux/Mandrake RPM: http://wildgardenseed.com/Taj/mandrake-rpms/RPMS/Games/Strategy/lincity-1.12-0.pre55-2mdk.i586.rpm[] - Linux/RPM: http://rpmfind.net/linux/rpm2html/search.php?query=lincity[] - - Linux/Slackware: http://www.wildgardenseed.com/Taj/slackware-packages/lincity-1.12pre55-i386-1taj/[] - OS X: http://fink.sourceforge.net/pdb/package.php/lincity[] --- 121,125 ---- |
|
From: Gregory S. <gre...@us...> - 2005-01-24 05:52:56
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10014 Modified Files: screen.c Log Message: Fix bug in loading iso-8859-2 font on windows. Index: screen.c =================================================================== RCS file: /cvsroot/lincity/lincity/screen.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** screen.c 1 Aug 2004 02:55:25 -0000 1.45 --- screen.c 24 Jan 2005 05:52:48 -0000 1.46 *************** *** 792,796 **** FILE *inf; /* main_font */ ! if ((inf = fopen (fontfile, "r")) == 0) HandleError ("Can't open the font file", FATAL); for (i = 0; i < 256 * 8; i++) --- 792,796 ---- FILE *inf; /* main_font */ ! if ((inf = fopen (fontfile, "rb")) == 0) HandleError ("Can't open the font file", FATAL); for (i = 0; i < 256 * 8; i++) |
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5249 Modified Files: Makefile.am acinclude.m4 aclocal.m4 config.h.in config.sh configure configure.ac fileutil.c Added Files: lincity.desktop lincity.png Log Message: Add Taj Morton's autopackage and binreloc stuff. --- NEW FILE: lincity.desktop --- [Desktop Entry] Type=Application Exec=xlincity Icon=lincity.png Comment=City Simulation Game Name=Lincity Terminal=false Categories=Game;StrategyGame; Encoding=UTF-8 --- NEW FILE: lincity.png --- PNG SÑ@U¡*õöm®b à~S ""}¿«=,9ëïß ÞÛY·íêWì ؾüç¥Öæ_)àÛv£¾*ÿ¦ÀFæÌiî7 ¹mU Index: Makefile.am =================================================================== RCS file: /cvsroot/lincity/lincity/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.am 29 Aug 2004 21:11:15 -0000 1.23 --- Makefile.am 21 Jan 2005 04:56:19 -0000 1.24 *************** *** 4,10 **** ### DEFS = @DEFS@ -DLIBDIR=\"${pkgdatadir}\" ! DEFS = @DEFS@ X_DEFS = -DLC_X11=1 -Wall ! SVGA_DEFS = -DSVGALIB=1 SUBDIRS = m4 intl po modules --- 4,10 ---- ### DEFS = @DEFS@ -DLIBDIR=\"${pkgdatadir}\" ! DEFS = @DEFS@ $(BINRELOC_CFLAGS) X_DEFS = -DLC_X11=1 -Wall ! SVGA_DEFS = -DSVGALIB=1 SUBDIRS = m4 intl po modules *************** *** 174,183 **** liblcx_la_SHORTNAME = lcx liblcx_la_SOURCES = $(gui_SOURCES) lcx11.c ! liblcx_la_LIBADD = @X_LIBS@ -lXext -lX11 -lpng -lz -lm liblcx_la_CPPFLAGS = $(X_DEFS) liblcsvga_la_SHORTNAME = lcsvga liblcsvga_la_SOURCES = $(gui_SOURCES) lcsvga.c ! liblcsvga_la_LIBADD = @SVGA_LIBS@ -lvgagl -lvga -lpng -lz -lm liblcsvga_la_CPPFLAGS = $(SVGA_DEFS) --- 174,183 ---- liblcx_la_SHORTNAME = lcx liblcx_la_SOURCES = $(gui_SOURCES) lcx11.c ! liblcx_la_LIBADD = @X_LIBS@ -lXext -lX11 -lpng -lz -lm $(BINRELOC_LIBS) liblcx_la_CPPFLAGS = $(X_DEFS) liblcsvga_la_SHORTNAME = lcsvga liblcsvga_la_SOURCES = $(gui_SOURCES) lcsvga.c ! liblcsvga_la_LIBADD = @SVGA_LIBS@ -lvgagl -lvga -lpng -lz -lm $(BINRELOC_LIBS) liblcsvga_la_CPPFLAGS = $(SVGA_DEFS) Index: acinclude.m4 =================================================================== RCS file: /cvsroot/lincity/lincity/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acinclude.m4 29 Aug 2004 21:11:15 -0000 1.2 --- acinclude.m4 21 Jan 2005 04:56:20 -0000 1.3 *************** *** 65,69 **** if test "x$br_cv_binreloc" = "xyes"; then BINRELOC_CFLAGS="-DENABLE_BINRELOC" ! AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) if test "x$enable_binreloc_threads" = "xyes"; then AC_CHECK_LIB([pthread], [pthread_getspecific]) --- 65,69 ---- if test "x$br_cv_binreloc" = "xyes"; then BINRELOC_CFLAGS="-DENABLE_BINRELOC" ! #AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) if test "x$enable_binreloc_threads" = "xyes"; then AC_CHECK_LIB([pthread], [pthread_getspecific]) *************** *** 86,90 **** AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?]) else ! BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREAD=0" AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?]) fi --- 86,90 ---- AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?]) else ! BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?]) fi Index: aclocal.m4 =================================================================== RCS file: /cvsroot/lincity/lincity/aclocal.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** aclocal.m4 29 Aug 2004 21:11:15 -0000 1.9 --- aclocal.m4 21 Jan 2005 04:56:36 -0000 1.10 *************** *** 1,3 **** ! # generated automatically by aclocal 1.8.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 --- 1,3 ---- ! # generated automatically by aclocal 1.9.4 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 *************** *** 5942,5946 **** # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) # AM_SET_CURRENT_AUTOMAKE_VERSION --- 5942,5946 ---- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION *************** *** 5949,5953 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.8.2])]) # AM_AUX_DIR_EXPAND --- 5949,5953 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.4])]) # AM_AUX_DIR_EXPAND *************** *** 6017,6021 **** # AM_CONDITIONAL -*- Autoconf -*- ! # Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 6017,6021 ---- # AM_CONDITIONAL -*- Autoconf -*- ! # Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 6054,6062 **** AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional "$1" was never defined. ! Usually this means the macro was only invoked conditionally.]) fi])]) ! # serial 6 -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 --- 6054,6062 ---- AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([[conditional "$1" was never defined. ! Usually this means the macro was only invoked conditionally.]]) fi])]) ! # serial 7 -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 *************** *** 6145,6149 **** for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 6145,6151 ---- for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 6173,6179 **** ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings ! # (even with -Werror). So we grep stderr for any message ! # that says an option was ignored. ! if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break --- 6175,6186 ---- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings ! # or remarks (even with -Werror). So we grep stderr for any message ! # that says an option was ignored or not supported. ! # When given -MP, icc 7.0 and 7.1 complain thusly: ! # icc: Command line warning: ignoring option '-M'; no argument required ! # The diagnosis changed in icc 8.0: ! # icc: Command line remark: option '-MP' not supported ! if (grep 'ignoring option' conftest.err || ! grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break *************** *** 6221,6225 **** # Generate code to set up dependency tracking. -*- Autoconf -*- ! # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 6228,6233 ---- # Generate code to set up dependency tracking. -*- Autoconf -*- ! # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ! # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 6257,6281 **** continue fi ! grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue ! # Extract the definition of DEP_FILES from the Makefile without ! # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` ! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ! # We invoke sed twice because it is the simplest approach to ! # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' ! /^DEP_FILES = .*\\\\$/ { ! s/^DEP_FILES = // ! :loop ! s/\\\\$// ! p ! n ! /\\\\$/ b loop ! p ! } ! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. --- 6265,6283 ---- continue fi ! # Extract the definition of DEPDIR, am__include, and am__quote ! # from the Makefile without running `make'. ! DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n 's/^U = //p' < "$mf"` ! # Find all dependency output files, they are included files with ! # $(DEPDIR) in their names. We invoke sed twice because it is the ! # simplest approach to changing $(DEPDIR) to its actual value in the ! # expansion. ! for file in `sed -n " ! s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. *************** *** 6308,6312 **** # your package does certain things. But this isn't really a big deal. ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. --- 6310,6314 ---- # your package does certain things. But this isn't really a big deal. ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. *************** *** 6384,6388 **** AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) - AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP --- 6386,6389 ---- *************** *** 6393,6397 **** AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl ! _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], --- 6394,6400 ---- AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl ! _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ! [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ! [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], *************** *** 6626,6638 **** # Do not use -m 0755 and let people choose whatever they expect by # setting umask. AC_DEFUN([AM_PROG_MKDIR_P], ! [if mkdir -p -- . 2>/dev/null; then ! # Keeping the `.' argument allows $(mkdir_p) to be used without ! # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) ! # where $(somedir) is conditionally defined. ! # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more ! # expensive solution, as it forces Make to start a sub-shell.) ! mkdir_p='mkdir -p -- .' else # On NextStep and OpenStep, the `mkdir' command does not --- 6629,6657 ---- # Do not use -m 0755 and let people choose whatever they expect by # setting umask. + # + # We cannot accept any implementation of `mkdir' that recognizes `-p'. + # Some implementations (such as Solaris 8's) are not thread-safe: if a + # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' + # concurrently, both version can detect that a/ is missing, but only + # one can create it and the other will error out. Consequently we + # restrict ourselves to GNU make (using the --version option ensures + # this.) AC_DEFUN([AM_PROG_MKDIR_P], ! [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ! # We used to keeping the `.' as first argument, in order to ! # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) ! # where $(somedir) is conditionally defined. However this is wrong ! # for two reasons: ! # 1. if the package is installed by a user who cannot write `.' ! # make install will fail, ! # 2. the above comment should most certainly read ! # $(mkdir_p) $(DESTDIR)$(somedir) ! # so it does not work when $(somedir) is undefined and ! # $(DESTDIR) is not. ! # To support the latter case, we have to write ! # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ! # so the `.' trick is pointless. ! mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not *************** *** 6640,6644 **** # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--; do test -d $d && rmdir $d --- 6659,6663 ---- # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--version; do test -d $d && rmdir $d *************** *** 6800,6803 **** --- 6819,6930 ---- AC_SUBST([INSTALL_STRIP_PROGRAM])]) + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # 02111-1307, USA. + + # serial 1 + + + # _AM_PROG_TAR(FORMAT) + # -------------------- + # Check how to create a tarball in format FORMAT. + # FORMAT should be one of `v7', `ustar', or `pax'. + # + # Substitute a variable $(am__tar) that is a command + # writing to stdout a FORMAT-tarball containing the directory + # $tardir. + # tardir=directory && $(am__tar) > result.tar + # + # Substitute a variable $(am__untar) that extract such + # a tarball read from stdin. + # $(am__untar) < result.tar + AC_DEFUN([_AM_PROG_TAR], + [# Always define AMTAR for backward compatibility. + AM_MISSING_PROG([AMTAR], [tar]) + m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) + AC_MSG_CHECKING([how to create a $1 tar archive]) + # Loop over all known methods to create a tar archive until one works. + _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + # Do not fold the above two line into one, because Tru64 sh and + # Solaris sh will not grok spaces in the rhs of `-'. + for _am_tool in $_am_tools + do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + m4_include([m4/codeset.m4]) m4_include([m4/gettext.m4]) Index: config.h.in =================================================================== RCS file: /cvsroot/lincity/lincity/config.h.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config.h.in 29 Aug 2004 21:11:16 -0000 1.9 --- config.h.in 21 Jan 2005 04:56:36 -0000 1.10 *************** *** 15,21 **** #undef DEFAULT_LIBDIR - /* Use binary relocation? */ - #undef ENABLE_BINRELOC - /* Define to 1 if translation of program messages to the user's native language is requested. */ --- 15,18 ---- Index: config.sh =================================================================== RCS file: /cvsroot/lincity/lincity/config.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.sh 29 Aug 2004 21:11:16 -0000 1.3 --- config.sh 21 Jan 2005 04:56:36 -0000 1.4 *************** *** 1,7 **** ! ## Here is how i do it in ver 1.13 ! aclocal -I m4 libtoolize --force ! automake --add-missing autoconf autoheader --- 1,11 ---- ! ## Here is how i do it in ver 1.13, using these versions: ! ## autoconf (GNU Autoconf) 2.59 ! ## automake (GNU automake) 1.9.4 ! ## ltmain.sh (GNU libtool) 1.5.2 ! ! aclocal-1.9 -I m4 libtoolize --force ! automake-1.9 --add-missing autoconf autoheader Index: configure =================================================================== RCS file: /cvsroot/lincity/lincity/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure 29 Aug 2004 21:11:16 -0000 1.21 --- configure 21 Jan 2005 04:56:36 -0000 1.22 *************** *** 466,470 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL with_gzip BINRELOC_CFLAGS BINRELOC_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LCLIBS PROGS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS LTLIBOBJS' ac_subst_files='' --- 466,470 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL with_gzip BINRELOC_CFLAGS BINRELOC_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LCLIBS PROGS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS LTLIBOBJS' ac_subst_files='' [...3574 lines suppressed...] --- 29368,29386 ---- continue fi ! # Extract the definition of DEPDIR, am__include, and am__quote ! # from the Makefile without running `make'. ! DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n 's/^U = //p' < "$mf"` ! # Find all dependency output files, they are included files with ! # $(DEPDIR) in their names. We invoke sed twice because it is the ! # simplest approach to changing $(DEPDIR) to its actual value in the ! # expansion. ! for file in `sed -n " ! s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. Index: configure.ac =================================================================== RCS file: /cvsroot/lincity/lincity/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** configure.ac 29 Aug 2004 21:11:16 -0000 1.15 --- configure.ac 21 Jan 2005 04:56:38 -0000 1.16 *************** *** 4,8 **** --- 4,10 ---- AC_INIT([Lincity],[1.13.1],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) + AC_AIX AM_INIT_AUTOMAKE + AC_PROG_LIBTOOL AC_ARG_WITH(gzip, [ --with-gzip use gzip]) *************** *** 12,16 **** AC_ISC_POSIX AC_PROG_CC - AC_AIX AC_PROG_MAKE_SET AC_PROG_LIBTOOL --- 14,17 ---- Index: fileutil.c =================================================================== RCS file: /cvsroot/lincity/lincity/fileutil.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** fileutil.c 29 Aug 2004 21:11:17 -0000 1.24 --- fileutil.c 21 Jan 2005 04:56:38 -0000 1.25 *************** *** 351,355 **** #ifdef ENABLE_BINRELOC datadir_buf=br_strcat(DATADIR,"/lincity"); ! printf(datadir_buf); snprintf (filename_buf, LC_PATH_MAX, "%s%c%s", datadir_buf, PATH_SLASH, searchfile); --- 351,355 ---- #ifdef ENABLE_BINRELOC datadir_buf=br_strcat(DATADIR,"/lincity"); ! snprintf (filename_buf, LC_PATH_MAX, "%s%c%s", datadir_buf, PATH_SLASH, searchfile); |
|
From: Gregory S. <gre...@us...> - 2005-01-20 06:04:37
|
Update of /cvsroot/lincity/lincity/autopackage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32145/autopackage Log Message: Directory /cvsroot/lincity/lincity/autopackage added to the repository |
|
From: Gregory S. <gre...@us...> - 2004-12-16 15:30:02
|
Update of /cvsroot/lincity/lincity/archive/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24631 Added Files: confinep.hlp stats.hlp tover.hlp Log Message: Moved a couple of the help files here, to the archive, because they don't have equivalent in the current help system. --- NEW FILE: confinep.hlp --- text -1 30 This button is used to confine the text -1 40 mouse pointer within the X-window. text -1 60 Press the button again to allow the text -1 70 mouse pointer to leave the window. text -1 100 There are two main reasons why you text -1 110 would want to confine the pointer. text 10 140 1. text -1 150 Your X server can only display 256 text -1 160 colours ( 8 bbp ) and you don't want text -1 170 the display to keep flashing at you. text 10 200 2. text -1 210 You want to play 'full screen'. text -1 230 To play 'full screen', start the game text -1 240 with 'xlincity -b', change your screen text -1 250 resolution to 640x480 (ctrl-alt-numpad+ text -1 260 for linux YMMV). Then confine the pointer text -1 270 and move the mouse to each edge. text -1 280 Hey presto - full screen. --- NEW FILE: stats.hlp --- text -1 30 This is the stats window. text -1 60 The stats window shows 8 variables: text 20 80 1. Population - this shows the population text 60 90 in your residences. This figure does not text 60 100 include the homeless. text 20 120 2. % Starving - this shows the percentage text 60 130 of your popluation that are starving. text 20 150 3. Foodstore - this shows the total food text 60 160 held in markets. text 20 180 4. % u-ployed - this shows the percentage text 60 190 of your population that is unemployed. text 20 210 5. Tech Level - this shows your technology text 60 220 level. The scale is the percentage text 60 230 chance of a successful rocket launch. text 60 240 (A good a measure as any other, I feel.) text 20 260 6. un-nat deaths - this shows the number text 60 270 of people that died through starvation text 60 280 or from pollution, in the last month. text 20 300 7. Rockets - this shows the number of text 60 310 *successful* launches in a row, over text 60 320 the total number of launches. text 20 340 8. Peoplepool - this shows the homeless text 60 350 population. Don't worry about this text 60 360 figure at the moment, it has little text 60 370 effect. --- NEW FILE: tover.hlp --- text -1 35 This is the OVERWRITE transport button. text -1 50 When active (green) it allows you to text -1 60 overwrite one type of transport with another. text -1 70 You can *upgrade* or *downgrade* existing text -1 80 transport. text -1 100 Remember to turn this off (red), once text -1 110 you have finished. text -1 130 The cost for using this option is the text -1 140 same as if you had bulldozed the existing text -1 150 transport, and built the new one, by hand. |
|
From: Gregory S. <gre...@us...> - 2004-12-16 15:28:47
|
Update of /cvsroot/lincity/lincity/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24371/modules Modified Files: modules.h Log Message: Add include directives to a couple files. Remove obsolete help files. Index: modules.h =================================================================== RCS file: /cvsroot/lincity/lincity/modules/modules.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules.h 14 Jul 2004 04:23:42 -0000 1.1 --- modules.h 16 Dec 2004 15:28:34 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- #define __modules_h__ + #include "../lcconfig.h" #include "../lctypes.h" #include "../lcintl.h" |
|
From: Gregory S. <gre...@us...> - 2004-12-16 15:28:47
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24371 Modified Files: market.c pbar.c Log Message: Add include directives to a couple files. Remove obsolete help files. Index: market.c =================================================================== RCS file: /cvsroot/lincity/lincity/market.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** market.c 14 Jul 2004 04:23:42 -0000 1.6 --- market.c 16 Dec 2004 15:28:34 -0000 1.7 *************** *** 4,7 **** --- 4,8 ---- * Lincity is copyright (c) I J Peters 1995-1997, (c) Greg Sharp 1997-2001. * ---------------------------------------------------------------------- */ + #include "lcconfig.h" #include <stdio.h> #include <stdlib.h> *************** *** 12,16 **** #include "mps.h" #include "lcintl.h" - #include "lcconfig.h" #include "market.h" --- 13,16 ---- Index: pbar.c =================================================================== RCS file: /cvsroot/lincity/lincity/pbar.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pbar.c 1 Aug 2004 02:55:25 -0000 1.11 --- pbar.c 16 Dec 2004 15:28:34 -0000 1.12 *************** *** 322,363 **** /* check for help with pbars */ activate_help ("pbar.hlp"); - - #if defined (commentout) - if (mouse_in_rect (&scr.pbar_pop,x,y)) { - activate_help ("pbar-pop.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_tech,x,y)) { - activate_help ("pbar-tech.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_food,x,y)) { - activate_help ("pbar-food.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_jobs,x,y)) { - activate_help ("pbar-jobs.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_money,x,y)) { - activate_help ("pbar-money.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_coal,x,y)) { - activate_help ("pbar-coal.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_goods,x,y)) { - activate_help ("pbar-goods.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_ore,x,y)) { - activate_help ("pbar-ore.hlp"); - return; - } - else if (mouse_in_rect (&scr.pbar_steel,x,y)) { - activate_help ("pbar-steel.hlp"); - return; - } - #endif } --- 322,324 ---- |
|
From: Gregory S. <gre...@us...> - 2004-12-16 15:28:46
|
Update of /cvsroot/lincity/lincity/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24371/help Removed Files: confinep.hlp error.hlp infowin.hlp msb-money.hlp pbar-coal.hlp pbar-food.hlp pbar-goods.hlp pbar-jobs.hlp pbar-money.hlp pbar-ore.hlp pbar-pop.hlp pbar-steel.hlp pbar-tech.hlp readme.hlp readme2.hlp stats.hlp tover.hlp Log Message: Add include directives to a couple files. Remove obsolete help files. --- confinep.hlp DELETED --- --- error.hlp DELETED --- --- infowin.hlp DELETED --- --- msb-money.hlp DELETED --- --- pbar-coal.hlp DELETED --- --- pbar-food.hlp DELETED --- --- pbar-goods.hlp DELETED --- --- pbar-jobs.hlp DELETED --- --- pbar-money.hlp DELETED --- --- pbar-ore.hlp DELETED --- --- pbar-pop.hlp DELETED --- --- pbar-steel.hlp DELETED --- --- pbar-tech.hlp DELETED --- --- readme.hlp DELETED --- --- readme2.hlp DELETED --- --- stats.hlp DELETED --- --- tover.hlp DELETED --- |
|
From: Gregory S. <gre...@us...> - 2004-12-16 15:17:16
|
Update of /cvsroot/lincity/lincity/archive/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21927/archive/help Log Message: Directory /cvsroot/lincity/lincity/archive/help added to the repository |
|
From: Gregory S. <gre...@us...> - 2004-08-29 21:14:04
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6627 Added Files: prefix.c prefix.h Log Message: Add Taj Morton's relocation patch. --- NEW FILE: prefix.c --- /* * BinReloc - a library for creating relocatable executables * Written by: Mike Hearn <mi...@th...> * Hongli Lai <h....@ch...> * http://autopackage.org/ * * This source code is public domain. You can relicense this code * under whatever license you want. * * NOTE: if you're using C++ and are getting "undefined reference * to br_*", try renaming prefix.c to prefix.cpp */ /* WARNING, BEFORE YOU MODIFY PREFIX.C: * * If you make changes to any of the functions in prefix.c, you MUST * change the BR_NAMESPACE macro (in prefix.h). * This way you can avoid symbol table conflicts with other libraries * that also happen to use BinReloc. * * Example: * #define BR_NAMESPACE(funcName) foobar_ ## funcName * --> expands br_locate to foobar_br_locate */ #ifndef _PREFIX_C_ #define _PREFIX_C_ #ifdef HAVE_CONFIG_H #include "config.h" #endif #ifndef BR_PTHREADS /* Change 1 to 0 if you don't want pthread support */ #define BR_PTHREADS 1 #endif /* BR_PTHREADS */ #include <stdlib.h> #include <stdio.h> #include <limits.h> #include <string.h> #include "prefix.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #undef NULL #define NULL ((void *) 0) #ifdef __GNUC__ #define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;} #else #define br_return_val_if_fail(expr,val) if (!(expr)) return val #endif /* __GNUC__ */ #ifdef ENABLE_BINRELOC #include <sys/types.h> #include <sys/stat.h> #include <sys/param.h> #include <unistd.h> /** * br_locate: * symbol: A symbol that belongs to the app/library you want to locate. * Returns: A newly allocated string containing the full path of the * app/library that func belongs to, or NULL on error. This * string should be freed when not when no longer needed. * * Finds out to which application or library symbol belongs, then locate * the full path of that application or library. * Note that symbol cannot be a pointer to a function. That will not work. * * Example: * --> main.c * #include "prefix.h" * #include "libfoo.h" * * int main (int argc, char *argv[]) { * printf ("Full path of this app: %s\n", br_locate (&argc)); * libfoo_start (); * return 0; * } * * --> libfoo.c starts here * #include "prefix.h" * * void libfoo_start () { * --> "" is a symbol that belongs to libfoo (because it's called * --> from libfoo_start()); that's why this works. * printf ("libfoo is located in: %s\n", br_locate ("")); * } */ char * br_locate (void *symbol) { char line[5000]; FILE *f; char *path; br_return_val_if_fail (symbol != NULL, NULL); f = fopen ("/proc/self/maps", "r"); if (!f) return NULL; while (!feof (f)) { unsigned long start, end; if (!fgets (line, sizeof (line), f)) continue; if (!strstr (line, " r-xp ") || !strchr (line, '/')) continue; sscanf (line, "%lx-%lx ", &start, &end); if (symbol >= (void *) start && symbol < (void *) end) { char *tmp; size_t len; /* Extract the filename; it is always an absolute path */ path = strchr (line, '/'); /* Get rid of the newline */ tmp = strrchr (path, '\n'); if (tmp) *tmp = 0; /* Get rid of "(deleted)" */ len = strlen (path); if (len > 10 && strcmp (path + len - 10, " (deleted)") == 0) { tmp = path + len - 10; *tmp = 0; } fclose(f); return strdup (path); } } fclose (f); return NULL; } /** * br_locate_prefix: * symbol: A symbol that belongs to the app/library you want to locate. * Returns: A prefix. This string should be freed when no longer needed. * * Locates the full path of the app/library that symbol belongs to, and return * the prefix of that path, or NULL on error. * Note that symbol cannot be a pointer to a function. That will not work. * * Example: * --> This application is located in /usr/bin/foo * br_locate_prefix (&argc); --> returns: "/usr" */ char * br_locate_prefix (void *symbol) { char *path, *prefix; br_return_val_if_fail (symbol != NULL, NULL); path = br_locate (symbol); if (!path) return NULL; prefix = br_extract_prefix (path); free (path); return prefix; } /** * br_prepend_prefix: * symbol: A symbol that belongs to the app/library you want to locate. * path: The path that you want to prepend the prefix to. * Returns: The new path, or NULL on error. This string should be freed when no * longer needed. * * Gets the prefix of the app/library that symbol belongs to. Prepend that prefix to path. * Note that symbol cannot be a pointer to a function. That will not work. * * Example: * --> The application is /usr/bin/foo * br_prepend_prefix (&argc, "/share/foo/data.png"); --> Returns "/usr/share/foo/data.png" */ char * br_prepend_prefix (void *symbol, char *path) { char *tmp, *newpath; br_return_val_if_fail (symbol != NULL, NULL); br_return_val_if_fail (path != NULL, NULL); tmp = br_locate_prefix (symbol); if (!tmp) return NULL; if (strcmp (tmp, "/") == 0) newpath = strdup (path); else newpath = br_strcat (tmp, path); /* Get rid of compiler warning ("br_prepend_prefix never used") */ if (0) br_prepend_prefix (NULL, NULL); free (tmp); return newpath; } #endif /* ENABLE_BINRELOC */ /* Pthread stuff for thread safetiness */ #if BR_PTHREADS #include <pthread.h> static pthread_key_t br_thread_key; static pthread_once_t br_thread_key_once = PTHREAD_ONCE_INIT; static void br_thread_local_store_fini () { char *specific; specific = (char *) pthread_getspecific (br_thread_key); if (specific) { free (specific); pthread_setspecific (br_thread_key, NULL); } pthread_key_delete (br_thread_key); br_thread_key = 0; } static void br_str_free (void *str) { if (str) free (str); } static void br_thread_local_store_init () { if (pthread_key_create (&br_thread_key, br_str_free) == 0) atexit (br_thread_local_store_fini); } #else /* BR_PTHREADS */ static char *br_last_value = (char *) NULL; static void br_free_last_value () { if (br_last_value) free (br_last_value); } #endif /* BR_PTHREADS */ /** * br_thread_local_store: * str: A dynamically allocated string. * Returns: str. This return value must not be freed. * * Store str in a thread-local variable and return str. The next * you run this function, that variable is freed too. * This function is created so you don't have to worry about freeing * strings. * * Example: * char *foo; * foo = thread_local_store (strdup ("hello")); --> foo == "hello" * foo = thread_local_store (strdup ("world")); --> foo == "world"; "hello" is now freed. */ const char * br_thread_local_store (char *str) { #if BR_PTHREADS char *specific; pthread_once (&br_thread_key_once, br_thread_local_store_init); specific = (char *) pthread_getspecific (br_thread_key); br_str_free (specific); pthread_setspecific (br_thread_key, str); #else /* BR_PTHREADS */ static int initialized = 0; if (!initialized) { atexit (br_free_last_value); initialized = 1; } if (br_last_value) free (br_last_value); br_last_value = str; #endif /* BR_PTHREADS */ return (const char *) str; } /** * br_strcat: * str1: A string. * str2: Another string. * Returns: A newly-allocated string. This string should be freed when no longer needed. * * Concatenate str1 and str2 to a newly allocated string. */ char * br_strcat (const char *str1, const char *str2) { char *result; size_t len1, len2; if (!str1) str1 = ""; if (!str2) str2 = ""; len1 = strlen (str1); len2 = strlen (str2); result = (char *) malloc (len1 + len2 + 1); memcpy (result, str1, len1); memcpy (result + len1, str2, len2); result[len1 + len2] = '\0'; return result; } /* Emulates glibc's strndup() */ static char * br_strndup (char *str, size_t size) { char *result = (char *) NULL; size_t len; br_return_val_if_fail (str != (char *) NULL, (char *) NULL); len = strlen (str); if (!len) return strdup (""); if (size > len) size = len; result = (char *) calloc (sizeof (char), len + 1); memcpy (result, str, size); return result; } /** * br_extract_dir: * path: A path. * Returns: A directory name. This string should be freed when no longer needed. * * Extracts the directory component of path. Similar to g_dirname() or the dirname * commandline application. * * Example: * br_extract_dir ("/usr/local/foobar"); --> Returns: "/usr/local" */ char * br_extract_dir (const char *path) { char *end, *result; br_return_val_if_fail (path != (char *) NULL, (char *) NULL); end = strrchr (path, '/'); if (!end) return strdup ("."); while (end > path && *end == '/') end--; result = br_strndup ((char *) path, end - path + 1); if (!*result) { free (result); return strdup ("/"); } else return result; } /** * br_extract_prefix: * path: The full path of an executable or library. * Returns: The prefix, or NULL on error. This string should be freed when no longer needed. * * Extracts the prefix from path. This function assumes that your executable * or library is installed in an LSB-compatible directory structure. * * Example: * br_extract_prefix ("/usr/bin/gnome-panel"); --> Returns "/usr" * br_extract_prefix ("/usr/local/lib/libfoo.so"); --> Returns "/usr/local" * br_extract_prefix ("/usr/local/libfoo.so"); --> Returns "/usr" */ char * br_extract_prefix (const char *path) { char *end, *tmp, *result; br_return_val_if_fail (path != (char *) NULL, (char *) NULL); if (!*path) return strdup ("/"); end = strrchr (path, '/'); if (!end) return strdup (path); tmp = br_strndup ((char *) path, end - path); if (!*tmp) { free (tmp); return strdup ("/"); } end = strrchr (tmp, '/'); if (!end) return tmp; result = br_strndup (tmp, end - tmp); free (tmp); if (!*result) { free (result); result = strdup ("/"); } return result; } #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* _PREFIX_C */ --- NEW FILE: prefix.h --- /* * BinReloc - a library for creating relocatable executables * Written by: Mike Hearn <mi...@th...> * Hongli Lai <h....@ch...> * http://autopackage.org/ * * This source code is public domain. You can relicense this code * under whatever license you want. * * See http://autopackage.org/docs/binreloc/ for * more information and how to use this. * * NOTE: if you're using C++ and are getting "undefined reference * to br_*", try renaming prefix.c to prefix.cpp */ #ifndef _PREFIX_H_ #define _PREFIX_H_ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ /* WARNING, BEFORE YOU MODIFY PREFIX.C: * * If you make changes to any of the functions in prefix.c, you MUST * change the BR_NAMESPACE macro. * This way you can avoid symbol table conflicts with other libraries * that also happen to use BinReloc. * * Example: * #define BR_NAMESPACE(funcName) foobar_ ## funcName * --> expands br_locate to foobar_br_locate */ #undef BR_NAMESPACE #define BR_NAMESPACE(funcName) funcName #ifdef ENABLE_BINRELOC #define br_thread_local_store BR_NAMESPACE(br_thread_local_store) #define br_locate BR_NAMESPACE(br_locate) #define br_locate_prefix BR_NAMESPACE(br_locate_prefix) #define br_prepend_prefix BR_NAMESPACE(br_prepend_prefix) #ifndef BR_NO_MACROS /* These are convience macros that replace the ones usually used in Autoconf/Automake projects */ #undef SELFPATH #undef PREFIX #undef PREFIXDIR #undef BINDIR #undef SBINDIR #undef DATADIR #undef LIBDIR #undef LIBEXECDIR #undef ETCDIR #undef SYSCONFDIR #undef CONFDIR #undef LOCALEDIR #define SELFPATH (br_thread_local_store (br_locate ((void *) ""))) #define PREFIX (br_thread_local_store (br_locate_prefix ((void *) ""))) #define PREFIXDIR (br_thread_local_store (br_locate_prefix ((void *) ""))) #define BINDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/bin"))) #define SBINDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/sbin"))) #define DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) #define LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib"))) #define LIBEXECDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/libexec"))) #define ETCDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/etc"))) #define SYSCONFDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/etc"))) #define CONFDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/etc"))) #define LOCALEDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale"))) #endif /* BR_NO_MACROS */ /* The following functions are used internally by BinReloc and shouldn't be used directly in applications. */ const char *br_thread_local_store (char *str); char *br_locate (void *symbol); char *br_locate_prefix (void *symbol); char *br_prepend_prefix (void *symbol, char *path); #endif /* ENABLE_BINRELOC */ /* These macros and functions are not guarded by the ENABLE_BINRELOC * macro because they are portable. You can use these functions. */ #define br_strcat BR_NAMESPACE(br_strcat) #define br_extract_dir BR_NAMESPACE(br_extract_dir) #define br_extract_prefix BR_NAMESPACE(br_extract_prefix) #ifndef BR_NO_MACROS /* Convenience functions for concatenating paths */ #define BR_SELFPATH(suffix) (br_thread_local_store (br_strcat (SELFPATH, suffix))) #define BR_PREFIX(suffix) (br_thread_local_store (br_strcat (PREFIX, suffix))) #define BR_PREFIXDIR(suffix) (br_thread_local_store (br_strcat (BR_PREFIX, suffix))) #define BR_BINDIR(suffix) (br_thread_local_store (br_strcat (BINDIR, suffix))) #define BR_SBINDIR(suffix) (br_thread_local_store (br_strcat (SBINDIR, suffix))) #define BR_DATADIR(suffix) (br_thread_local_store (br_strcat (DATADIR, suffix))) #define BR_LIBDIR(suffix) (br_thread_local_store (br_strcat (LIBDIR, suffix))) #define BR_LIBEXECDIR(suffix) (br_thread_local_store (br_strcat (LIBEXECDIR, suffix))) #define BR_ETCDIR(suffix) (br_thread_local_store (br_strcat (ETCDIR, suffix))) #define BR_SYSCONFDIR(suffix) (br_thread_local_store (br_strcat (SYSCONFDIR, suffix))) #define BR_CONFDIR(suffix) (br_thread_local_store (br_strcat (CONFDIR, suffix))) #define BR_LOCALEDIR(suffix) (br_thread_local_store (br_strcat (LOCALEDIR, suffix))) #endif char *br_strcat (const char *str1, const char *str2); char *br_extract_dir (const char *path); char *br_extract_prefix(const char *path); #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* _PREFIX_H_ */ |
|
From: Gregory S. <gre...@us...> - 2004-08-29 21:11:26
|
Update of /cvsroot/lincity/lincity/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5220/tools Modified Files: build.txt Log Message: Add Taj Morton's patch for relocatable binaries. Index: build.txt =================================================================== RCS file: /cvsroot/lincity/lincity/tools/build.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** build.txt 1 Aug 2004 16:19:47 -0000 1.14 --- build.txt 29 Aug 2004 21:11:17 -0000 1.15 *************** *** 3,7 **** ----------------------- ! Both of these seem to work with "config.sh" Tool versions (linux): --- 3,14 ---- ----------------------- ! For lincity version 1.13, I'm using this: ! ! automake (GNU automake) 1.8.2 ! autoconf (GNU Autoconf) 2.59 ! gettext (GNU gettext) 0.11.5 ! ! ! Both of these seem to work with "config.sh", lincity version 1.12. Tool versions (linux): |
|
From: Gregory S. <gre...@us...> - 2004-08-29 21:11:26
|
Update of /cvsroot/lincity/lincity/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5220/po Modified Files: ca.po it.po Log Message: Add Taj Morton's patch for relocatable binaries. Index: ca.po =================================================================== RCS file: /cvsroot/lincity/lincity/po/ca.po,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ca.po 27 Jun 2004 03:56:40 -0000 1.10 --- ca.po 29 Aug 2004 21:11:17 -0000 1.11 *************** *** 7,12 **** msgstr "" "Project-Id-Version: Lincity 1.12pre51\n" ! "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2004-06-26 21:35-0600\n" "PO-Revision-Date: 2003-02-23 01:00-0500\n" "Last-Translator: <gre...@ge...>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: Lincity 1.12pre51\n" ! "POT-Creation-Date: 2004-07-31 20:46-0600\n" [...2376 lines suppressed...] ! #: modules/tip.c:121 msgid "Last Month" msgstr "" ! #: modules/tip.c:122 msgid "Tons" msgstr "" ! #: modules/tip.c:123 msgid "Percent" msgstr "" ! #: modules/tip.c:126 #, c-format msgid "% Filled" msgstr "" ! #: modules/university.c:75 msgid "Tech Produced" msgstr "" Index: it.po =================================================================== RCS file: /cvsroot/lincity/lincity/po/it.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** it.po 27 Jun 2004 03:56:40 -0000 1.5 --- it.po 29 Aug 2004 21:11:17 -0000 1.6 *************** *** 6,11 **** msgstr "" "Project-Id-Version: lincity 1.12pre52\n" ! "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2004-06-26 21:35-0600\n" "PO-Revision-Date: 2003-03-26 00:39-0500\n" "Last-Translator: kkk <kkk@kkk>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: lincity 1.12pre52\n" ! "POT-Creation-Date: 2004-07-31 20:46-0600\n" [...2408 lines suppressed...] ! #: modules/tip.c:121 msgid "Last Month" msgstr "" ! #: modules/tip.c:122 msgid "Tons" msgstr "" ! #: modules/tip.c:123 msgid "Percent" msgstr "" ! #: modules/tip.c:126 #, c-format msgid "% Filled" msgstr "" ! #: modules/university.c:75 msgid "Tech Produced" msgstr "" |
|
From: Gregory S. <gre...@us...> - 2004-08-14 17:38:45
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17049 Added Files: Tag: lincity-1_12_1 lincity.dsp lincity.dsw Log Message: Add msvc project files to cvs. --- NEW FILE: lincity.dsp --- # Microsoft Developer Studio Project File - Name="lincity" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=lincity - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "lincity.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "lincity.mak" CFG="lincity - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "lincity - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "lincity - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "lincity - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "gettext-w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib gnu_gettext.lib /nologo /subsystem:windows /machine:I386 /libpath:"gettext-w32" !ELSEIF "$(CFG)" == "lincity - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "gettext-w32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 gnu_gettext.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"gettext-w32" !ENDIF # Begin Target # Name "lincity - Win32 Release" # Name "lincity - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\cliglobs.c # End Source File # Begin Source File SOURCE=.\dialbox.c # End Source File # Begin Source File SOURCE=.\engine.c # End Source File # Begin Source File SOURCE=.\fileutil.c # End Source File # Begin Source File SOURCE=.\geometry.c # End Source File # Begin Source File SOURCE=.\lchelp.c # End Source File # Begin Source File SOURCE=.\lclib.c # End Source File # Begin Source File SOURCE=.\lcwin32.c # End Source File # Begin Source File SOURCE=.\ldsvgui.c # End Source File # Begin Source File SOURCE=.\ldsvguts.c # End Source File # Begin Source File SOURCE=.\lintypes.c # End Source File # Begin Source File SOURCE=.\main.c # End Source File # Begin Source File SOURCE=.\market.c # End Source File # Begin Source File SOURCE=.\module_buttons.c # End Source File # Begin Source File SOURCE=.\mouse.c # End Source File # Begin Source File SOURCE=.\mps.c # End Source File # Begin Source File SOURCE=.\pbar.c # End Source File # Begin Source File SOURCE=.\pixmap.c # End Source File # Begin Source File SOURCE=.\power.c # End Source File # Begin Source File SOURCE=.\screen.c # End Source File # Begin Source File SOURCE=.\shrglobs.c # End Source File # Begin Source File SOURCE=.\shrtypes.c # End Source File # Begin Source File SOURCE=.\simulate.c # End Source File # Begin Source File SOURCE=.\splash.c # End Source File # Begin Source File SOURCE=.\stats.c # End Source File # Begin Source File SOURCE=.\timer.c # End Source File # Begin Source File SOURCE=.\transport.c # End Source File # Begin Source File SOURCE=.\winmain.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project --- NEW FILE: lincity.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "lincity"=.\lincity.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### |
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10328 Modified Files: Tag: lincity-1_12_1 CHANGES Makefile.in aclocal.m4 config.h.in config.sh configure configure.ac confw32.h Log Message: Changes for version 1.12.1 packaging. Index: CHANGES =================================================================== RCS file: /cvsroot/lincity/lincity/CHANGES,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** CHANGES 29 Nov 2003 05:47:15 -0000 1.8 --- CHANGES 14 Aug 2004 16:58:31 -0000 1.8.2.1 *************** *** 1,3 **** --- 1,8 ---- + 1.12.1 + ****** + - Bug fix for chashes on changing power grid. + + 1.12 **** Index: Makefile.in =================================================================== RCS file: /cvsroot/lincity/lincity/Attic/Makefile.in,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** Makefile.in 20 Nov 2003 06:18:34 -0000 1.20 --- Makefile.in 14 Aug 2004 16:58:31 -0000 1.20.2.1 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.3 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.7 from Makefile.am. # @configure_input@ *************** *** 333,340 **** installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive ! DIST_COMMON = README $(noinst_HEADERS) ABOUT-NLS COPYING Makefile.am \ ! Makefile.in TODO acinclude.m4 aclocal.m4 config.guess \ ! config.h.in config.sub configure configure.ac depcomp \ ! install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(lincity_SOURCES) $(EXTRA_lincity_SOURCES) $(picedit_SOURCES) $(EXTRA_picedit_SOURCES) $(xlincity_SOURCES) $(EXTRA_xlincity_SOURCES) $(xpicedit_SOURCES) $(EXTRA_xpicedit_SOURCES) --- 333,340 ---- installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive ! DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \ ! $(srcdir)/configure ABOUT-NLS COPYING Makefile.am TODO \ ! acinclude.m4 aclocal.m4 config.guess config.h.in config.sub \ ! configure configure.ac depcomp install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(lincity_SOURCES) $(EXTRA_lincity_SOURCES) $(picedit_SOURCES) $(EXTRA_picedit_SOURCES) $(xlincity_SOURCES) $(EXTRA_xlincity_SOURCES) $(xpicedit_SOURCES) $(EXTRA_xpicedit_SOURCES) *************** *** 453,463 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport.Po@am__quote@ - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi --- 453,460 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi *************** *** 470,474 **** @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi --- 467,471 ---- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi *************** *** 624,630 **** tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ --- 621,633 ---- tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ *************** *** 774,778 **** sed 'h;s/./=/g;p;x;p;x' distuninstallcheck: ! cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ --- 777,781 ---- sed 'h;s/./=/g;p;x;p;x' distuninstallcheck: ! @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ *************** *** 783,791 **** exit 1; } >&2 distcleancheck: distclean ! if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ --- 786,794 ---- exit 1; } >&2 distcleancheck: distclean ! @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ *************** *** 817,821 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 820,824 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 828,833 **** distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-hdr distclean-tags dvi: dvi-recursive --- 831,839 ---- distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf ./$(DEPDIR) ! ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ ! distclean-tags dvi: dvi-recursive *************** *** 851,855 **** maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic --- 857,864 ---- maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf $(top_srcdir)/autom4te.cache ! -rm -rf ./$(DEPDIR) ! ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 876,883 **** clean-binPROGRAMS clean-generic clean-recursive ctags \ ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-hdr distclean-recursive distclean-tags distcleancheck \ ! distdir distuninstallcheck dvi dvi-am dvi-recursive info \ ! info-am info-recursive install install-am install-binPROGRAMS \ install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-local \ --- 885,892 ---- clean-binPROGRAMS clean-generic clean-recursive ctags \ ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-compile distclean-generic distclean-hdr \ ! distclean-recursive distclean-tags distcleancheck distdir \ ! distuninstallcheck dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-binPROGRAMS \ install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-local \ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/lincity/lincity/aclocal.m4,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** aclocal.m4 7 May 2003 19:10:21 -0000 1.6 --- aclocal.m4 14 Aug 2004 16:58:31 -0000 1.6.2.1 *************** *** 1,3 **** ! # generated automatically by aclocal 1.7.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,3 ---- ! # generated automatically by aclocal 1.7.7 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 34,38 **** # your package does certain things. But this isn't really a big deal. ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. --- 34,38 ---- # your package does certain things. But this isn't really a big deal. ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. *************** *** 52,63 **** # 02111-1307, USA. ! # serial 9 ! ! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ! # written in clear, in which case automake, when reading aclocal.m4, ! # will think it sees a *use*, and therefore will trigger all it's ! # C support machinery. Also note that it means that autoscan, seeing ! # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! AC_PREREQ([2.54]) --- 52,56 ---- # 02111-1307, USA. ! # serial 10 AC_PREREQ([2.54]) *************** *** 188,192 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.7.3])]) # Helper functions for option handling. -*- Autoconf -*- --- 181,185 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.7.7])]) # Helper functions for option handling. -*- Autoconf -*- *************** *** 570,573 **** --- 563,573 ---- cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_$1_dependencies_compiler_type=none *************** *** 576,585 **** fi for depmode in $am_compiler_list; do # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. ! echo '#include "conftest.h"' > conftest.c ! echo 'int i;' > conftest.h ! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in --- 576,592 ---- fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. ! : > sub/conftest.c ! for i in 1 2 3 4 5 6; do ! echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h ! done ! echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in *************** *** 599,607 **** # handle `-M -o', and we need to detect this. if depmode=$depmode \ ! source=conftest.c object=conftest.o \ ! depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ >/dev/null 2>conftest.err && ! grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings --- 606,615 ---- # handle `-M -o', and we need to detect this. if depmode=$depmode \ ! source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ! depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && ! grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ! grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings *************** *** 738,742 **** # Check to see how 'make' treats includes. -*- Autoconf -*- ! # Copyright (C) 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 746,750 ---- # Check to see how 'make' treats includes. -*- Autoconf -*- ! # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 763,768 **** [am_make=${MAKE-make} cat > confinc << 'END' ! doit: @echo done END # If we don't find an include directive, just comment out the code. --- 771,777 ---- [am_make=${MAKE-make} cat > confinc << 'END' ! am__doit: @echo done + .PHONY: am__doit END # If we don't find an include directive, just comment out the code. *************** *** 792,798 **** fi fi ! AC_SUBST(am__include) ! AC_SUBST(am__quote) ! AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) --- 801,807 ---- fi fi ! AC_SUBST([am__include]) ! AC_SUBST([am__quote]) ! AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) Index: config.h.in =================================================================== RCS file: /cvsroot/lincity/lincity/config.h.in,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** config.h.in 26 Feb 2003 05:50:48 -0000 1.6 --- config.h.in 14 Aug 2004 16:58:31 -0000 1.6.2.1 *************** *** 242,248 **** direction of stack growth for your system; otherwise it will be automatically deduced at run-time. ! STACK_DIRECTION > 0 => grows toward higher addresses ! STACK_DIRECTION < 0 => grows toward lower addresses ! STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION --- 242,248 ---- direction of stack growth for your system; otherwise it will be automatically deduced at run-time. ! STACK_DIRECTION > 0 => grows toward higher addresses ! STACK_DIRECTION < 0 => grows toward lower addresses ! STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION *************** *** 269,275 **** #undef const ! /* Define as `__inline' if that's what the C compiler calls it, or to nothing ! if it is not supported. */ #undef inline /* Define to `long' if <sys/types.h> does not define. */ --- 269,277 ---- #undef const ! /* Define to `__inline__' or `__inline' if that's what the C compiler ! calls it, or to nothing if 'inline' is not supported under any name. */ ! #ifndef __cplusplus #undef inline + #endif /* Define to `long' if <sys/types.h> does not define. */ Index: config.sh =================================================================== RCS file: /cvsroot/lincity/lincity/config.sh,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** config.sh 5 Sep 2001 22:04:50 -0000 1.2 --- config.sh 14 Aug 2004 16:58:31 -0000 1.2.2.1 *************** *** 1,4 **** ! aclocal ! automake --add-missing --foreign Makefile autoconf autoheader --- 1,6 ---- ! # aclocal ! aclocal-1.7 ! # automake --add-missing --foreign Makefile ! automake-1.7 --add-missing --foreign Makefile autoconf autoheader Index: configure =================================================================== RCS file: /cvsroot/lincity/lincity/configure,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** configure 20 Nov 2003 06:18:34 -0000 1.16 --- configure 14 Aug 2004 16:58:31 -0000 1.16.2.1 *************** *** 1,10 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57 for Lincity 1.12.0. # # Report bugs to <lin...@li...>. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. [...7193 lines suppressed...] sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 12477,12484 **** as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } --- 13544,13551 ---- as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } Index: configure.ac =================================================================== RCS file: /cvsroot/lincity/lincity/configure.ac,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** configure.ac 20 Nov 2003 04:33:57 -0000 1.10 --- configure.ac 14 Aug 2004 16:58:32 -0000 1.10.2.1 *************** *** 4,8 **** dnl AC_INIT dnl AM_INIT_AUTOMAKE(lincity,1.12pre50) ! AC_INIT([Lincity],[1.12.0],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AM_INIT_AUTOMAKE --- 4,8 ---- dnl AC_INIT dnl AM_INIT_AUTOMAKE(lincity,1.12pre50) ! AC_INIT([Lincity],[1.12.1],[lin...@li...],[lincity]) AC_CONFIG_SRCDIR([colour.pal]) AM_INIT_AUTOMAKE Index: confw32.h =================================================================== RCS file: /cvsroot/lincity/lincity/confw32.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** confw32.h 20 Nov 2003 04:33:57 -0000 1.9 --- confw32.h 14 Aug 2004 16:58:32 -0000 1.9.2.1 *************** *** 93,95 **** /* Version number of package */ ! #define VERSION "1.12.0" --- 93,95 ---- /* Version number of package */ ! #define VERSION "1.12.1" |
|
From: Gregory S. <gre...@us...> - 2004-08-14 16:58:41
|
Update of /cvsroot/lincity/lincity/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10328/m4 Modified Files: Tag: lincity-1_12_1 Makefile.in Log Message: Changes for version 1.12.1 packaging. Index: Makefile.in =================================================================== RCS file: /cvsroot/lincity/lincity/m4/Attic/Makefile.in,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.in 7 May 2003 19:10:22 -0000 1.2 --- Makefile.in 14 Aug 2004 16:58:32 -0000 1.2.2.1 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.3 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.7 from Makefile.am. # @configure_input@ *************** *** 146,154 **** EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 subdir = m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in all: all-am --- 146,155 ---- EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 subdir = m4 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am *************** *** 203,207 **** installdirs: - install: install-am install-exec: install-exec-am --- 204,207 ---- *************** *** 223,227 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 223,227 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 233,236 **** --- 233,237 ---- distclean: distclean-am + -rm -f Makefile distclean-am: clean-am distclean-generic *************** *** 255,258 **** --- 256,260 ---- maintainer-clean: maintainer-clean-am + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic |
|
From: Gregory S. <gre...@us...> - 2004-08-14 16:58:41
|
Update of /cvsroot/lincity/lincity/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10328/po Modified Files: Tag: lincity-1_12_1 ca.po it.po lincity.pot Log Message: Changes for version 1.12.1 packaging. Index: ca.po =================================================================== RCS file: /cvsroot/lincity/lincity/po/ca.po,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** ca.po 20 Nov 2003 06:18:35 -0000 1.8 --- ca.po 14 Aug 2004 16:58:32 -0000 1.8.2.1 *************** *** 7,11 **** msgstr "" "Project-Id-Version: Lincity 1.12pre51\n" ! "POT-Creation-Date: 2003-11-20 00:48-0500\n" "PO-Revision-Date: 2003-02-23 01:00-0500\n" "Last-Translator: <gre...@ge...>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: Lincity 1.12pre51\n" ! "POT-Creation-Date: 2004-08-14 11:57-0400\n" "PO-Revision-Date: 2003-02-23 01:00-0500\n" [...1257 lines suppressed...] ! #: mps.c:1527 msgid "Shanties" msgstr "" ! #: mps.c:1529 msgid "Unn Dths" msgstr "" ! #: mps.c:1530 msgid "Unemp %" msgstr "" ! #: mps.c:1531 msgid "Starv %" msgstr "" ! #: mps.c:1662 #, c-format msgid "For year %04d" Index: it.po =================================================================== RCS file: /cvsroot/lincity/lincity/po/it.po,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** it.po 20 Nov 2003 06:18:35 -0000 1.3 --- it.po 14 Aug 2004 16:58:32 -0000 1.3.2.1 *************** *** 6,10 **** msgstr "" "Project-Id-Version: lincity 1.12pre52\n" ! "POT-Creation-Date: 2003-11-20 00:48-0500\n" "PO-Revision-Date: 2003-03-26 00:39-0500\n" "Last-Translator: kkk <kkk@kkk>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: lincity 1.12pre52\n" ! "POT-Creation-Date: 2004-08-14 11:57-0400\n" "PO-Revision-Date: 2003-03-26 00:39-0500\n" [...1268 lines suppressed...] ! #: mps.c:1527 msgid "Shanties" msgstr "" ! #: mps.c:1529 msgid "Unn Dths" msgstr "" ! #: mps.c:1530 msgid "Unemp %" msgstr "" ! #: mps.c:1531 msgid "Starv %" msgstr "" ! #: mps.c:1662 #, c-format msgid "For year %04d" Index: lincity.pot =================================================================== RCS file: /cvsroot/lincity/lincity/po/lincity.pot,v retrieving revision 1.33 retrieving revision 1.33.2.1 diff -C2 -d -r1.33 -r1.33.2.1 *** lincity.pot 20 Nov 2003 06:18:35 -0000 1.33 --- lincity.pot 14 Aug 2004 16:58:32 -0000 1.33.2.1 *************** *** 8,12 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-11-20 00:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 8,12 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2004-08-14 11:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" [...1253 lines suppressed...] ! #: mps.c:1527 msgid "Shanties" msgstr "" ! #: mps.c:1529 msgid "Unn Dths" msgstr "" ! #: mps.c:1530 msgid "Unemp %" msgstr "" ! #: mps.c:1531 msgid "Starv %" msgstr "" ! #: mps.c:1662 #, c-format msgid "For year %04d" |
|
From: Corey K. <imm...@us...> - 2004-08-08 07:58:07
|
Update of /cvsroot/lincity/lincity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4818 Modified Files: Tag: lincity-1_12_1 engine.c mps.c Log Message: Fix mps-related crash bug; closes #1001818 Index: engine.c =================================================================== RCS file: /cvsroot/lincity/lincity/engine.c,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** engine.c 29 Nov 2003 05:50:53 -0000 1.17 --- engine.c 8 Aug 2004 07:57:57 -0000 1.17.2.1 *************** *** 292,295 **** --- 292,300 ---- } } + /* Tell mps to check that we selected a valid module; if the previously + selected module just got bulldozed, this will ensure that mps doesn't + try to display it */ + mappoint_stats(-1,-1,-1); + return size; /* No longer used... */ } Index: mps.c =================================================================== RCS file: /cvsroot/lincity/lincity/mps.c,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -d -r1.18 -r1.18.2.1 *** mps.c 6 Oct 2003 05:06:26 -0000 1.18 --- mps.c 8 Aug 2004 07:57:58 -0000 1.18.2.1 *************** *** 145,148 **** --- 145,149 ---- } else if (x == -2) { + /* Global statistics */ if (button != oldbut) { xx = x; *************** *** 156,159 **** --- 157,161 ---- } } else if (x == -1) { + /* Use old values */ x = xx; y = yy; *************** *** 196,199 **** --- 198,203 ---- } + /* Now act on our decisions */ + Fgl_setfontcolors (14, TEXT_FG_COLOUR); *************** *** 300,303 **** --- 304,311 ---- mps_health (x, y); break; + default: + xx = -2; + yy = -2; + oldbut = 2; } } |
3 messages has been excluded from this view by a project administrator.