Menu
▾
▴
vba-commit — CVS commits for VBA
You can subscribe to this list here.
| 2004 |
Jan
(17) |
Feb
(38) |
Mar
(24) |
Apr
(18) |
May
(75) |
Jun
(2) |
Jul
|
Aug
|
Sep
(21) |
Oct
(3) |
Nov
(19) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
|
Mar
|
Apr
(6) |
May
(73) |
Jun
(57) |
Jul
(12) |
Aug
(68) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
|
2
|
3
|
4
|
5
|
6
|
|
7
|
8
|
9
(2) |
10
(1) |
11
(1) |
12
|
13
|
|
14
|
15
|
16
|
17
|
18
|
19
|
20
(2) |
|
21
|
22
|
23
|
24
|
25
|
26
|
27
|
|
28
|
29
(18) |
30
|
31
|
|
|
|
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:22:31
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4206 Added Files: ABOUT-NLS Log Message: GTK+ frontend draft added. --- NEW FILE: ABOUT-NLS --- Notes on the Free Translation Project ************************************* Free software is going international! The Free Translation Project is a way to get maintainers of free software, translators, and users all together, so that will gradually become able to speak many languages. A few packages already provide translations for their messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, itself available at your nearest GNU archive site. But you do _not_ need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and work at translations should contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. Quick configuration advice ========================== If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext to force usage of internationalizing routines provided within this package, despite the existence of internationalizing capabilities in the operating system where this package is being installed. So far, only the `gettext' implementation in the GNU C library version 2 provides as many features (such as locale alias, message inheritance, automatic charset conversion or plural form handling) as the implementation here. It is also not possible to offer this additional functionality on top of a `catgets' implementation. Future versions of GNU `gettext' will very likely convey even more functionality. So it might be a good idea to change to GNU `gettext' as soon as possible. So you need _not_ provide this option if you are using GNU libc 2 or you have installed a recent copy of the GNU gettext package with the included `libintl'. INSTALL Matters =============== Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such packages use GNU `gettext'. Other packages have their own ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already provides the GNU `gettext' functions. If not, the GNU `gettext' own library will be used. This library is wholly contained within this package, usually in the `intl/' subdirectory, so prior installation of the GNU `gettext' package is _not_ required. Installers may use special options at configuration time for changing the default behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls will respectively bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and will decide to use this. This might be not what is desirable. You should use the more recent version of the GNU `gettext' library. I.e. if the file `intl/VERSION' shows that the library which comes with this package is more recent, you should use ./configure --with-included-gettext to prevent auto-detection. The configuration process will not test for the `catgets' function and therefore it will not be used. The reason is that even an emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed together with the package. However, the environment variable `LINGUAS' may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. Using This Package ================== As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). This can be done from your `.login' or `.profile' file, once and for all. You might think that the country code specification is redundant. But in fact, some languages have dialects in different countries. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. The locale naming convention of `LL_CC', with `LL' denoting the language and `CC' denoting the country, is the one use on systems based on GNU libc. On other systems, some variations of this scheme are used, such as `LL' or `LL_CC.ENCODING'. You can get the list of locales supported by your system for your country by running the command `locale -a | grep '^LL''. Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. This is done through a different environment variable, called `LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' for the purpose of message handling, but you still need to have `LANG' set to the primary language; this is required by other parts of the system libraries. For example, some Swedish users who would rather read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. Special advice for Norwegian users: The language code for Norwegian bokma*l changed from `no' to `nb' recently (in 2003). During the transition period, while some message catalogs for this language are installed under `nb' and some older ones under `no', it's recommended for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and older translations are used. In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. Translating Teams ================= For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. The subscribing address is _not_ the same as the list itself, it has `-request' appended. For example, speakers of Swedish can send a message to `sv-...@li...', having this message body: subscribe Keep in mind that team members are expected to participate _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to get started, please write to `tra...@ir...' to reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing the terminology in use. Proven linguistic skill are praised more than programming skill, here. Available Packages ================== Languages are not equally supported in all packages. The following matrix shows the current state of internationalization, as of January 2004. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es +----------------------------------------------------+ a2ps | [] [] [] [] | aegis | () | ant-phone | () | anubis | | ap-utils | | aspell | [] | bash | [] [] [] [] | batchelor | | bfd | [] [] | binutils | [] [] | bison | [] [] [] | bluez-pin | [] [] [] | clisp | | clisp | [] [] [] | console-tools | [] [] | coreutils | [] [] [] [] | cpio | [] [] [] | darkstat | [] () [] | diffutils | [] [] [] [] [] [] [] | e2fsprogs | [] [] [] | enscript | [] [] [] [] | error | [] [] [] [] [] | fetchmail | [] () [] [] [] [] | fileutils | [] [] [] | findutils | [] [] [] [] [] [] [] | flex | [] [] [] [] | fslint | | gas | [] | gawk | [] [] [] [] | gbiff | [] | gcal | [] | gcc | [] [] | gettext | [] [] [] [] [] | gettext-examples | [] [] [] [] | gettext-runtime | [] [] [] [] [] | gettext-tools | [] [] [] | gimp-print | [] [] [] [] [] | gliv | | glunarclock | [] [] | gnubiff | [] | gnucash | [] () [] [] | gnucash-glossary | [] () [] | gnupg | [] () [] [] [] [] | gpe-aerial | [] | gpe-beam | [] [] | gpe-calendar | [] [] | gpe-clock | [] [] | gpe-conf | [] [] | gpe-contacts | [] [] | gpe-edit | [] | gpe-go | [] | gpe-login | [] [] | gpe-ownerinfo | [] [] | gpe-sketchbook | [] [] | gpe-su | [] [] | gpe-taskmanager | [] [] | gpe-timesheet | [] | gpe-today | [] [] | gpe-todo | [] [] | gphoto2 | [] [] [] [] | gprof | [] [] [] | gpsdrive | () () () | gramadoir | [] | grep | [] [] [] [] [] [] | gretl | [] | gtick | [] () | hello | [] [] [] [] [] [] | id-utils | [] [] | indent | [] [] [] [] | iso_3166 | [] [] [] [] [] [] [] [] [] [] | iso_3166_1 | [] [] [] [] [] [] | iso_3166_2 | | iso_3166_3 | [] | iso_4217 | [] [] [] [] | iso_639 | | jpilot | [] [] [] | jtag | | jwhois | [] | kbd | [] [] [] [] [] | latrine | () | ld | [] [] | libc | [] [] [] [] [] [] | libgpewidget | [] [] | libiconv | [] [] [] [] [] | lifelines | [] () | lilypond | [] | lingoteach | | lingoteach_lessons | () () | lynx | [] [] [] [] | m4 | [] [] [] [] | mailutils | [] [] | make | [] [] [] | man-db | [] () [] [] () | minicom | [] [] [] | mysecretdiary | [] [] [] | nano | [] () [] [] [] | nano_1_0 | [] () [] [] [] | opcodes | [] | parted | [] [] [] [] [] | ptx | [] [] [] [] [] | python | | radius | [] | recode | [] [] [] [] [] [] [] | rpm | [] [] | screem | | scrollkeeper | [] [] [] [] [] [] | sed | [] [] [] [] [] [] | sh-utils | [] [] [] | shared-mime-info | | sharutils | [] [] [] [] [] [] | silky | () | skencil | [] () [] | sketch | [] () [] | soundtracker | [] [] [] | sp | [] | tar | [] [] [] [] | texinfo | [] [] [] | textutils | [] [] [] [] | tin | () () | tp-robot | | tuxpaint | [] [] [] [] [] [] [] | unicode-han-tra... | | unicode-transla... | | util-linux | [] [] [] [] [] | vorbis-tools | [] [] [] [] | wastesedge | () | wdiff | [] [] [] [] | wget | [] [] [] [] [] [] | xchat | [] [] [] [] | xfree86_xkb_xml | [] [] | xpad | [] | +----------------------------------------------------+ af am ar az be bg bs ca cs da de el en en_GB eo es 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 et eu fa fi fr ga gl he hr hu id is it ja ko lg +-------------------------------------------------+ a2ps | [] [] [] () () | aegis | | ant-phone | [] | anubis | [] | ap-utils | [] | aspell | [] [] | bash | [] [] | batchelor | [] [] | bfd | [] | binutils | [] [] | bison | [] [] [] [] | bluez-pin | [] [] [] [] [] | clisp | | clisp | [] | console-tools | | coreutils | [] [] [] [] [] [] | cpio | [] [] [] [] | darkstat | () [] [] [] | diffutils | [] [] [] [] [] [] [] | e2fsprogs | | enscript | [] [] | error | [] [] [] [] | fetchmail | [] | fileutils | [] [] [] [] [] [] | findutils | [] [] [] [] [] [] [] [] [] [] [] | flex | [] [] [] | fslint | [] | gas | [] | gawk | [] [] [] | gbiff | [] | gcal | [] | gcc | [] | gettext | [] [] [] | gettext-examples | [] [] | gettext-runtime | [] [] [] [] [] | gettext-tools | [] [] [] | gimp-print | [] [] | gliv | () | glunarclock | [] [] [] [] | gnubiff | [] | gnucash | () [] | gnucash-glossary | [] | gnupg | [] [] [] [] [] [] [] | gpe-aerial | [] | gpe-beam | [] | gpe-calendar | [] [] [] | gpe-clock | [] | gpe-conf | [] | gpe-contacts | [] [] | gpe-edit | [] [] | gpe-go | [] | gpe-login | [] [] | gpe-ownerinfo | [] [] [] | gpe-sketchbook | [] | gpe-su | [] | gpe-taskmanager | [] | gpe-timesheet | [] [] [] | gpe-today | [] [] | gpe-todo | [] [] | gphoto2 | [] [] [] | gprof | [] [] | gpsdrive | () () () | gramadoir | [] [] | grep | [] [] [] [] [] [] [] [] [] [] [] | gretl | [] [] | gtick | [] [] [] | hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | id-utils | [] [] [] [] | indent | [] [] [] [] [] [] [] [] [] | iso_3166 | [] [] [] [] [] [] [] | iso_3166_1 | [] [] [] [] [] | iso_3166_2 | | iso_3166_3 | | iso_4217 | [] [] [] [] [] [] | iso_639 | | jpilot | [] () | jtag | [] | jwhois | [] [] [] [] | kbd | [] | latrine | [] | ld | [] | libc | [] [] [] [] [] [] | libgpewidget | [] [] [] [] | libiconv | [] [] [] [] [] [] [] [] [] | lifelines | () | lilypond | [] | lingoteach | [] [] | lingoteach_lessons | | lynx | [] [] [] [] | m4 | [] [] [] [] | mailutils | | make | [] [] [] [] [] [] | man-db | () () | minicom | [] [] [] [] | mysecretdiary | [] [] | nano | [] [] [] [] | nano_1_0 | [] [] [] [] | opcodes | [] | parted | [] [] [] | ptx | [] [] [] [] [] [] [] | python | | radius | [] | recode | [] [] [] [] [] [] | rpm | [] [] | screem | | scrollkeeper | [] | sed | [] [] [] [] [] [] [] [] [] | sh-utils | [] [] [] [] [] [] [] | shared-mime-info | [] [] [] | sharutils | [] [] [] [] [] | silky | () [] () () | skencil | [] | sketch | [] | soundtracker | [] [] | sp | [] () | tar | [] [] [] [] [] [] [] [] [] | texinfo | [] [] [] [] | textutils | [] [] [] [] [] [] | tin | [] () | tp-robot | [] | tuxpaint | [] [] [] [] [] [] [] [] [] | unicode-han-tra... | | unicode-transla... | [] [] | util-linux | [] [] [] [] () [] | vorbis-tools | [] | wastesedge | () | wdiff | [] [] [] [] [] [] | wget | [] [] [] [] [] [] [] | xchat | [] [] [] | xfree86_xkb_xml | [] [] | xpad | [] [] | +-------------------------------------------------+ et eu fa fi fr ga gl he hr hu id is it ja ko lg 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru +-----------------------------------------------------+ a2ps | [] [] () () [] [] [] | aegis | () () () | ant-phone | [] [] | anubis | [] [] [] [] [] [] | ap-utils | [] () [] | aspell | [] | bash | [] [] [] | batchelor | [] | bfd | [] | binutils | [] | bison | [] [] [] [] [] | bluez-pin | [] [] [] | clisp | | clisp | [] | console-tools | [] | coreutils | [] [] | cpio | [] [] [] [] [] | darkstat | [] [] [] [] | diffutils | [] [] [] [] [] [] | e2fsprogs | [] | enscript | [] [] [] [] | error | [] [] [] | fetchmail | [] [] () [] | fileutils | [] [] [] | findutils | [] [] [] [] [] | flex | [] [] [] [] | fslint | [] [] | gas | | gawk | [] [] [] | gbiff | [] [] | gcal | | gcc | | gettext | [] [] [] | gettext-examples | [] [] [] | gettext-runtime | [] [] [] [] | gettext-tools | [] [] | gimp-print | [] | gliv | [] [] [] | glunarclock | [] [] [] [] | gnubiff | [] | gnucash | [] [] () [] | gnucash-glossary | [] [] | gnupg | [] | gpe-aerial | [] [] [] [] | gpe-beam | [] [] [] [] | gpe-calendar | [] [] [] [] | gpe-clock | [] [] [] [] | gpe-conf | [] [] [] [] | gpe-contacts | [] [] [] [] | gpe-edit | [] [] [] [] | gpe-go | [] [] [] | gpe-login | [] [] [] [] | gpe-ownerinfo | [] [] [] [] | gpe-sketchbook | [] [] [] [] | gpe-su | [] [] [] [] | gpe-taskmanager | [] [] [] [] | gpe-timesheet | [] [] [] [] | gpe-today | [] [] [] [] | gpe-todo | [] [] [] [] | gphoto2 | [] | gprof | [] [] | gpsdrive | () () [] | gramadoir | () [] | grep | [] [] [] [] [] | gretl | | gtick | [] [] [] | hello | [] [] [] [] [] [] [] [] [] [] | id-utils | [] [] [] [] | indent | [] [] [] [] | iso_3166 | [] [] [] | iso_3166_1 | [] [] | iso_3166_2 | | iso_3166_3 | [] | iso_4217 | [] [] [] [] [] [] [] [] | iso_639 | [] | jpilot | () () | jtag | | jwhois | [] [] [] [] () | kbd | [] [] [] | latrine | [] | ld | | libc | [] [] [] [] | libgpewidget | [] [] [] | libiconv | [] [] [] [] [] | lifelines | | lilypond | | lingoteach | | lingoteach_lessons | | lynx | [] [] [] | m4 | [] [] [] [] [] | mailutils | [] [] [] | make | [] [] [] [] | man-db | [] | minicom | [] [] [] [] | mysecretdiary | [] [] [] | nano | [] [] [] [] [] | nano_1_0 | [] [] [] [] [] [] | opcodes | [] [] | parted | [] [] [] [] | ptx | [] [] [] [] [] [] [] [] | python | | radius | [] [] | recode | [] [] [] [] | rpm | [] [] [] | screem | | scrollkeeper | [] [] [] [] [] | sed | [] [] [] | sh-utils | [] [] | shared-mime-info | [] [] | sharutils | [] [] | silky | () | skencil | [] [] | sketch | [] [] | soundtracker | | sp | | tar | [] [] [] [] [] [] | texinfo | [] [] [] [] | textutils | [] [] | tin | | tp-robot | [] | tuxpaint | [] [] [] [] [] [] [] [] | unicode-han-tra... | | unicode-transla... | | util-linux | [] [] [] | vorbis-tools | [] [] [] | wastesedge | | wdiff | [] [] [] [] [] | wget | [] [] [] | xchat | [] [] [] | xfree86_xkb_xml | [] [] | xpad | [] [] | +-----------------------------------------------------+ lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu +-----------------------------------------------------+ a2ps | [] [] [] [] | 16 aegis | | 0 ant-phone | | 3 anubis | [] [] | 9 ap-utils | () | 3 aspell | | 4 bash | | 9 batchelor | | 3 bfd | [] [] | 6 binutils | [] [] [] | 8 bison | [] [] | 14 bluez-pin | [] [] [] | 14 clisp | | 0 clisp | | 5 console-tools | | 3 coreutils | [] [] [] [] | 16 cpio | [] [] | 14 darkstat | [] [] [] () () | 12 diffutils | [] [] [] | 23 e2fsprogs | [] [] | 6 enscript | [] [] | 12 error | [] [] [] | 15 fetchmail | [] [] | 11 fileutils | [] [] [] [] [] | 17 findutils | [] [] [] [] [] [] | 29 flex | [] [] | 13 fslint | | 3 gas | [] | 3 gawk | [] [] | 12 gbiff | | 4 gcal | [] [] | 4 gcc | [] | 4 gettext | [] [] [] [] [] | 16 gettext-examples | [] [] [] [] [] | 14 gettext-runtime | [] [] [] [] [] [] [] [] | 22 gettext-tools | [] [] [] [] [] [] | 14 gimp-print | [] [] | 10 gliv | | 3 glunarclock | [] [] [] | 13 gnubiff | | 3 gnucash | [] [] | 9 gnucash-glossary | [] [] [] | 8 gnupg | [] [] [] [] | 17 gpe-aerial | [] | 7 gpe-beam | [] | 8 gpe-calendar | [] [] [] [] | 13 gpe-clock | [] [] [] | 10 gpe-conf | [] [] | 9 gpe-contacts | [] [] [] | 11 gpe-edit | [] [] [] [] [] | 12 gpe-go | | 5 gpe-login | [] [] [] [] [] | 13 gpe-ownerinfo | [] [] [] [] | 13 gpe-sketchbook | [] [] | 9 gpe-su | [] [] [] | 10 gpe-taskmanager | [] [] [] | 10 gpe-timesheet | [] [] [] [] | 12 gpe-today | [] [] [] [] [] | 13 gpe-todo | [] [] [] [] | 12 gphoto2 | [] [] [] | 11 gprof | [] [] | 9 gpsdrive | [] [] | 3 gramadoir | [] | 5 grep | [] [] [] [] | 26 gretl | | 3 gtick | | 7 hello | [] [] [] [] [] | 34 id-utils | [] [] | 12 indent | [] [] [] [] | 21 iso_3166 | [] [] [] [] [] [] [] | 27 iso_3166_1 | [] [] [] | 16 iso_3166_2 | | 0 iso_3166_3 | | 2 iso_4217 | [] [] [] [] [] [] | 24 iso_639 | | 1 jpilot | [] [] [] [] [] | 9 jtag | [] | 2 jwhois | () [] [] | 11 kbd | [] [] | 11 latrine | | 2 ld | [] [] | 5 libc | [] [] [] [] | 20 libgpewidget | [] [] [] [] | 13 libiconv | [] [] [] [] [] [] [] [] | 27 lifelines | [] | 2 lilypond | [] | 3 lingoteach | | 2 lingoteach_lessons | () | 0 lynx | [] [] [] | 14 m4 | [] [] | 15 mailutils | | 5 make | [] [] [] | 16 man-db | [] | 5 minicom | | 11 mysecretdiary | [] [] | 10 nano | [] [] [] [] | 17 nano_1_0 | [] [] [] | 17 opcodes | [] [] | 6 parted | [] [] [] | 15 ptx | [] [] | 22 python | | 0 radius | | 4 recode | [] [] [] | 20 rpm | [] [] | 9 screem | [] [] | 2 scrollkeeper | [] [] [] | 15 sed | [] [] [] [] [] [] | 24 sh-utils | [] [] | 14 shared-mime-info | [] [] | 7 sharutils | [] [] [] [] | 17 silky | () | 3 skencil | [] | 6 sketch | [] | 6 soundtracker | [] [] | 7 sp | [] | 3 tar | [] [] [] [] [] | 24 texinfo | [] [] [] | 14 textutils | [] [] [] [] | 16 tin | | 1 tp-robot | | 2 tuxpaint | [] [] [] [] [] | 29 unicode-han-tra... | | 0 unicode-transla... | | 2 util-linux | [] [] | 15 vorbis-tools | | 8 wastesedge | | 0 wdiff | [] [] [] | 18 wget | [] [] [] [] [] [] [] [] | 24 xchat | [] [] [] [] [] | 15 xfree86_xkb_xml | [] [] [] [] [] | 11 xpad | | 5 +-----------------------------------------------------+ 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are used for implementing regional variants of languages, or language dialects. For a PO file in the matrix above to be effective, the package to which it applies should also have been internationalized and distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. If January 2004 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. Using `gettext' in new packages =============================== If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means in particular that even non-free programs can use `libintl' as a shared library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact `tra...@ir...' to make the `.pot' files available to the translation teams. |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:21:46
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4018 Added Files: screenarea.h Log Message: GTK+ frontend draft added. --- NEW FILE: screenarea.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #ifndef __VBA_SCREENAREA_H__ #define __VBA_SCREENAREA_H__ #include <gtkmm/drawingarea.h> #include "filters.h" namespace VBA { class ScreenArea : public Gtk::DrawingArea { public: ScreenArea(int _iWidth, int _iHeight, int _iScale = 1); virtual ~ScreenArea(); void vSetSize(int _iWidth, int _iHeight); void vSetScale(int _iScale); void vSetFilter2x(Filter2x _vFilter); void vDrawPixels(const u8 * _puiData); void vDrawColor(u32 _uiColor); // 0xRRGGBB protected: virtual bool on_expose_event(GdkEventExpose * _pstEvent); private: int m_iWidth; int m_iHeight; int m_iScale; int m_iAreaWidth; int m_iAreaHeight; int m_iRowStride; u32 * m_puiPixels; u8 * m_puiDelta; Filter2x m_vFilter2x; void vUpdateSize(); }; } // namespace VBA #endif // __VBA_SCREENAREA_H__ |
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551 Modified Files: AUTHORS Makefile.am Makefile.in aclocal.m4 configure configure.in mkinstalldirs Added Files: VERSION compile config.rpath Log Message: GTK+ frontend draft added. Index: mkinstalldirs =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/mkinstalldirs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mkinstalldirs 20 Oct 2002 13:03:12 -0000 1.1 --- mkinstalldirs 29 Mar 2004 22:08:37 -0000 1.2 *************** *** 5,10 **** # Public domain - # $Id$ - errstatus=0 dirmode="" --- 5,8 ---- *************** *** 15,30 **** # process command line arguments while test $# -gt 0 ; do ! case "${1}" in ! -h | --help | --h* ) # -h for help ! echo "${usage}" 1>&2; exit 0 ;; ! -m ) # -m PERM arg ! shift ! test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ! dirmode="${1}" ! shift ;; ! -- ) shift; break ;; # stop option processing ! -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option ! * ) break ;; # first non-opt arg ! esac done --- 13,39 ---- # process command line arguments while test $# -gt 0 ; do ! case $1 in ! -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ! ;; ! -m) # -m PERM arg ! shift ! test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ! dirmode=$1 ! shift ! ;; ! --) # stop option processing ! shift ! break ! ;; ! -*) # unknown option ! echo "$usage" 1>&2 ! exit 1 ! ;; ! *) # first non-opt arg ! break ! ;; ! esac done *************** *** 39,94 **** case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case "$pathcomp" in ! -* ) pathcomp=./$pathcomp ;; ! esac ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! mkdir "$pathcomp" || lasterr=$? ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done --- 48,104 ---- case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ! ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ! ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case $pathcomp in ! -*) pathcomp=./$pathcomp ;; ! esac ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! mkdir "$pathcomp" || lasterr=$? ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done *************** *** 97,101 **** # Local Variables: # mode: shell-script ! # sh-indentation: 3 # End: # mkinstalldirs ends here --- 107,111 ---- # Local Variables: # mode: shell-script ! # sh-indentation: 2 # End: # mkinstalldirs ends here --- NEW FILE: config.rpath --- #! /bin/sh # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # # Copyright 1996-2003 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # # The first argument passed to this file is the canonical host specification, # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # or # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld # should be set by the caller. # # The set of defined variables is at the end of this script. # Known limitations: # - On IRIX 6.5 with CC="cc", the run time search patch must not be longer # than 256 bytes, otherwise the compiler driver will dump core. The only # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. # All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a shrext=.so host="$1" host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. wl= if test "$GCC" = yes; then wl='-Wl,' else case "$host_os" in aix*) wl='-Wl,' ;; mingw* | pw32* | os2*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' ;; irix5* | irix6* | nonstopux*) wl='-Wl,' ;; newsos6) ;; linux*) case $CC in icc|ecc) wl='-Wl,' ;; ccc) wl='-Wl,' ;; esac ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; sco3.2v5*) ;; solaris*) wl='-Wl,' ;; sunos4*) wl='-Qoption ld ' ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) wl='-Wl,' ;; sysv4*MP*) ;; uts4*) ;; esac fi # Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= hardcode_direct=no hardcode_minus_L=no case "$host_os" in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. if test "$GCC" != yes; then with_gnu_ld=no fi ;; openbsd*) with_gnu_ld=no ;; esac ld_shlibs=yes if test "$with_gnu_ld" = yes; then case "$host_os" in aix3* | aix4* | aix5*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no fi ;; amigaos*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # Samuel A. Falvo II <kc...@do...> reports # that the semantics of dynamic libraries on AmigaOS, at least up # to version 4, is to share data among multiple programs linked # with the same dynamic library. Since this doesn't match the # behavior of shared libraries on other platforms, we can use # them. ld_shlibs=no ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no fi ;; cygwin* | mingw* | pw32*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then : else ld_shlibs=no fi ;; netbsd*) ;; solaris* | sysv5*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no fi ;; sunos4*) hardcode_direct=yes ;; *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no fi ;; esac if test "$ld_shlibs" = yes; then # Unlike libtool, we use -rpath here, not --rpath, since the documented # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' fi else case "$host_os" in aix3*) # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes if test "$GCC" = yes; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported fi ;; aix4* | aix5*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix5*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes break fi done esac fi hardcode_direct=yes hardcode_libdir_separator=':' if test "$GCC" = yes; then case $host_os in aix4.[012]|aix4.[012].*) collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && \ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 hardcode_direct=yes else # We have old collect2 hardcode_direct=unsupported hardcode_minus_L=yes hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi esac fi # Begin _LT_AC_SYS_LIBPATH_AIX. echo 'int main () { return 0; }' > conftest.c ${CC} ${LDFLAGS} conftest.c -o conftest aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` fi if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib" fi rm -f conftest.c conftest # End _LT_AC_SYS_LIBPATH_AIX. if test "$aix_use_runtimelinking" = yes; then hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' else hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" fi fi ;; amigaos*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # see comment about different semantics on the GNU ld section ld_shlibs=no ;; bsdi4*) ;; cygwin* | mingw* | pw32*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec=' ' libext=lib ;; darwin* | rhapsody*) if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then hardcode_direct=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; freebsd1*) ld_shlibs=no ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; freebsd2*) hardcode_direct=yes hardcode_minus_L=yes ;; freebsd*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; hpux9*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes ;; hpux10* | hpux11*) if test "$with_gnu_ld" = no; then case "$host_cpu" in hppa*64*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=no ;; ia64*) hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=no # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes ;; *) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes ;; esac fi ;; irix5* | irix6* | nonstopux*) hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; netbsd*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; newsos6) hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; openbsd*) hardcode_direct=yes if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then hardcode_libdir_flag_spec='${wl}-rpath,$libdir' else case "$host_os" in openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) hardcode_libdir_flag_spec='-R$libdir' ;; *) hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac fi ;; os2*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes ;; osf3*) hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) if test "$GCC" = yes; then hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else # Both cc and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: ;; sco3.2v5*) ;; solaris*) hardcode_libdir_flag_spec='-R$libdir' ;; sunos4*) hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=yes hardcode_minus_L=yes ;; sysv4) case $host_vendor in sni) hardcode_direct=yes # is this really true??? ;; siemens) hardcode_direct=no ;; motorola) hardcode_direct=no #Motorola manual says yes, but my tests say they lie ;; esac ;; sysv4.3*) ;; sysv4*MP*) if test -d /usr/nec; then ld_shlibs=yes fi ;; sysv4.2uw2*) hardcode_direct=yes hardcode_minus_L=no ;; sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) ;; sysv5*) hardcode_libdir_flag_spec= ;; uts4*) hardcode_libdir_flag_spec='-L$libdir' ;; *) ld_shlibs=no ;; esac fi # Check dynamic linker characteristics # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. libname_spec='lib$name' case "$host_os" in aix3*) ;; aix4* | aix5*) ;; amigaos*) ;; beos*) ;; bsdi4*) ;; cygwin* | mingw* | pw32*) shrext=.dll ;; darwin* | rhapsody*) shrext=.dylib ;; dgux*) ;; freebsd1*) ;; freebsd*) ;; gnu*) ;; hpux9* | hpux10* | hpux11*) case "$host_cpu" in ia64*) shrext=.so ;; hppa*64*) shrext=.sl ;; *) shrext=.sl ;; esac ;; irix5* | irix6* | nonstopux*) case "$host_os" in irix5* | nonstopux*) libsuff= shlibsuff= ;; *) case $LD in *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; *) libsuff= shlibsuff= ;; esac ;; esac ;; linux*oldld* | linux*aout* | linux*coff*) ;; linux*) ;; netbsd*) ;; newsos6) ;; nto-qnx) ;; openbsd*) ;; os2*) libname_spec='$name' shrext=.dll ;; osf3* | osf4* | osf5*) ;; sco3.2v5*) ;; solaris*) ;; sunos4*) ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ;; sysv4*MP*) ;; uts4*) ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` shlibext=`echo "$shrext" | sed -e 's,^\.,,'` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF # How to pass a linker flag through the compiler. wl="$escaped_wl" # Static library suffix (normally "a"). libext="$libext" # Shared library suffix (normally "so"). shlibext="$shlibext" # Flag to hardcode \$libdir into a binary during linking. # This must work even if \$libdir does not exist. hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" # Whether we need a single -rpath flag with a separated argument. hardcode_libdir_separator="$hardcode_libdir_separator" # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the # resulting binary. hardcode_direct="$hardcode_direct" # Set to yes if using the -LDIR flag during linking hardcodes DIR into the # resulting binary. hardcode_minus_L="$hardcode_minus_L" EOF Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure 1 Feb 2004 15:02:38 -0000 1.20 --- configure 29 Mar 2004 22:08:37 -0000 1.21 *************** *** 1,8 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # ! # 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. --- 1,7 ---- #! /bin/sh [...7357 lines suppressed...] sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 6806,6813 **** 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; } --- 10061,10068 ---- 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.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure.in 1 Feb 2004 15:02:38 -0000 1.19 --- configure.in 29 Mar 2004 22:08:37 -0000 1.20 *************** *** 1,3 **** --- 1,4 ---- dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/armdis.h) *************** *** 5,41 **** AC_CANONICAL_TARGET - VBA_USE_C_CORE=yes - VBA_USE_MMX=no - case "$target" in ! i?86-*-*) ! VBA_USE_C_CORE=no ! VBA_USE_MMX=yes ! ;; esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.1) AC_ARG_ENABLE(c-core, ! [ --enable-c-core enable C core (default is YES)], ! ac_cv_use_c_core=$enableval, ac_cv_use_c_core=$VBA_USE_C_CORE) ! AC_CACHE_CHECK(whether to enable C core, ac_cv_use_c_core, ac_cv_use_c_core=$VBA_USE_C_CORE) ! AC_ARG_ENABLE(dev, ! [ --enable-dev enable development features (default is YES)], ! ac_cv_use_dev=$withval, ac_cv_use_dev=yes) ! AC_CACHE_CHECK(whether to enable development features, ac_cv_use_dev, ac_cv_use_dev=no) AC_ARG_WITH(mmx, ! [ --with-mmx use MMX (default is NO)], ! ac_cv_use_mmx=$withval, ac_cv_use_mmx=$VBA_USE_MMX) ! AC_CACHE_CHECK(whether to use mmx, ac_cv_use_mmx, ac_cv_use_mmx=$VBA_USE_MMX) ! AC_ARG_WITH(profiling, ! [ --with-profiling enable profiling (default is YES)], ! ac_cv_use_prof=$withval, ac_cv_use_prof=yes) ! AC_CACHE_CHECK(whether to enable profiling, ac_cv_use_prof, ac_cv_use_prof=yes) - CCC="gcc c++ g++ CC cxx cc++ cl" dnl Checks for programs. AC_PROG_CC --- 6,53 ---- AC_CANONICAL_TARGET case "$target" in ! i?86-*-*) ! VBA_USE_C_CORE=no ! VBA_USE_MMX=yes ! ;; ! *) ! VBA_USE_C_CORE=yes ! VBA_USE_MMX=no ! ;; esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.2) AC_ARG_ENABLE(c-core, ! AC_HELP_STRING([--enable-c-core],[enable C core (default is no on x86 targets)]), ! , enable_c_core=$VBA_USE_C_CORE) ! AC_ARG_ENABLE(profiling, ! AC_HELP_STRING([--enable-profiling],[enable profiling (default is yes)]), ! , enable_profiling=yes) AC_ARG_WITH(mmx, ! AC_HELP_STRING([--with-mmx],[use MMX (default is yes on x86 targets)]), ! , with_mmx=$VBA_USE_MMX) ! AC_ARG_ENABLE(sdl, ! AC_HELP_STRING([--enable-sdl],[build the SDL frontend (default is yes)]), ! , enable_sdl=yes) ! ! AC_ARG_ENABLE(gtk, ! AC_HELP_STRING([--enable-gtk],[build the GTK+ frontend (default is no)]), ! , enable_gtk=no) ! ! AC_ARG_ENABLE(dev, ! AC_HELP_STRING([--enable-dev],[enable development features (default is yes)]), ! , enable_dev=yes) ! ! dnl Internationalisation support. ! ALL_LINGUAS="fr" ! AM_GNU_GETTEXT(external) ! ! GETTEXT_PACKAGE=vba-1.7.2 ! AC_SUBST(GETTEXT_PACKAGE) dnl Checks for programs. AC_PROG_CC *************** *** 44,63 **** AC_PROG_CXX AC_PROG_RANLIB ! AC_CHECK_TOOL(NASM, nasm) ! ! dnl Check for SDL ! SDL_VERSION=1.2.2 ! AM_PATH_SDL($SDL_VERSION, ! :, ! AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) ! ) ! CFLAGS="$CFLAGS $SDL_CFLAGS" ! CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" ! LIBS="$LIBS $SDL_LIBS" dnl Checks for libraries. ! AC_CHECK_LIB(png, png_create_write_struct,,AC_MSG_ERROR(Cannot compile without libpng),[-lz]) AC_CHECK_LIB(pthread, pthread_yield) - AC_CHECK_LIB(z, gzopen,,AC_MSG_ERROR(Cannot compile without libz)) dnl Checks for header files. --- 56,67 ---- AC_PROG_CXX AC_PROG_RANLIB ! AC_PATH_PROG(NASM, nasm) dnl Checks for libraries. ! AC_CHECK_LIB(z, gzopen, ! , AC_MSG_ERROR([*** Cannot compile without zlib.])) ! AC_CHECK_LIB(png, png_create_write_struct, ! , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz]) AC_CHECK_LIB(pthread, pthread_yield) dnl Checks for header files. *************** *** 66,72 **** AC_CHECK_HEADERS(malloc.h strings.h unistd.h arpa/inet.h netinet/in.h zutil.h) - dnl Checks for Program - AC_PATH_PROG(NASM,nasm,no) - dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST --- 70,73 ---- *************** *** 75,118 **** AC_STRUCT_TM AC_MSG_CHECKING(for socklen_t) ! AC_TRY_COMPILE([#include <sys/socket.h> socklen_t x; ! ],[],[AC_MSG_RESULT(yes)],[ ! AC_TRY_COMPILE([#include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); ! ],[],[ AC_MSG_RESULT(size_t) ! AC_DEFINE(socklen_t,size_t)], [ AC_MSG_RESULT(int) ! AC_DEFINE(socklen_t,int)])]) AC_C_BIGENDIAN ! CXXFLAGS="$CXXFLAGS -DSDL -DBKPT_SUPPORT -fno-exceptions" ! if test "${ac_cv_use_c_core}" = "yes"; then CXXFLAGS="$CXXFLAGS -DC_CORE" fi ! if test "${ac_cv_use_mmx}" = "yes"; then CXXFLAGS="$CXXFLAGS -DMMX" - VBA_MMX=i386/lib386.a VBA_EXTRA="$VBA_EXTRA i386" fi ! if test "${ac_cv_use_prof}" = "yes"; then ! CXXFLAGS="$CXXFLAGS -DPROFILING" ! VBA_EXTRA="$VBA_EXTRA prof" fi ! if test "${ac_cv_use_dev}" = "yes"; then CXXFLAGS="$CXXFLAGS -DDEV_VERSION" - VBA_PROF=prof/libprof.a fi ! dnl Checks for library functions. - AC_SUBST(VBA_MMX) AC_SUBST(VBA_EXTRA) ! AC_SUBST(VBA_PROF) ! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile) --- 76,162 ---- AC_STRUCT_TM AC_MSG_CHECKING(for socklen_t) ! AC_TRY_COMPILE([ ! #include <sys/socket.h> socklen_t x; ! ],[ ! ],[ ! AC_MSG_RESULT(yes) ! ],[ ! AC_TRY_COMPILE([ ! #include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); ! ],[ ! ],[ AC_MSG_RESULT(size_t) ! AC_DEFINE(socklen_t,size_t) ! ],[ AC_MSG_RESULT(int) ! AC_DEFINE(socklen_t,int) ! ]) ! ]) AC_C_BIGENDIAN ! VBA_LIBS="../gb/libgb.a" ! if test "x$enable_c_core" = xyes; then CXXFLAGS="$CXXFLAGS -DC_CORE" fi ! if test "x$enable_profiling" = xyes; then ! CXXFLAGS="$CXXFLAGS -DPROFILING" ! VBA_EXTRA="$VBA_EXTRA prof" ! VBA_LIBS="$VBA_LIBS ../prof/libprof.a" ! fi ! ! if test "x$with_mmx" = xyes; then ! if test "x$NASM" = x; then ! AC_MSG_ERROR([*** Couldn't find nasm program.]) ! fi CXXFLAGS="$CXXFLAGS -DMMX" VBA_EXTRA="$VBA_EXTRA i386" + VBA_LIBS="$VBA_LIBS ../i386/lib386.a" fi ! if test "x$enable_sdl" = xyes || test "x$enable_gtk" = xyes; then ! SDL_VERSION=1.2.2 ! AM_PATH_SDL($SDL_VERSION,[ ! ],[ ! AC_MSG_ERROR([*** Couldn't find SDL library (version >= $SDL_VERSION).]) ! ]) ! VBA_EXTRA="$VBA_EXTRA sdl" fi ! if test "x$enable_gtk" = xyes; then ! AC_CHECK_HEADERS(libintl.h) ! PKG_CHECK_MODULES(GTKMM, gtkmm-2.0 libglademm-2.0 >= 2.1.0) ! AC_SUBST(GTKMM_CFLAGS) ! AC_SUBST(GTKMM_LIBS) ! VBA_EXTRA="$VBA_EXTRA gtk" ! fi ! ! if test "x$enable_dev" = xyes; then CXXFLAGS="$CXXFLAGS -DDEV_VERSION" fi ! if test "x$enable_sdl" != xyes && test "x$enable_gtk" != xyes; then ! AC_MSG_WARN([*** You have chosen not to build any frontend.]) ! fi AC_SUBST(VBA_EXTRA) ! AC_SUBST(VBA_LIBS) ! dnl Generated files. ! AC_CONFIG_FILES([ ! Makefile ! m4/Makefile ! po/Makefile.in ! src/Makefile ! src/gb/Makefile ! src/gtk/Makefile ! src/i386/Makefile ! src/prof/Makefile ! src/sdl/Makefile ! win32/Makefile ! ]) ! AC_OUTPUT Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 1 Feb 2004 15:02:38 -0000 1.10 --- Makefile.in 29 Mar 2004 22:08:37 -0000 1.11 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 138,144 **** target_vendor = @target_vendor@ AUTOMAKE_OPTIONS = gnu dist-zip - SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 152,161 ---- target_vendor = @target_vendor@ AUTOMAKE_OPTIONS = gnu dist-zip ! SUBDIRS = m4 po src win32 ! ! EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION ! ! ACLOCAL_AMFLAGS = -I m4 subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 152,159 **** installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive ! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ! COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \ ! aclocal.m4 config.guess config.sub configure configure.in \ ! depcomp install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 169,177 ---- installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive ! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ ! ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \ ! acinclude.m4 aclocal.m4 compile config.guess config.rpath \ ! config.sub configure configure.in depcomp install-sh missing \ ! mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive *************** *** 174,178 **** cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: --- 192,196 ---- cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.in acinclude.m4 m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: *************** *** 318,321 **** --- 336,340 ---- $(am__remove_distdir) mkdir $(distdir) + $(mkinstalldirs) $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ *************** *** 450,454 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 469,473 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- NEW FILE: compile --- #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. # Copyright 1999, 2000 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Usage: # compile PROGRAM [ARGS]... # `-o FOO.o' is removed from the args passed to the actual compile. # Usage statement added by Billy Biggs <ve...@du...>. if [ -z $1 ]; then echo "Wrapper for compilers which do not understand '-c -o'." echo "usage: compile PROGRAM [ARGS]..." echo "'-o FOO.o' is removed from the args passed to the actual compile." exit 1 fi prog=$1 shift ofile= cfile= args= while test $# -gt 0; do case "$1" in -o) # configure might choose to run compile as `compile cc -o foo foo.c'. # So we do something ugly here. ofile=$2 shift case "$ofile" in *.o | *.obj) ;; *) args="$args -o $ofile" ofile= ;; esac ;; *.c) cfile=$1 args="$args $1" ;; *) args="$args $1" ;; esac shift done if test -z "$ofile" || test -z "$cfile"; then # If no `-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no # `.c' file was seen then we are probably linking. That is also # ok. exec "$prog" $args fi # Name of file we expect compiler to create. cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. # Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d while true; do if mkdir $lockdir > /dev/null 2>&1; then break fi sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. trap "rmdir $lockdir; exit 1" 1 2 15 # Run the compile. "$prog" $args status=$? if test -f "$cofile"; then mv "$cofile" "$ofile" fi rmdir $lockdir exit $status --- NEW FILE: VERSION --- VisualBoyAdvance 1.7.2 Index: AUTHORS =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AUTHORS 12 Apr 2003 13:37:32 -0000 1.2 --- AUTHORS 29 Mar 2004 22:08:37 -0000 1.3 *************** *** 6,8 **** - Costis (co...@gb...): object mosaic, GP32 ! - KVA: ARM/THUMB disassembler \ No newline at end of file --- 6,9 ---- - Costis (co...@gb...): object mosaic, GP32 ! - KVA: ARM/THUMB disassembler ! - kxu: GTK+ frontend Index: aclocal.m4 =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** aclocal.m4 21 Nov 2003 21:53:41 -0000 1.3 --- aclocal.m4 29 Mar 2004 22:08:37 -0000 1.4 *************** *** 1,3 **** ! # generated automatically by aclocal 1.7.8 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,3 ---- ! # generated automatically by aclocal 1.7.9 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 945,949 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. [...2690 lines suppressed...] + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi + ]) + + + Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 1 Feb 2004 15:02:38 -0000 1.7 --- Makefile.am 29 Mar 2004 22:08:37 -0000 1.8 *************** *** 1,5 **** AUTOMAKE_OPTIONS = gnu dist-zip - SUBDIRS = src win32 ! EXTRA_DIST = README-win.txt README.CVS --- 1,7 ---- AUTOMAKE_OPTIONS = gnu dist-zip ! SUBDIRS = m4 po src win32 + EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION + + ACLOCAL_AMFLAGS = -I m4 |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src/i386 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src/i386 Modified Files: Makefile.am Makefile.in Log Message: GTK+ frontend draft added. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/i386/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 1 Feb 2004 15:02:39 -0000 1.6 --- Makefile.in 29 Mar 2004 22:08:40 -0000 1.7 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 141,147 **** noinst_LIBRARIES = lib386.a ! lib386_a_SOURCES = \ ! 2xSaImmx.asm ! subdir = src/i386 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 155,159 ---- noinst_LIBRARIES = lib386.a ! lib386_a_SOURCES = 2xSaImmx.asm subdir = src/i386 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 239,243 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 251,255 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/i386/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 20 Oct 2002 13:03:12 -0000 1.1 --- Makefile.am 29 Mar 2004 22:08:40 -0000 1.2 *************** *** 3,8 **** noinst_LIBRARIES = lib386.a ! lib386_a_SOURCES = \ ! 2xSaImmx.asm .asm.o: --- 3,7 ---- noinst_LIBRARIES = lib386.a ! lib386_a_SOURCES = 2xSaImmx.asm .asm.o: |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src/prof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src/prof Modified Files: Makefile.am Makefile.in Log Message: GTK+ frontend draft added. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 1 Feb 2004 15:02:39 -0000 1.4 --- Makefile.in 29 Mar 2004 22:08:40 -0000 1.5 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 139,143 **** noinst_LIBRARIES = libprof.a ! libprof_a_SOURCES = prof.cpp prof.h gmon.h gmon_out.h subdir = src/prof ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 153,162 ---- noinst_LIBRARIES = libprof.a ! libprof_a_SOURCES = \ ! gmon.h \ ! gmon_out.h \ ! prof.cpp \ ! prof.h ! subdir = src/prof ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 319,323 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 338,342 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/prof/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 26 Nov 2002 14:45:18 -0000 1.1 --- Makefile.am 29 Mar 2004 22:08:40 -0000 1.2 *************** *** 1,6 **** noinst_LIBRARIES = libprof.a ! libprof_a_SOURCES = prof.cpp prof.h gmon.h gmon_out.h ! ! ! --- 1,7 ---- noinst_LIBRARIES = libprof.a ! libprof_a_SOURCES = \ ! gmon.h \ ! gmon_out.h \ ! prof.cpp \ ! prof.h |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:41
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src Modified Files: Makefile.am Makefile.in Removed Files: SDL.cpp TestEmu.cpp debugger.cpp debugger.h Log Message: GTK+ frontend draft added. --- TestEmu.cpp DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.am 1 Feb 2004 15:02:39 -0000 1.15 --- Makefile.am 29 Mar 2004 22:08:39 -0000 1.16 *************** *** 1,48 **** ! SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = i386 prof ! DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) ! bin_PROGRAMS = VisualBoyAdvance TestEmu ! ! VisualBoyAdvance_SOURCES = \ ! SDL.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \ ! simple2x.cpp bilinear.cpp interframe.cpp unzip.cpp \ ! Cheats.cpp EEprom.cpp Flash.cpp GBA.cpp Gfx.cpp Globals.cpp \ ! Mode0.cpp Mode1.cpp Mode2.cpp Mode3.cpp Mode4.cpp Mode5.cpp \ ! Sound.cpp Sram.cpp Util.cpp armdis.cpp bios.cpp elf.cpp \ ! expr.cpp expr-lex.cpp exprNode.cpp debugger.cpp remote.cpp \ ! AutoBuild.h Cheats.h EEprom.h Flash.h GBA.h GBAinline.h \ ! Gfx.h Globals.h NLS.h Port.h Sound.h Sram.h System.h Util.h armdis.h \ ! bios.h debugger.h elf.h expr.cpp.h exprNode.h unzip.h arm-new.h \ ! thumb.h RTC.cpp RTC.h agbprint.cpp agbprint.h scanline.cpp \ ! getopt.c getopt1.c getopt.h memgzio.h memgzio.c \ ! hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h interp.h ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ ! VisualBoyAdvance_LDFLAGS = `sdl-config --libs` ! TestEmu_SOURCES = \ ! TestEmu.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \ ! simple2x.cpp unzip.cpp \ ! Cheats.cpp EEprom.cpp Flash.cpp GBA.cpp Gfx.cpp Globals.cpp \ ! Mode0.cpp Mode1.cpp Mode2.cpp Mode3.cpp Mode4.cpp Mode5.cpp \ ! Sound.cpp Sram.cpp Util.cpp armdis.cpp bios.cpp elf.cpp \ ! expr.cpp expr-lex.cpp exprNode.cpp debugger.cpp remote.cpp \ ! AutoBuild.h Cheats.h EEprom.h Flash.h GBA.h GBAinline.h \ ! Gfx.h Globals.h NLS.h Port.h Sound.h Sram.h System.h Util.h armdis.h \ ! bios.h debugger.h elf.h expr.cpp.h exprNode.h unzip.h arm-new.h \ ! thumb.h RTC.cpp RTC.h agbprint.cpp agbprint.h scanline.cpp \ ! memgzio.c memgzio.h hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h \ ! interp.h ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ ! TestEmu_LDFLAGS = EXTRA_DIST = \ ! win32 VisualBoyAdvance.cfg \ ! expr.l expr.y \ ! CheatSearch.cpp CheatSearch.h dist-hook: - rm -rf `find $(distdir)/i386 -name CVS` rm -rf `find $(distdir)/win32 -name CVS` - rm -rf `find $(distdir)/prof -name CVS` --- 1,18 ---- ! CORE_SUBDIRS = gb ! EXTRA_SUBDIRS = i386 prof sdl gtk ! SUBDIRS = $(CORE_SUBDIRS) @VBA_EXTRA@ ! DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) EXTRA_DIST = \ ! win32 \ ! VisualBoyAdvance.cfg \ ! expr.l \ ! expr.y \ ! CheatSearch.cpp \ ! CheatSearch.h dist-hook: rm -rf `find $(distdir)/win32 -name CVS` --- debugger.cpp DELETED --- --- SDL.cpp DELETED --- Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 1 Feb 2004 15:02:39 -0000 1.17 --- Makefile.in 29 Mar 2004 22:08:39 -0000 1.18 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 137,185 **** target_os = @target_os@ target_vendor = @target_vendor@ ! SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = i386 prof ! DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) ! bin_PROGRAMS = VisualBoyAdvance TestEmu ! ! VisualBoyAdvance_SOURCES = \ ! SDL.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \ ! simple2x.cpp bilinear.cpp interframe.cpp unzip.cpp \ ! Cheats.cpp EEprom.cpp Flash.cpp GBA.cpp Gfx.cpp Globals.cpp \ ! Mode0.cpp Mode1.cpp Mode2.cpp Mode3.cpp Mode4.cpp Mode5.cpp \ ! Sound.cpp Sram.cpp Util.cpp armdis.cpp bios.cpp elf.cpp \ ! expr.cpp expr-lex.cpp exprNode.cpp debugger.cpp remote.cpp \ ! AutoBuild.h Cheats.h EEprom.h Flash.h GBA.h GBAinline.h \ ! Gfx.h Globals.h NLS.h Port.h Sound.h Sram.h System.h Util.h armdis.h \ ! bios.h debugger.h elf.h expr.cpp.h exprNode.h unzip.h arm-new.h \ ! thumb.h RTC.cpp RTC.h agbprint.cpp agbprint.h scanline.cpp \ ! getopt.c getopt1.c getopt.h memgzio.h memgzio.c \ ! hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h interp.h ! ! ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ ! VisualBoyAdvance_LDFLAGS = `sdl-config --libs` ! TestEmu_SOURCES = \ ! TestEmu.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \ ! simple2x.cpp unzip.cpp \ ! Cheats.cpp EEprom.cpp Flash.cpp GBA.cpp Gfx.cpp Globals.cpp \ ! Mode0.cpp Mode1.cpp Mode2.cpp Mode3.cpp Mode4.cpp Mode5.cpp \ ! Sound.cpp Sram.cpp Util.cpp armdis.cpp bios.cpp elf.cpp \ ! expr.cpp expr-lex.cpp exprNode.cpp debugger.cpp remote.cpp \ ! AutoBuild.h Cheats.h EEprom.h Flash.h GBA.h GBAinline.h \ ! Gfx.h Globals.h NLS.h Port.h Sound.h Sram.h System.h Util.h armdis.h \ ! bios.h debugger.h elf.h expr.cpp.h exprNode.h unzip.h arm-new.h \ ! thumb.h RTC.cpp RTC.h agbprint.cpp agbprint.h scanline.cpp \ ! memgzio.c memgzio.h hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h \ ! interp.h ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ ! TestEmu_LDFLAGS = EXTRA_DIST = \ ! win32 VisualBoyAdvance.cfg \ ! expr.l expr.y \ ! CheatSearch.cpp CheatSearch.h subdir = src --- 151,169 ---- target_os = @target_os@ target_vendor = @target_vendor@ ! CORE_SUBDIRS = gb ! EXTRA_SUBDIRS = i386 prof sdl gtk + SUBDIRS = $(CORE_SUBDIRS) @VBA_EXTRA@ ! DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) EXTRA_DIST = \ ! win32 \ ! VisualBoyAdvance.cfg \ ! expr.l \ ! expr.y \ ! CheatSearch.cpp \ ! CheatSearch.h subdir = src *************** *** 187,256 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ! bin_PROGRAMS = VisualBoyAdvance$(EXEEXT) TestEmu$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) ! ! am_TestEmu_OBJECTS = TestEmu.$(OBJEXT) 2xSaI.$(OBJEXT) pixel.$(OBJEXT) \ ! motionblur.$(OBJEXT) admame.$(OBJEXT) simple2x.$(OBJEXT) \ ! unzip.$(OBJEXT) Cheats.$(OBJEXT) EEprom.$(OBJEXT) \ ! Flash.$(OBJEXT) GBA.$(OBJEXT) Gfx.$(OBJEXT) Globals.$(OBJEXT) \ ! Mode0.$(OBJEXT) Mode1.$(OBJEXT) Mode2.$(OBJEXT) Mode3.$(OBJEXT) \ ! Mode4.$(OBJEXT) Mode5.$(OBJEXT) Sound.$(OBJEXT) Sram.$(OBJEXT) \ ! Util.$(OBJEXT) armdis.$(OBJEXT) bios.$(OBJEXT) elf.$(OBJEXT) \ ! expr.$(OBJEXT) expr-lex.$(OBJEXT) exprNode.$(OBJEXT) \ ! debugger.$(OBJEXT) remote.$(OBJEXT) RTC.$(OBJEXT) \ ! agbprint.$(OBJEXT) scanline.$(OBJEXT) memgzio.$(OBJEXT) \ ! hq2x.$(OBJEXT) Text.$(OBJEXT) ! TestEmu_OBJECTS = $(am_TestEmu_OBJECTS) ! TestEmu_DEPENDENCIES = gb/libgb.a ! am_VisualBoyAdvance_OBJECTS = SDL.$(OBJEXT) 2xSaI.$(OBJEXT) \ ! pixel.$(OBJEXT) motionblur.$(OBJEXT) admame.$(OBJEXT) \ ! simple2x.$(OBJEXT) bilinear.$(OBJEXT) interframe.$(OBJEXT) \ ! unzip.$(OBJEXT) Cheats.$(OBJEXT) EEprom.$(OBJEXT) \ ! Flash.$(OBJEXT) GBA.$(OBJEXT) Gfx.$(OBJEXT) Globals.$(OBJEXT) \ ! Mode0.$(OBJEXT) Mode1.$(OBJEXT) Mode2.$(OBJEXT) Mode3.$(OBJEXT) \ ! Mode4.$(OBJEXT) Mode5.$(OBJEXT) Sound.$(OBJEXT) Sram.$(OBJEXT) \ ! Util.$(OBJEXT) armdis.$(OBJEXT) bios.$(OBJEXT) elf.$(OBJEXT) \ ! expr.$(OBJEXT) expr-lex.$(OBJEXT) exprNode.$(OBJEXT) \ ! debugger.$(OBJEXT) remote.$(OBJEXT) RTC.$(OBJEXT) \ ! agbprint.$(OBJEXT) scanline.$(OBJEXT) getopt.$(OBJEXT) \ ! getopt1.$(OBJEXT) memgzio.$(OBJEXT) hq2x.$(OBJEXT) \ ! Text.$(OBJEXT) ! VisualBoyAdvance_OBJECTS = $(am_VisualBoyAdvance_OBJECTS) ! VisualBoyAdvance_DEPENDENCIES = gb/libgb.a ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/2xSaI.Po ./$(DEPDIR)/Cheats.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/EEprom.Po ./$(DEPDIR)/Flash.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/GBA.Po ./$(DEPDIR)/Gfx.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Globals.Po ./$(DEPDIR)/Mode0.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Mode1.Po ./$(DEPDIR)/Mode2.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Mode3.Po ./$(DEPDIR)/Mode4.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Mode5.Po ./$(DEPDIR)/RTC.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/SDL.Po ./$(DEPDIR)/Sound.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Sram.Po ./$(DEPDIR)/TestEmu.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/Text.Po ./$(DEPDIR)/Util.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/admame.Po ./$(DEPDIR)/agbprint.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/armdis.Po ./$(DEPDIR)/bilinear.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/bios.Po ./$(DEPDIR)/debugger.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/elf.Po ./$(DEPDIR)/expr-lex.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/expr.Po ./$(DEPDIR)/exprNode.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/hq2x.Po ./$(DEPDIR)/interframe.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/memgzio.Po ./$(DEPDIR)/motionblur.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/pixel.Po ./$(DEPDIR)/remote.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/scanline.Po ./$(DEPDIR)/simple2x.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/unzip.Po ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ ! -o $@ ! DIST_SOURCES = $(TestEmu_SOURCES) $(VisualBoyAdvance_SOURCES) RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ --- 171,175 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ! DIST_SOURCES = RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ *************** *** 260,269 **** check-recursive installcheck-recursive DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - SOURCES = $(TestEmu_SOURCES) $(VisualBoyAdvance_SOURCES) - all: all-recursive .SUFFIXES: - .SUFFIXES: .c .cpp .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ --- 179,185 ---- *************** *** 271,396 **** Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - TestEmu$(EXEEXT): $(TestEmu_OBJECTS) $(TestEmu_DEPENDENCIES) - @rm -f TestEmu$(EXEEXT) - $(CXXLINK) $(TestEmu_LDFLAGS) $(TestEmu_OBJECTS) $(TestEmu_LDADD) $(LIBS) - VisualBoyAdvance$(EXEEXT): $(VisualBoyAdvance_OBJECTS) $(VisualBoyAdvance_DEPENDENCIES) - @rm -f VisualBoyAdvance$(EXEEXT) - $(CXXLINK) $(VisualBoyAdvance_LDFLAGS) $(VisualBoyAdvance_OBJECTS) $(VisualBoyAdvance_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/2xSaI.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cheats.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EEprom.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Flash.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GBA.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gfx.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Globals.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode0.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode1.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode2.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode3.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode4.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mode5.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RTC.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sound.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sram.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestEmu.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Text.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/admame.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/agbprint.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/armdis.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bilinear.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debugger.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expr-lex.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expr.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exprNode.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hq2x.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interframe.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memgzio.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motionblur.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanline.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple2x.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unzip.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 - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .c.obj: - @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 - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.o: - @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - @am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: - @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - @am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` uninstall-info-am: --- 187,190 ---- *************** *** 568,575 **** check-am: all-am check: check-recursive ! all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-recursive --- 362,368 ---- check-am: all-am check: check-recursive ! all-am: Makefile installdirs: installdirs-recursive installdirs-am: install: install-recursive *************** *** 584,588 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 377,381 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 599,609 **** clean: clean-recursive ! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags dvi: dvi-recursive --- 392,400 ---- clean: clean-recursive ! clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile ! distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive *************** *** 617,621 **** install-data-am: ! install-exec-am: install-binPROGRAMS install-info: install-info-recursive --- 408,412 ---- install-data-am: ! install-exec-am: install-info: install-info-recursive *************** *** 626,630 **** maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 417,420 ---- *************** *** 632,636 **** mostlyclean: mostlyclean-recursive ! mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-recursive --- 422,426 ---- mostlyclean: mostlyclean-recursive ! mostlyclean-am: mostlyclean-generic pdf: pdf-recursive *************** *** 642,671 **** ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-binPROGRAMS clean-generic clean-recursive ctags \ ! ctags-recursive distclean distclean-compile distclean-generic \ ! distclean-recursive distclean-tags distdir 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-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-info-recursive uninstall-recursive dist-hook: - rm -rf `find $(distdir)/i386 -name CVS` rm -rf `find $(distdir)/win32 -name CVS` - rm -rf `find $(distdir)/prof -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 432,457 ---- ps-am: ! uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-recursive ctags ctags-recursive distclean \ ! distclean-generic distclean-recursive distclean-tags distdir \ ! dvi dvi-am dvi-recursive info info-am info-recursive install \ ! install-am install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ ! ps-recursive tags tags-recursive uninstall uninstall-am \ uninstall-info-am uninstall-info-recursive uninstall-recursive dist-hook: rm -rf `find $(distdir)/win32 -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- debugger.h DELETED --- |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:41
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src/gb Modified Files: Makefile.am Makefile.in Log Message: GTK+ frontend draft added. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 1 Feb 2004 15:02:39 -0000 1.7 --- Makefile.in 29 Mar 2004 22:08:39 -0000 1.8 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 140,147 **** libgb_a_SOURCES = \ ! GB.cpp gbCheats.cpp gbGfx.cpp gbGlobals.cpp gbMemory.cpp \ ! gbPrinter.cpp gbSGB.cpp gbSound.cpp GB.h gbCheats.h gbCodes.h \ ! gbCodesCB.h gbGlobals.h gbMemory.h gbPrinter.h gbSGB.h gbSound.h \ ! gbDis.cpp subdir = src/gb --- 154,175 ---- libgb_a_SOURCES = \ ! gbCheats.cpp \ ! gbCheats.h \ ! gbCodesCB.h \ ! gbCodes.h \ ! GB.cpp \ ! GB.h \ ! gbDis.cpp \ ! gbGfx.cpp \ ! gbGlobals.cpp \ ! gbGlobals.h \ ! gbMemory.cpp \ ! gbMemory.h \ ! gbPrinter.cpp \ ! gbPrinter.h \ ! gbSGB.cpp \ ! gbSGB.h \ ! gbSound.cpp \ ! gbSound.h subdir = src/gb *************** *** 153,159 **** libgb_a_AR = $(AR) cru libgb_a_LIBADD = ! am_libgb_a_OBJECTS = GB.$(OBJEXT) gbCheats.$(OBJEXT) gbGfx.$(OBJEXT) \ ! gbGlobals.$(OBJEXT) gbMemory.$(OBJEXT) gbPrinter.$(OBJEXT) \ ! gbSGB.$(OBJEXT) gbSound.$(OBJEXT) gbDis.$(OBJEXT) libgb_a_OBJECTS = $(am_libgb_a_OBJECTS) --- 181,187 ---- libgb_a_AR = $(AR) cru libgb_a_LIBADD = ! am_libgb_a_OBJECTS = gbCheats.$(OBJEXT) GB.$(OBJEXT) gbDis.$(OBJEXT) \ ! gbGfx.$(OBJEXT) gbGlobals.$(OBJEXT) gbMemory.$(OBJEXT) \ ! gbPrinter.$(OBJEXT) gbSGB.$(OBJEXT) gbSound.$(OBJEXT) libgb_a_OBJECTS = $(am_libgb_a_OBJECTS) *************** *** 338,342 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 366,370 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 23 Apr 2003 12:29:53 -0000 1.2 --- Makefile.am 29 Mar 2004 22:08:39 -0000 1.3 *************** *** 2,9 **** libgb_a_SOURCES = \ ! GB.cpp gbCheats.cpp gbGfx.cpp gbGlobals.cpp gbMemory.cpp \ ! gbPrinter.cpp gbSGB.cpp gbSound.cpp GB.h gbCheats.h gbCodes.h \ ! gbCodesCB.h gbGlobals.h gbMemory.h gbPrinter.h gbSGB.h gbSound.h \ ! gbDis.cpp ! ! --- 2,21 ---- libgb_a_SOURCES = \ ! gbCheats.cpp \ ! gbCheats.h \ ! gbCodesCB.h \ ! gbCodes.h \ ! GB.cpp \ ! GB.h \ ! gbDis.cpp \ ! gbGfx.cpp \ ! gbGlobals.cpp \ ! gbGlobals.h \ ! gbMemory.cpp \ ! gbMemory.h \ ! gbPrinter.cpp \ ! gbPrinter.h \ ! gbSGB.cpp \ ! gbSGB.h \ ! gbSound.cpp \ ! gbSound.h |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:32
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/win32 Modified Files: Makefile.am Makefile.in gba_sdl.dsp gba_sdl.vcproj Log Message: GTK+ frontend draft added. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 1 Feb 2004 15:02:39 -0000 1.6 --- Makefile.in 29 Mar 2004 22:08:56 -0000 1.7 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ *************** *** 61,76 **** --- 61,88 ---- EGREP = @EGREP@ EXEEXT = @EXEEXT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMSGFMT = @GMSGFMT@ + GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ *************** *** 82,85 **** --- 94,99 ---- PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ *************** *** 89,100 **** SHELL = @SHELL@ STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_MMX = @VBA_MMX@ ! VBA_PROF = @VBA_PROF@ VERSION = @VERSION@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_NASM = @ac_ct_NASM@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ --- 103,114 ---- SHELL = @SHELL@ STRIP = @STRIP@ + USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ ! VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ *************** *** 138,142 **** target_vendor = @target_vendor@ EXTRA_DIST = \ ! gba_sdl.dsp gba_sdl.dsw GBA.dsp GBA.dsw SDL-1.2.2 lib include subdir = win32 --- 152,166 ---- target_vendor = @target_vendor@ EXTRA_DIST = \ ! gba_sdl.dsp \ ! gba_sdl.dsw \ ! gba_sdl.sln \ ! gba_sdl.vcproj \ ! GBA.dsp \ ! GBA.dsw \ ! gba.sln \ ! GBA.vcproj \ ! SDL-1.2.2 \ ! lib \ ! include subdir = win32 *************** *** 212,216 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 236,240 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 280,286 **** dist-hook: ! rm -rf `find $(distdir)/SDL-1.2.2 -name CVS` ! rm -rf `find $(distdir)/lib -name CVS` ! rm -rf `find $(distdir)/include -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 304,308 ---- dist-hook: ! rm -rf `find $(distdir) -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 20 Oct 2002 13:03:12 -0000 1.1 --- Makefile.am 29 Mar 2004 22:08:41 -0000 1.2 *************** *** 1,7 **** EXTRA_DIST = \ ! gba_sdl.dsp gba_sdl.dsw GBA.dsp GBA.dsw SDL-1.2.2 lib include dist-hook: ! rm -rf `find $(distdir)/SDL-1.2.2 -name CVS` ! rm -rf `find $(distdir)/lib -name CVS` ! rm -rf `find $(distdir)/include -name CVS` --- 1,15 ---- EXTRA_DIST = \ ! gba_sdl.dsp \ ! gba_sdl.dsw \ ! gba_sdl.sln \ ! gba_sdl.vcproj \ ! GBA.dsp \ ! GBA.dsw \ ! gba.sln \ ! GBA.vcproj \ ! SDL-1.2.2 \ ! lib \ ! include dist-hook: ! rm -rf `find $(distdir) -name CVS` Index: gba_sdl.dsp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gba_sdl.dsp 5 Feb 2004 11:42:36 -0000 1.11 --- gba_sdl.dsp 29 Mar 2004 22:08:56 -0000 1.12 *************** *** 43,47 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "NDEBUG" /D "FINAL_VERSION" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 43,47 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../src" /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "NDEBUG" /D "FINAL_VERSION" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 68,72 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "_DEBUG" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 68,72 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "_DEBUG" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 266,270 **** # Begin Source File ! SOURCE=..\src\debugger.cpp # End Source File # Begin Source File --- 266,270 ---- # Begin Source File ! SOURCE=..\src\sdl\debugger.cpp # End Source File # Begin Source File *************** *** 298,302 **** # Begin Source File ! SOURCE=..\src\SDL.cpp # End Source File # Begin Source File --- 298,302 ---- # Begin Source File ! SOURCE=..\src\sdl\SDL.cpp # End Source File # Begin Source File Index: gba_sdl.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gba_sdl.vcproj 7 Feb 2004 15:07:18 -0000 1.2 --- gba_sdl.vcproj 29 Mar 2004 22:08:56 -0000 1.3 *************** *** 23,27 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="include/zlib,include/png,SDL-1.2.2/include" PreprocessorDefinitions="_DEBUG,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING" BasicRuntimeChecks="3" --- 23,27 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="../src,include/zlib,include/png,SDL-1.2.2/include" PreprocessorDefinitions="_DEBUG,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING" BasicRuntimeChecks="3" *************** *** 81,85 **** Optimization="2" InlineFunctionExpansion="2" ! AdditionalIncludeDirectories="include/zlib,include/png,SDL-1.2.2/include" PreprocessorDefinitions="NDEBUG,FINAL_VERSION,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING" StringPooling="TRUE" --- 81,85 ---- Optimization="2" InlineFunctionExpansion="2" ! AdditionalIncludeDirectories="../src,include/zlib,include/png,SDL-1.2.2/include" PreprocessorDefinitions="NDEBUG,FINAL_VERSION,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING" StringPooling="TRUE" *************** *** 255,259 **** Filter=""> <File ! RelativePath="..\src\SDL.cpp"> </File> <File --- 255,259 ---- Filter=""> <File ! RelativePath="..\src\sdl\SDL.cpp"> </File> <File *************** *** 264,268 **** </File> <File ! RelativePath="..\src\debugger.cpp"> </File> <File --- 264,268 ---- </File> <File ! RelativePath="..\src\sdl\debugger.cpp"> </File> <File |
Update of /cvsroot/vba/VisualBoyAdvance/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/m4 Added Files: ChangeLog Makefile.am Makefile.in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 Log Message: GTK+ frontend draft added. --- NEW FILE: gettext.m4 --- # gettext.m4 serial 28 (gettext-0.13) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2003. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The dnl default (if it is not specified or empty) is 'no-libtool'. dnl INTLSYMBOL should be 'external' for packages with no intl directory, dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library dnl $(top_builddir)/intl/libintl.a will be created. dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function dnl will be ignored. If NEEDSYMBOL is specified and is dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, dnl the value `$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled dnl and used. dnl Catalog format: GNU --> install in $(datadir) dnl Catalog extension: .mo after installation, .gmo in source tree dnl 2) GNU gettext has been found in the system's C library. dnl Catalog format: GNU --> install in $(datadir) dnl Catalog extension: .mo after installation, .gmo in source tree dnl 3) No internationalization, always use English msgid. dnl Catalog format: none dnl Catalog extension: none dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. dnl The use of .gmo is historical (it was needed to avoid overwriting the dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) define(gt_included_intl, ifelse([$1], [external], [no], [yes])) define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ AC_REQUIRE([AM_INTL_SUBDIR])dnl ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not dnl documented, we avoid it. ifelse(gt_included_intl, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) dnl Set USE_NLS. AM_NLS ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) LIBINTL= LTLIBINTL= POSUB= dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ]) dnl User does not insist on using GNU NLS library. Figure out what dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. dnl Add a version number to the cache macros. define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, [AC_TRY_LINK([#include <libintl.h> ]ifelse([$2], [need-formatstring-macros], [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; changequote([,])dnl ], [])[extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no)]) if test "$gt_cv_func_gnugettext_libc" != "yes"; then dnl Sometimes libintl requires libiconv, so first search for libiconv. ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) dnl because that would add "-liconv" to LIBINTL and LTLIBINTL dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], gt_cv_func_gnugettext_libintl, [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. AC_TRY_LINK([#include <libintl.h> ]ifelse([$2], [need-formatstring-macros], [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; changequote([,])dnl ], [])[extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) dnl Now see whether libintl exists and depends on libiconv. if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include <libintl.h> ]ifelse([$2], [need-formatstring-macros], [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; changequote([,])dnl ], [])[extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=yes ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) fi dnl If an already present or preinstalled GNU gettext() is found, dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) if test "$gt_cv_func_gnugettext_libc" = "yes" \ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. LIBINTL= LTLIBINTL= INCINTL= fi ifelse(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo fi ]) if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.]) else USE_NLS=no fi fi AC_MSG_CHECKING([whether to use NLS]) AC_MSG_RESULT([$USE_NLS]) if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext_libintl" = "yes"; then gt_source="external libintl" else gt_source="libc" fi else gt_source="included intl directory" fi AC_MSG_RESULT([$gt_source]) fi if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext_libintl" = "yes"; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi dnl For backward compatibility. Some packages may be using this. AC_DEFINE(HAVE_GETTEXT, 1, [Define if the GNU gettext() function is already present or preinstalled.]) AC_DEFINE(HAVE_DCGETTEXT, 1, [Define if the GNU dcgettext() function is already present or preinstalled.]) fi dnl We need to process the po/ directory. POSUB=po fi ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then BUILD_INCLUDED_LIBINTL=yes fi dnl Make all variables we use known to autoconf. AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATOBJEXT) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= nls_cv_header_libgt= dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share AC_SUBST(DATADIRNAME) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo AC_SUBST(INSTOBJEXT) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat AC_SUBST(GENCAT) dnl For backward compatibility. Some Makefiles may be using this. if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi AC_SUBST(INTLOBJS) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" AC_SUBST(INTLLIBS) dnl Make all documented variables known to autoconf. AC_SUBST(LIBINTL) AC_SUBST(LTLIBINTL) AC_SUBST(POSUB) ]) dnl Checks for all prerequisites of the intl subdirectory, dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AM_MKINSTALLDIRS])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_C_CONST])dnl AC_REQUIRE([bh_C_SIGNED])dnl AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl AC_REQUIRE([gt_TYPE_WCHAR_T])dnl AC_REQUIRE([gt_TYPE_WINT_T])dnl AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) AC_REQUIRE([jm_AC_HEADER_STDINT_H]) AC_REQUIRE([gt_TYPE_INTMAX_T]) AC_REQUIRE([gt_PRINTF_POSIX]) AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([jm_GLIBC21])dnl AC_REQUIRE([gt_INTDIV0])dnl AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_XSIZE])dnl AC_CHECK_TYPE([ptrdiff_t], , [AC_DEFINE([ptrdiff_t], [long], [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) ]) AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ __fsetlocking]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) dnl Use the *_unlocked functions only if they are declared. dnl (because some of them were defined without being declared in Solaris dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built dnl on Solaris 2.5.1 to run on Solaris 2.6). dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) case $gt_cv_func_printf_posix in *yes) HAVE_POSIX_PRINTF=1 ;; *) HAVE_POSIX_PRINTF=0 ;; esac AC_SUBST([HAVE_POSIX_PRINTF]) if test "$ac_cv_func_asprintf" = yes; then HAVE_ASPRINTF=1 else HAVE_ASPRINTF=0 fi AC_SUBST([HAVE_ASPRINTF]) if test "$ac_cv_func_snprintf" = yes; then HAVE_SNPRINTF=1 else HAVE_SNPRINTF=0 fi AC_SUBST([HAVE_SNPRINTF]) if test "$ac_cv_func_wprintf" = yes; then HAVE_WPRINTF=1 else HAVE_WPRINTF=0 fi AC_SUBST([HAVE_WPRINTF]) AM_ICONV AM_LANGINFO_CODESET if test $ac_cv_header_locale_h = yes; then AM_LC_MESSAGES fi dnl intl/plural.c is generated from intl/plural.y. It requires bison, dnl because plural.y uses bison specific features. It requires at least dnl bison-1.26 because earlier versions generate a plural.c that doesn't dnl compile. dnl bison is only needed for the maintainer (who touches plural.y). But in dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put dnl the rule in general Makefile. Now, some people carelessly touch the dnl files or have a broken "make" program, hence the plural.c rule will dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not dnl present or too old. AC_CHECK_PROGS([INTLBISON], [bison]) if test -z "$INTLBISON"; then ac_verc_fail=yes else dnl Found it, now check the version. AC_MSG_CHECKING([version of bison]) changequote(<<,>>)dnl ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) changequote([,])dnl ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac AC_MSG_RESULT([$ac_prog_version]) fi if test $ac_verc_fail = yes; then INTLBISON=: fi ]) dnl gt_CHECK_DECL(FUNC, INCLUDES) dnl Check whether a function is declared. AC_DEFUN([gt_CHECK_DECL], [ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, [AC_TRY_COMPILE([$2], [ #ifndef $1 char *p = (char *) $1; #endif ], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) if test $ac_cv_have_decl_$1 = yes; then gt_value=1 else gt_value=0 fi AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) ]) dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) --- NEW FILE: xsize.m4 --- # xsize.m4 serial 2 dnl Copyright (C) 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. AC_DEFUN([gl_XSIZE], [ dnl Prerequisites of lib/xsize.h. AC_REQUIRE([gl_SIZE_MAX]) AC_CHECK_HEADERS(stdint.h) ]) --- NEW FILE: Makefile.am --- EXTRA_DIST = \ codeset.m4 \ gettext.m4 \ glibc21.m4 \ iconv.m4 \ intdiv0.m4 \ intmax.m4 \ inttypes_h.m4 \ inttypes.m4 \ inttypes-pri.m4 \ isc-posix.m4 \ lcmessage.m4 \ lib-ld.m4 \ lib-link.m4 \ lib-prefix.m4 \ longdouble.m4 \ longlong.m4 \ nls.m4 \ po.m4 \ printf-posix.m4 \ progtest.m4 \ signed.m4 \ size_max.m4 \ stdint_h.m4 \ uintmax_t.m4 \ ulonglong.m4 \ wchar_t.m4 \ wint_t.m4 \ xsize.m4 --- NEW FILE: longdouble.m4 --- # longdouble.m4 serial 1 (gettext-0.12) dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. dnl Test whether the compiler supports the 'long double' type. dnl Prerequisite: AC_PROG_CC AC_DEFUN([gt_TYPE_LONGDOUBLE], [ AC_CACHE_CHECK([for long double], gt_cv_c_long_double, [if test "$GCC" = yes; then gt_cv_c_long_double=yes else AC_TRY_COMPILE([ /* The Stardent Vistra knows sizeof(long double), but does not support it. */ long double foo = 0.0; /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ int array [2*(sizeof(long double) >= sizeof(double)) - 1]; ], , gt_cv_c_long_double=yes, gt_cv_c_long_double=no) fi]) if test $gt_cv_c_long_double = yes; then AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) fi ]) --- NEW FILE: iconv.m4 --- # iconv.m4 serial AM4 (gettext-0.11.3) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. AC_LIB_LINKFLAGS_BODY([iconv]) ]) AC_DEFUN([AM_ICONV_LINK], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include <stdlib.h> #include <iconv.h>], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], am_cv_func_iconv=yes) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include <stdlib.h> #include <iconv.h>], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], am_cv_lib_iconv=yes am_cv_func_iconv=yes) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) AC_MSG_RESULT([$LIBICONV]) else dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV dnl either. CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi AC_SUBST(LIBICONV) AC_SUBST(LTLIBICONV) ]) AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) AC_CACHE_VAL(am_cv_proto_iconv, [ AC_TRY_COMPILE([ #include <stdlib.h> #include <iconv.h> extern #ifdef __cplusplus "C" #endif #if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([$]{ac_t:- }[$]am_cv_proto_iconv) AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, [Define as const if the declaration of iconv() needs const.]) fi ]) --- NEW FILE: ChangeLog --- 2004-03-29 gettextize <bug...@gn...> * codeset.m4: New file, from gettext-0.14.1. * gettext.m4: New file, from gettext-0.14.1. * glibc21.m4: New file, from gettext-0.14.1. * iconv.m4: New file, from gettext-0.14.1. * intdiv0.m4: New file, from gettext-0.14.1. * intmax.m4: New file, from gettext-0.14.1. * inttypes.m4: New file, from gettext-0.14.1. * inttypes_h.m4: New file, from gettext-0.14.1. * inttypes-pri.m4: New file, from gettext-0.14.1. * isc-posix.m4: New file, from gettext-0.14.1. * lcmessage.m4: New file, from gettext-0.14.1. * lib-ld.m4: New file, from gettext-0.14.1. * lib-link.m4: New file, from gettext-0.14.1. * lib-prefix.m4: New file, from gettext-0.14.1. * longdouble.m4: New file, from gettext-0.14.1. * longlong.m4: New file, from gettext-0.14.1. * nls.m4: New file, from gettext-0.14.1. * po.m4: New file, from gettext-0.14.1. * printf-posix.m4: New file, from gettext-0.14.1. * progtest.m4: New file, from gettext-0.14.1. * signed.m4: New file, from gettext-0.14.1. * size_max.m4: New file, from gettext-0.14.1. * stdint_h.m4: New file, from gettext-0.14.1. * uintmax_t.m4: New file, from gettext-0.14.1. * ulonglong.m4: New file, from gettext-0.14.1. * wchar_t.m4: New file, from gettext-0.14.1. * wint_t.m4: New file, from gettext-0.14.1. * xsize.m4: New file, from gettext-0.14.1. * Makefile.am: New file. --- NEW FILE: nls.m4 --- # nls.m4 serial 1 (gettext-0.12) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2003. AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) ]) AC_DEFUN([AM_MKINSTALLDIRS], [ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl Try to locate it. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then case "$ac_aux_dir" in /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; esac fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi AC_SUBST(MKINSTALLDIRS) ]) --- NEW FILE: po.m4 --- # po.m4 serial 3 (gettext-0.14) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2003. dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AM_MKINSTALLDIRS])dnl AC_REQUIRE([AM_NLS])dnl dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. dnl Search for GNU msgfmt in the PATH. dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. dnl The second test excludes FreeBSD msgfmt. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) dnl Search for GNU xgettext 0.12 or newer in the PATH. dnl The first test excludes Solaris xgettext and early GNU xgettext versions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. rm -f messages.po dnl Search for GNU msgmerge 0.11 or newer in the PATH. AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. if test "$GMSGFMT" != ":"; then dnl If it is no GNU msgfmt we define it as : so that the dnl Makefiles still can work. if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` AC_MSG_RESULT( [found $GMSGFMT program is not GNU msgfmt; ignore it]) GMSGFMT=":" fi fi dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else AC_MSG_RESULT( [found xgettext program is not GNU xgettext; ignore it]) XGETTEXT=":" fi dnl Remove leftover from FreeBSD xgettext call. rm -f messages.po fi AC_OUTPUT_COMMANDS([ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac # PO directories have a Makefile.in generated from Makefile.in.in. case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) # Compute UPDATEPOFILES # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) # Compute DUMMYPOFILES # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) # Compute GMOFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; esac POFILES= UPDATEPOFILES= DUMMYPOFILES= GMOFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" DUMMYPOFILES="$DUMMYPOFILES $lang.nop" GMOFILES="$GMOFILES $srcdirpre$lang.gmo" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. INST_LINGUAS= if test -n "$ALL_LINGUAS"; then for presentlang in $ALL_LINGUAS; do useit=no if test "%UNSET%" != "$LINGUAS"; then desiredlanguages="$LINGUAS" else desiredlanguages="$ALL_LINGUAS" fi for desiredlang in $desiredlanguages; do # Use the presentlang catalog if desiredlang is # a. equal to presentlang, or # b. a variant of presentlang (because in this case, # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in "$presentlang"*) useit=yes;; esac done if test $useit = yes; then INST_LINGUAS="$INST_LINGUAS $presentlang" fi done fi CATALOGS= if test -n "$INST_LINGUAS"; then for lang in $INST_LINGUAS; do CATALOGS="$CATALOGS $lang.gmo" done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in *.orig | *.bak | *~) ;; *) cat "$f" >> "$ac_dir/Makefile" ;; esac fi done fi ;; esac done], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake. eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" ]) ]) dnl Postprocesses a Makefile in a directory containing PO files. AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], [ # When this code is run, in config.status, two variables have already been # set: # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, # - LINGUAS is the value of the environment variable LINGUAS at configure # time. changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac # Find a way to echo strings without interpreting backslash. if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then gt_echo='echo' else if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then gt_echo='printf %s\n' else echo_func () { cat <<EOT $* EOT } gt_echo='echo_func' fi fi # A sed script that extracts the value of VARIABLE from a Makefile. sed_x_variable=' # Test if the hold space is empty. x s/P/P/ x ta # Yes it was empty. Look if we have the expected variable definition. /^[ ]*VARIABLE[ ]*=/{ # Seen the first line of the variable definition. s/^[ ]*VARIABLE[ ]*=// ba } bd :a # Here we are processing a line from the variable definition. # Remove comment, more precisely replace it with a space. s/#.*$/ / # See if the line ends in a backslash. tb :b s/\\$// # Print the line, without the trailing backslash. p tc # There was no trailing backslash. The end of the variable definition is # reached. Clear the hold space. s/^.*$// x bd :c # A trailing backslash means that the variable definition continues in the # next line. Put a nonempty string into the hold space to indicate this. s/^.*$/P/ x :d ' changequote([,])dnl # Set POTFILES to the value of the Makefile variable POTFILES. sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`" POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` # Compute POTFILES_DEPS as # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) POTFILES_DEPS= for file in $POTFILES; do POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" done POMAKEFILEDEPS="" if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`" ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) # Compute UPDATEPOFILES # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) # Compute DUMMYPOFILES # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) # Compute GMOFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) # Compute PROPERTIESFILES # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) # Compute CLASSFILES # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) # Compute QMFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) # Compute MSGFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) # Compute RESOURCESDLLFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; esac POFILES= UPDATEPOFILES= DUMMYPOFILES= GMOFILES= PROPERTIESFILES= CLASSFILES= QMFILES= MSGFILES= RESOURCESDLLFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" DUMMYPOFILES="$DUMMYPOFILES $lang.nop" GMOFILES="$GMOFILES $srcdirpre$lang.gmo" PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" QMFILES="$QMFILES $srcdirpre$lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" frobbedlang=`echo $lang | sed -e 's/_/-/g'` RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. INST_LINGUAS= if test -n "$ALL_LINGUAS"; then for presentlang in $ALL_LINGUAS; do useit=no if test "%UNSET%" != "$LINGUAS"; then desiredlanguages="$LINGUAS" else desiredlanguages="$ALL_LINGUAS" fi for desiredlang in $desiredlanguages; do # Use the presentlang catalog if desiredlang is # a. equal to presentlang, or # b. a variant of presentlang (because in this case, # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in "$presentlang"*) useit=yes;; esac done if test $useit = yes; then INST_LINGUAS="$INST_LINGUAS $presentlang" fi done fi CATALOGS= JAVACATALOGS= QTCATALOGS= TCLCATALOGS= CSHARPCATALOGS= if test -n "$INST_LINGUAS"; then for lang in $INST_LINGUAS; do CATALOGS="$CATALOGS $lang.gmo" JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" QTCATALOGS="$QTCATALOGS $lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" frobbedlang=`echo $lang | sed -e 's/_/-/g'` CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" done fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <<EOF $frobbedlang.msg: $lang.po @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/_/-/g'` cat >> "$ac_file.tmp" <<EOF $frobbedlang/\$(DOMAIN).resources.dll: $lang.po @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi if test -n "$POMAKEFILEDEPS"; then cat >> "$ac_file.tmp" <<EOF Makefile: $POMAKEFILEDEPS EOF fi mv "$ac_file.tmp" "$ac_file" ]) --- NEW FILE: longlong.m4 --- # longlong.m4 serial 4 dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Paul Eggert. # Define HAVE_LONG_LONG if 'long long' works. AC_DEFUN([jm_AC_TYPE_LONG_LONG], [ AC_CACHE_CHECK([for long long], ac_cv_type_long_long, [AC_TRY_LINK([long long ll = 1LL; int i = 63;], [long long llmax = (long long) -1; return ll << i | ll >> i | llmax / ll | llmax % ll;], ac_cv_type_long_long=yes, ac_cv_type_long_long=no)]) if test $ac_cv_type_long_long = yes; then AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have the 'long long' type.]) fi ]) --- NEW FILE: intdiv0.m4 --- # intdiv0.m4 serial 1 (gettext-0.11.3) dnl Copyright (C) 2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. AC_DEFUN([gt_INTDIV0], [ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], gt_cv_int_divbyzero_sigfpe, [ AC_TRY_RUN([ #include <stdlib.h> #include <signal.h> static void #ifdef __cplusplus sigfpe_handler (int sig) #else sigfpe_handler (sig) int sig; #endif { /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ exit (sig != SIGFPE); } int x = 1; int y = 0; int z; int nan; int main () { signal (SIGFPE, sigfpe_handler); /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) signal (SIGTRAP, sigfpe_handler); #endif /* Linux/SPARC yields signal SIGILL. */ #if defined (__sparc__) && defined (__linux__) signal (SIGILL, sigfpe_handler); #endif z = x / y; nan = y / y; exit (1); } ], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, [ # Guess based on the CPU. case "$host_cpu" in alpha* | i[34567]86 | m68k | s390*) gt_cv_int_divbyzero_sigfpe="guessing yes";; *) gt_cv_int_divbyzero_sigfpe="guessing no";; esac ]) ]) case "$gt_cv_int_divbyzero_sigfpe" in *yes) value=1;; *) value=0;; esac AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, [Define if integer division by zero raises signal SIGFPE.]) ]) --- NEW FILE: codeset.m4 --- # codeset.m4 serial AM1 (gettext-0.10.40) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, [AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) if test $am_cv_langinfo_codeset = yes; then AC_DEFINE(HAVE_LANGINFO_CODESET, 1, [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) fi ]) --- NEW FILE: intmax.m4 --- # intmax.m4 serial 1 (gettext-0.12) dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. dnl Test whether the system has the 'intmax_t' type, but don't attempt to dnl find a replacement if it is lacking. AC_DEFUN([gt_TYPE_INTMAX_T], [ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) AC_REQUIRE([jm_AC_HEADER_STDINT_H]) AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, [AC_TRY_COMPILE([ #include <stddef.h> #include <stdlib.h> #if HAVE_STDINT_H_WITH_UINTMAX #include <stdint.h> #endif #if HAVE_INTTYPES_H_WITH_UINTMAX #include <inttypes.h> #endif ], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) if test $gt_cv_c_intmax_t = yes; then AC_DEFINE(HAVE_INTMAX_T, 1, [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) --- NEW FILE: lib-ld.m4 --- # lib-ld.m4 serial 3 (gettext-0.13) dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl Subroutines of libtool.m4, dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) acl_cv_prog_gnu_ld=yes ;; *) acl_cv_prog_gnu_ld=no ;; esac]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) dnl From libtool-1.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then echo "#! /bin/sh" >conf$$.sh echo "exit 0" >>conf$$.sh chmod +x conf$$.sh if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi rm -f conf$$.sh fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by GCC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; esac case $ac_prog in # Accept absolute paths. [[\\/]* | [A-Za-z]:[\\/]*)] [re_direlt='/[^/][^/]*/\.\./'] # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld ;; *) # If it is relative, then search for the first ld in PATH. with_gnu_ld=unknown ;; esac elif test "$with_gnu_ld" = yes; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(acl_cv_path_LD, [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) test "$with_gnu_ld" != no && break ;; *) test "$with_gnu_ld" != yes && break ;; esac fi done IFS="$ac_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then AC_MSG_RESULT($LD) else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU ]) --- NEW FILE: ulonglong.m4 --- # ulonglong.m4 serial 3 dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Paul Eggert. # Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], [unsigned long long ullmax = (unsigned long long) -1; return ull << i | ull >> i | ullmax / ull | ullmax % ull;], ac_cv_type_unsigned_long_long=yes, ac_cv_type_unsigned_long_long=no)]) if test $ac_cv_type_unsigned_long_long = yes; then AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, [Define if you have the 'unsigned long long' type.]) fi ]) --- NEW FILE: lcmessage.m4 --- # lcmessage.m4 serial 3 (gettext-0.11.3) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995. # Check whether LC_MESSAGES is available in <locale.h>. AC_DEFUN([AM_LC_MESSAGES], [ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your <locale.h> file defines LC_MESSAGES.]) fi ]) --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMSGFMT = @GMSGFMT@ GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NASM = @NASM@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POSUB = @POSUB@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VBA_EXTRA = @VBA_EXTRA@ VBA_LIBS = @VBA_LIBS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepC... [truncated message content] |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:13
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src/sdl Added Files: Makefile.am Makefile.in SDL.cpp TestEmu.cpp debugger.cpp debugger.h Log Message: GTK+ frontend draft added. --- NEW FILE: TestEmu.cpp --- /* * VisualBoyAdvanced - Nintendo Gameboy/GameboyAdvance (TM) emulator * Copyrigh(c) 1999-2002 Forgotten (vb...@em...) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> #include "AutoBuild.h" #include "GBA.h" #include "debugger.h" #include "Sound.h" #include "unzip.h" #include "Util.h" #include "gb/GB.h" #include "gb/gbGlobals.h" #ifdef __GNUC__ #include <unistd.h> #define GETCWD getcwd #else #include <direct.h> #define GETCWD _getcwd #endif #ifdef MMX extern "C" bool cpu_mmx; #endif extern bool soundEcho; extern bool soundLowPass; extern bool soundReverse; extern void remoteInit(); extern void remoteCleanUp(); extern void remoteStubMain(); extern void remoteStubSignal(int,int); extern void remoteOutput(char *, u32); extern void remoteSetProtocol(int); extern void remoteSetPort(int); extern void debuggerOutput(char *, u32); struct EmulatedSystem emulator; static u8 COPYRIGHT[] = { 0xa9, 0x96, 0x8c, 0x8a, 0x9e, 0x93, 0xbd, 0x90, 0x86, 0xbe, 0x9b, 0x89, 0x9e, 0x91, 0x9c, 0x9a, 0xdf, 0xd7, 0xbc, 0xd6, 0xdf, 0xce, 0xc6, 0xc6, 0xc6, 0xd3, 0xcd, 0xcf, 0xcf, 0xcf, 0xd3, 0xcd, 0xcf, 0xcf, 0xce, 0xdf, 0x9d, 0x86, 0xdf, 0xb9, 0x90, 0x8d, 0x98, 0x90, 0x8b, 0x8b, 0x9a, 0x91, 0x00 }; int systemRedShift = 0; int systemBlueShift = 16; int systemGreenShift = 8; int systemColorDepth = 32; int systemDebug = 0; int systemVerbose = 0; int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; int cartridgeType = 3; int captureFormat = 0; int emulating = 0; int RGB_LOW_BITS_MASK=0x821; int systemFrameSkip = 0; u32 systemColorMap32[0x10000]; u16 systemColorMap16[0x10000]; u16 systemGbPalette[24]; char filename[2048]; char biosFileName[2048]; char captureDir[2048]; char saveDir[2048]; char batteryDir[2048]; bool paused = false; bool debugger = true; bool debuggerStub = false; bool systemSoundOn = false; bool removeIntros = false; extern void debuggerSignal(int,int); void (*dbgMain)() = debuggerMain; void (*dbgSignal)(int,int) = debuggerSignal; void (*dbgOutput)(char *, u32) = debuggerOutput; char *sdlGetFilename(char *name) { static char filebuffer[2048]; int len = strlen(name); char *p = name + len - 1; while(true) { if(*p == '/' || *p == '\\') { p++; break; } len--; p--; if(len == 0) break; } if(len == 0) strcpy(filebuffer, name); else strcpy(filebuffer, p); return filebuffer; } void usage(char *cmd) { printf("%s file-name\n",cmd); } int main(int argc, char **argv) { fprintf(stderr,"VisualBoyAdvance-Test version %s\n", VERSION); #ifdef __GNUC__ fprintf(stderr,"Linux version\n"); #else fprintf(stderr,"Windows version\n"); #endif captureDir[0] = 0; saveDir[0] = 0; batteryDir[0] = 0; char buffer[1024]; int op = -1; systemFrameSkip = frameSkip = 2; gbBorderOn = 0; parseDebug = true; if(!debuggerStub) { if(argc <= 1) { systemMessage(0,"Missing image name"); usage(argv[0]); exit(-1); } } for(int i = 0; i < 24;) { systemGbPalette[i++] = (0x1f) | (0x1f << 5) | (0x1f << 10); systemGbPalette[i++] = (0x15) | (0x15 << 5) | (0x15 << 10); systemGbPalette[i++] = (0x0c) | (0x0c << 5) | (0x0c << 10); systemGbPalette[i++] = 0; } if(argc == 2) { char *szFile = argv[optind]; bool failed = false; if(CPUIsZipFile(szFile)) { unzFile unz = unzOpen(szFile); if(unz == NULL) { systemMessage(0, "Cannot open file %s", szFile); exit(-1); } int r = unzGoToFirstFile(unz); if(r != UNZ_OK) { unzClose(unz); systemMessage(0, "Bad ZIP file %s", szFile); exit(-1); } bool found = false; unz_file_info info; while(true) { r = unzGetCurrentFileInfo(unz, &info, buffer, sizeof(buffer), NULL, 0, NULL, 0); if(r != UNZ_OK) { unzClose(unz); systemMessage(0,"Bad ZIP file %s", szFile); exit(-1); } if(utilIsGBImage(buffer)) { found = true; cartridgeType = 1; break; } if(utilIsGBAImage(buffer)) { found = true; cartridgeType = 0; break; } r = unzGoToNextFile(unz); if(r != UNZ_OK) break; } if(!found) { unzClose(unz); systemMessage(0, "No image found on ZIP file %s", szFile); exit(-1); } unzClose(unz); } if(utilIsGBImage(szFile) || cartridgeType == 1) { failed = !gbLoadRom(szFile); cartridgeType = 1; emulator = GBSystem; } else if(utilIsGBAImage(szFile) || cartridgeType == 0) { failed = !CPULoadRom(szFile); cartridgeType = 0; emulator = GBASystem; CPUInit(biosFileName, useBios); CPUReset(); } else { systemMessage(0, "Unknown file type %s", szFile); exit(-1); } if(failed) { systemMessage(0, "Failed to load file %s", szFile); exit(-1); } strcpy(filename, szFile); char *p = strrchr(filename, '.'); if(p) *p = 0; } else { cartridgeType = 0; strcpy(filename, "gnu_stub"); rom = (u8 *)malloc(0x2000000); workRAM = (u8 *)calloc(1, 0x40000); bios = (u8 *)calloc(1,0x4000); internalRAM = (u8 *)calloc(1,0x8000); paletteRAM = (u8 *)calloc(1,0x400); vram = (u8 *)calloc(1, 0x20000); oam = (u8 *)calloc(1, 0x400); pix = (u8 *)calloc(1, 4 * 240 * 160); ioMem = (u8 *)calloc(1, 0x400); emulator = GBASystem; CPUInit(biosFileName, useBios); CPUReset(); } if(debuggerStub) remoteInit(); if(cartridgeType == 0) { } else if (cartridgeType == 1) { if(gbBorderOn) { gbBorderLineSkip = 256; gbBorderColumnSkip = 48; gbBorderRowSkip = 40; } else { gbBorderLineSkip = 160; gbBorderColumnSkip = 0; gbBorderRowSkip = 0; } } else { } for(int i = 0; i < 0x10000; i++) { systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | (((i & 0x3e0) >> 5) << systemGreenShift) | (((i & 0x7c00) >> 10) << systemBlueShift); } emulating = 1; soundInit(); while(emulating) { if(!paused) { if(debugger && emulator.emuHasDebugger) dbgMain(); else emulator.emuMain(emulator.emuCount); } } emulating = 0; fprintf(stderr,"Shutting down\n"); remoteCleanUp(); soundShutdown(); if(gbRom != NULL || rom != NULL) { emulator.emuCleanUp(); } return 0; } void systemMessage(int num, const char *msg, ...) { char buffer[2048]; va_list valist; va_start(valist, msg); vsprintf(buffer, msg, valist); fprintf(stderr, "%s\n", buffer); va_end(valist); } void systemDrawScreen() { } bool systemReadJoypads() { return true; } u32 systemReadJoypad(int) { return 0; } void systemShowSpeed(int speed) { } void system10Frames(int rate) { } void systemFrame() { } void systemSetTitle(const char *title) { } void systemScreenCapture(int a) { char buffer[2048]; if(captureFormat) { if(captureDir[0]) sprintf(buffer, "%s/%s%02d.bmp", captureDir, sdlGetFilename(filename), a); else sprintf(buffer, "%s%02d.bmp", filename, a); emulator.emuWriteBMP(buffer); } else { if(captureDir[0]) sprintf(buffer, "%s/%s%02d.png", captureDir, sdlGetFilename(filename), a); else sprintf(buffer, "%s%02d.png", filename, a); emulator.emuWritePNG(buffer); } systemScreenMessage("Screen capture"); } u32 systemReadJoypadExtended() { return 0; } void systemWriteDataToSoundBuffer() { } bool systemSoundInit() { return true; } void systemSoundShutdown() { } void systemSoundPause() { } void systemSoundResume() { } void systemSoundReset() { } static int ticks = 0; u32 systemGetClock() { return ticks++; } void systemUpdateMotionSensor() { } int systemGetSensorX() { return 0; } int systemGetSensorY() { return 0; } void systemGbPrint(u8 *data,int pages,int feed,int palette, int contrast) { } void systemScreenMessage(const char *msg) { } bool systemCanChangeSoundQuality() { return false; } bool systemPauseOnFrame() { return false; } void systemGbBorderOn() { } --- NEW FILE: Makefile.am --- bin_PROGRAMS = VisualBoyAdvance noinst_PROGRAMS = TestEmu VisualBoyAdvance_SOURCES = \ SDL.cpp \ debugger.cpp \ debugger.h \ ../2xSaI.cpp \ ../AutoBuild.h \ ../Cheats.cpp \ ../Cheats.h \ ../EEprom.cpp \ ../EEprom.h \ ../Flash.cpp \ ../Flash.h \ ../GBA.cpp \ ../GBA.h \ ../GBAinline.h \ ../Gfx.cpp \ ../Gfx.h \ ../Globals.cpp \ ../Globals.h \ ../Mode0.cpp \ ../Mode1.cpp \ ../Mode2.cpp \ ../Mode3.cpp \ ../Mode4.cpp \ ../Mode5.cpp \ ../NLS.h \ ../Port.h \ ../RTC.cpp \ ../RTC.h \ ../Sound.cpp \ ../Sound.h \ ../Sram.cpp \ ../Sram.h \ ../System.h \ ../Text.cpp \ ../Text.h \ ../Util.cpp \ ../Util.h \ ../admame.cpp \ ../agbprint.cpp \ ../agbprint.h \ ../arm-new.h \ ../armdis.cpp \ ../armdis.h \ ../bilinear.cpp \ ../bios.cpp \ ../bios.h \ ../elf.cpp \ ../elf.h \ ../expr-lex.cpp \ ../expr.cpp \ ../expr.cpp.h \ ../exprNode.cpp \ ../exprNode.h \ ../getopt.c \ ../getopt.h \ ../getopt1.c \ ../hq2x.cpp \ ../hq2x.h \ ../interframe.cpp \ ../interp.h \ ../lq2x.h \ ../memgzio.c \ ../memgzio.h \ ../motionblur.cpp \ ../pixel.cpp \ ../remote.cpp \ ../scanline.cpp \ ../simple2x.cpp \ ../thumb.h \ ../unzip.cpp \ ../unzip.h VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@ TestEmu_SOURCES = \ TestEmu.cpp \ debugger.cpp \ debugger.h \ ../2xSaI.cpp \ ../AutoBuild.h \ ../Cheats.cpp \ ../Cheats.h \ ../EEprom.cpp \ ../EEprom.h \ ../Flash.cpp \ ../Flash.h \ ../GBA.cpp \ ../GBA.h \ ../GBAinline.h \ ../Gfx.cpp \ ../Gfx.h \ ../Globals.cpp \ ../Globals.h \ ../Mode0.cpp \ ../Mode1.cpp \ ../Mode2.cpp \ ../Mode3.cpp \ ../Mode4.cpp \ ../Mode5.cpp \ ../NLS.h \ ../Port.h \ ../RTC.cpp \ ../RTC.h \ ../Sound.cpp \ ../Sound.h \ ../Sram.cpp \ ../Sram.h \ ../System.h \ ../Text.cpp \ ../Text.h \ ../Util.cpp \ ../Util.h \ ../admame.cpp \ ../agbprint.cpp \ ../agbprint.h \ ../arm-new.h \ ../armdis.cpp \ ../armdis.h \ ../bios.cpp \ ../bios.h \ ../elf.cpp \ ../elf.h \ ../expr-lex.cpp \ ../expr.cpp \ ../expr.cpp.h \ ../exprNode.cpp \ ../exprNode.h \ ../hq2x.cpp \ ../hq2x.h \ ../interp.h \ ../lq2x.h \ ../memgzio.c \ ../memgzio.h \ ../motionblur.cpp \ ../pixel.cpp \ ../remote.cpp \ ../scanline.cpp \ ../simple2x.cpp \ ../thumb.h \ ../unzip.cpp \ ../unzip.h TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -DSDL AM_CXXFLAGS = -fno-exceptions @SDL_CFLAGS@ --- NEW FILE: debugger.cpp --- /* * VisualBoyAdvanced - Nintendo Gameboy/GameboyAdvance (TM) emulator * Copyrigh(c) 1999-2002 Forgotten (vb...@em...) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdio.h> [...1415 lines suppressed...] continue; commandCount++; while((s = strtok(NULL, " \t\n"))) { commands[commandCount++] = s; if(commandCount == 10) break; } for(int j = 0; ; j++) { if(debuggerCommands[j].name == NULL) { printf("Unrecognized command %s. Type h for help.\n", commands[0]); break; } if(!strcmp(commands[0], debuggerCommands[j].name)) { debuggerCommands[j].function(commandCount, commands); break; } } } } --- NEW FILE: SDL.cpp --- /* * VisualBoyAdvanced - Nintendo Gameboy/GameboyAdvance (TM) emulator * Copyrigh(c) 1999-2002 Forgotten (vb...@em...) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdarg.h> [...3402 lines suppressed...] } srcPitch = srcWidth * 2+4; } else { if(systemColorDepth != 32) filterFunction = NULL; RGB_LOW_BITS_MASK = 0x010101; if(systemColorDepth == 32) { Init_2xSaI(32); } for(int i = 0; i < 0x10000; i++) { systemColorMap32[i] = ((i & 0x1f) << systemRedShift) | (((i & 0x3e0) >> 5) << systemGreenShift) | (((i & 0x7c00) >> 10) << systemBlueShift); } if(systemColorDepth == 32) srcPitch = srcWidth*4 + 4; else srcPitch = srcWidth*3; } } --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ [...1494 lines suppressed...] ps: ps-am ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-noinstPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: debugger.h --- /* * VisualBoyAdvanced - Nintendo Gameboy/GameboyAdvance (TM) emulator * Copyrigh(c) 1999-2002 Forgotten (vb...@em...) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ extern void debuggerMain(); |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:13
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/src/gtk Added Files: Makefile.am Makefile.in filters.h input.cpp input.h intl.h main.cpp screenarea.cpp system.cpp tools.cpp tools.h vba.glade window.cpp window.h Log Message: GTK+ frontend draft added. --- NEW FILE: tools.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #ifndef __VBA_TOOLS_H__ #define __VBA_TOOLS_H__ #include <string> namespace VBA { std::string sCutSuffix(const std::string & _sString, const std::string & _sSep = std::string(".")); } #endif // __VBA_TOOLS_H__ --- NEW FILE: input.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #ifndef __VBA_INPUT_H__ #define __VBA_INPUT_H__ #include <glib.h> namespace VBA { enum EKey { KEY_NONE, // GBA keys KEY_A, KEY_B, KEY_SELECT, KEY_START, KEY_RIGHT, KEY_LEFT, KEY_UP, KEY_DOWN, KEY_R, KEY_L, // VBA extension KEY_SPEED, KEY_CAPTURE }; enum EKeyFlag { // GBA keys KEYFLAG_A = 1 << 0, KEYFLAG_B = 1 << 1, KEYFLAG_SELECT = 1 << 2, KEYFLAG_START = 1 << 3, KEYFLAG_RIGHT = 1 << 4, KEYFLAG_LEFT = 1 << 5, KEYFLAG_UP = 1 << 6, KEYFLAG_DOWN = 1 << 7, KEYFLAG_R = 1 << 8, KEYFLAG_L = 1 << 9, // VBA extension KEYFLAG_SPEED = 1 << 10, KEYFLAG_CAPTURE = 1 << 11, }; class Keymap { public: Keymap(); ~Keymap(); void vRegister(guint _uiVal, EKey _eKey); void vClear(); inline EKey eGetKey(guint _uiVal); private: GHashTable * m_pstTable; // noncopyable Keymap(const Keymap &); Keymap & operator=(const Keymap &); }; inline EKey Keymap::eGetKey(guint _uiVal) { return (EKey)GPOINTER_TO_UINT(g_hash_table_lookup(m_pstTable, GUINT_TO_POINTER(_uiVal))); } } // namespace VBA #endif // __VBA_INPUT_H__ --- NEW FILE: main.cpp --- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include <libglademm.h> #include <gtkmm/main.h> #include <gtkmm/messagedialog.h> #include "window.h" #include "intl.h" using Gnome::Glade::Xml; int main(int argc, char * argv[]) { #ifdef ENABLE_NLS setlocale(LC_ALL, ""); bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); textdomain(GETTEXT_PACKAGE); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); #endif // ENABLE_NLS Gtk::Main oKit(argc, argv); Glib::RefPtr<Xml> poXml; try { poXml = Xml::create(PKGDATADIR "/vba.glade", "MainWindow"); } catch (const Xml::Error & e) { Gtk::MessageDialog oDialog(e.what(), Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE); oDialog.run(); return 1; } VBA::Window * poWindow = NULL; poXml->get_widget_derived<VBA::Window>("MainWindow", poWindow); Gtk::Main::run(*poWindow); return 0; } --- NEW FILE: tools.cpp --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include "tools.h" namespace VBA { std::string sCutSuffix(const std::string & _sString, const std::string & _sSep) { return _sString.substr(0, _sString.find_last_of(_sSep)); } } // namespace VBA --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ [...1550 lines suppressed...] ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dist_pkgdataDATA \ uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-noinstLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dist_pkgdataDATA \ install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-dist_pkgdataDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: screenarea.cpp --- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include "screenarea.h" #include <string.h> namespace VBA { ScreenArea::ScreenArea(int _iWidth, int _iHeight, int _iScale) : m_puiPixels(NULL), m_puiDelta(NULL), m_vFilter2x(NULL) { g_assert(_iWidth >= 1 && _iHeight >= 1 && _iScale >= 1); m_iWidth = _iWidth; m_iHeight = _iHeight; m_iScale = _iScale; vUpdateSize(); set_events(Gdk::EXPOSURE_MASK); } ScreenArea::~ScreenArea() { if (m_puiPixels != NULL) { delete[] m_puiPixels; } if (m_puiDelta != NULL) { delete[] m_puiDelta; } } void ScreenArea::vSetSize(int _iWidth, int _iHeight) { g_return_if_fail(_iWidth >= 1 && _iHeight >= 1); if (_iWidth != m_iWidth || _iHeight != m_iHeight) { m_iWidth = _iWidth; m_iHeight = _iHeight; vUpdateSize(); } } void ScreenArea::vSetScale(int _iScale) { g_return_if_fail(_iScale >= 1); if (_iScale != m_iScale) { m_iScale = _iScale; vUpdateSize(); } } void ScreenArea::vSetFilter2x(Filter2x _vFilter2x) { m_vFilter2x = _vFilter2x; } void ScreenArea::vDrawPixels(const u8 * _puiData) { if (m_iScale == 1) { u32 * puiSrc = (u32 *)_puiData + m_iWidth + 1; u32 * puiPixel = m_puiPixels; for (int y = 0; y < m_iHeight; y++) { for (int x = 0; x < m_iWidth; x++) { *puiPixel++ = *puiSrc++; } puiSrc++; } } else if (m_iScale == 2 && m_vFilter2x != NULL) { m_vFilter2x(const_cast<u8 *>(_puiData) + m_iAreaWidth * 2 + 4, m_iAreaWidth * 2 + 4, m_puiDelta, (u8 *)m_puiPixels, m_iRowStride, m_iWidth, m_iHeight); } else { u32 * puiSrc = (u32 *)_puiData + m_iWidth + 1; u32 * puiSrc2; u32 * puiPixel = m_puiPixels; for (int y = 0; y < m_iHeight; y++) { for (int j = 0; j < m_iScale; j++) { puiSrc2 = puiSrc; for (int x = 0; x < m_iWidth; x++) { for (int i = 0; i < m_iScale; i++) { *puiPixel++ = *puiSrc2; } puiSrc2++; } } puiSrc = puiSrc2 + 1; } } queue_draw_area(0, 0, m_iAreaWidth, m_iAreaHeight); } void ScreenArea::vDrawColor(u32 _uiColor) { _uiColor = GUINT32_TO_BE(_uiColor) << 8; u32 * puiPixel = m_puiPixels; u32 * puiEnd = m_puiPixels + m_iAreaWidth * m_iAreaHeight; while (puiPixel != puiEnd) { *puiPixel++ = _uiColor; } queue_draw_area(0, 0, m_iAreaWidth, m_iAreaHeight); } bool ScreenArea::on_expose_event(GdkEventExpose * _pstEvent) { if (_pstEvent->area.x + _pstEvent->area.width > m_iAreaWidth || _pstEvent->area.y + _pstEvent->area.height > m_iAreaHeight) { return false; } guchar * puiAreaPixels = (guchar *)m_puiPixels; if (_pstEvent->area.x != 0) { puiAreaPixels += _pstEvent->area.x << 2; } if (_pstEvent->area.y != 0) { puiAreaPixels += _pstEvent->area.y * m_iRowStride; } get_window()->draw_rgb_32_image(get_style()->get_fg_gc(get_state()), _pstEvent->area.x, _pstEvent->area.y, _pstEvent->area.width, _pstEvent->area.height, Gdk::RGB_DITHER_MAX, puiAreaPixels, m_iRowStride); return true; } void ScreenArea::vUpdateSize() { if (m_puiPixels != NULL) { delete[] m_puiPixels; } if (m_puiDelta != NULL) { delete[] m_puiDelta; } m_iAreaWidth = m_iScale * m_iWidth; m_iAreaHeight = m_iScale * m_iHeight; m_iRowStride = m_iAreaWidth * 4; m_puiPixels = new u32[m_iAreaWidth * m_iAreaHeight]; m_puiDelta = new u8[(m_iWidth + 2) * (m_iHeight + 2) * 4]; memset(m_puiDelta, 255, (m_iWidth + 2) * (m_iHeight + 2) * 4); set_size_request(m_iAreaWidth, m_iAreaHeight); } } // namespace VBA --- NEW FILE: filters.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #ifndef __VBA_FILTERS_H__ #define __VBA_FILTERS_H__ #include "../System.h" int Init_2xSaI(u32); void _2xSaI (u8 *, u32, u8 *, u8 *, u32, int, int); void _2xSaI32 (u8 *, u32, u8 *, u8 *, u32, int, int); void Super2xSaI (u8 *, u32, u8 *, u8 *, u32, int, int); void Super2xSaI32 (u8 *, u32, u8 *, u8 *, u32, int, int); void SuperEagle (u8 *, u32, u8 *, u8 *, u32, int, int); void SuperEagle32 (u8 *, u32, u8 *, u8 *, u32, int, int); void Pixelate (u8 *, u32, u8 *, u8 *, u32, int, int); void Pixelate32 (u8 *, u32, u8 *, u8 *, u32, int, int); void MotionBlur (u8 *, u32, u8 *, u8 *, u32, int, int); void MotionBlur32 (u8 *, u32, u8 *, u8 *, u32, int, int); void AdMame2x (u8 *, u32, u8 *, u8 *, u32, int, int); void AdMame2x32 (u8 *, u32, u8 *, u8 *, u32, int, int); void Simple2x (u8 *, u32, u8 *, u8 *, u32, int, int); void Simple2x32 (u8 *, u32, u8 *, u8 *, u32, int, int); void Bilinear (u8 *, u32, u8 *, u8 *, u32, int, int); void Bilinear32 (u8 *, u32, u8 *, u8 *, u32, int, int); void BilinearPlus (u8 *, u32, u8 *, u8 *, u32, int, int); void BilinearPlus32(u8 *, u32, u8 *, u8 *, u32, int, int); void Scanlines (u8 *, u32, u8 *, u8 *, u32, int, int); void Scanlines32 (u8 *, u32, u8 *, u8 *, u32, int, int); void ScanlinesTV (u8 *, u32, u8 *, u8 *, u32, int, int); void ScanlinesTV32 (u8 *, u32, u8 *, u8 *, u32, int, int); void hq2x (u8 *, u32, u8 *, u8 *, u32, int, int); void hq2x32 (u8 *, u32, u8 *, u8 *, u32, int, int); void lq2x (u8 *, u32, u8 *, u8 *, u32, int, int); void lq2x32 (u8 *, u32, u8 *, u8 *, u32, int, int); void SmartIB (u8 *, u32, int, int); void SmartIB32 (u8 *, u32, int, int); void MotionBlurIB (u8 *, u32, int, int); void MotionBlurIB32(u8 *, u32, int, int); typedef void (*Filter2x)(u8 *, u32, u8 *, u8 *, u32, int, int); typedef void (*FilterIB)(u8 *, u32, int, int); #endif // __VBA_FILTERS_H__ --- NEW FILE: vba.glade --- <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> <widget class="GtkWindow" id="MainWindow"> <property name="visible">True</property> <property name="title" translatable="yes">VisualBoyAdvance</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> <widget class="GtkHandleBox" id="handlebox1"> <property name="visible">True</property> <property name="shadow_type">GTK_SHADOW_OUT</property> <property name="handle_position">GTK_POS_LEFT</property> <property name="snap_edge">GTK_POS_TOP</property> <child> <widget class="GtkMenuBar" id="menubar1"> <property name="visible">True</property> <child> <widget class="GtkMenuItem" id="FileMenu"> <property name="visible">True</property> <property name="label" translatable="yes">_File</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="FileMenu_menu"> <child> <widget class="GtkImageMenuItem" id="FileOpen"> <property name="visible">True</property> <property name="label">gtk-open</property> <property name="use_stock">True</property> </widget> </child> <child> <widget class="GtkCheckMenuItem" id="FilePause"> <property name="visible">True</property> <property name="label" translatable="yes">_Pause</property> <property name="use_underline">True</property> <property name="active">False</property> </widget> </child> <child> <widget class="GtkImageMenuItem" id="FileReset"> <property name="visible">True</property> <property name="label" translatable="yes">_Reset</property> <property name="use_underline">True</property> <child internal-child="image"> <widget class="GtkImage" id="image2"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> </child> </widget> </child> <child> <widget class="GtkMenuItem" id="separatormenuitem1"> <property name="visible">True</property> </widget> </child> <child> <widget class="GtkImageMenuItem" id="FileClose"> <property name="visible">True</property> <property name="label">gtk-close</property> <property name="use_stock">True</property> </widget> </child> <child> <widget class="GtkImageMenuItem" id="FileQuit"> <property name="visible">True</property> <property name="label">gtk-quit</property> <property name="use_stock">True</property> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkMenuItem" id="VideoMenu"> <property name="visible">True</property> <property name="label" translatable="yes">_Video</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="VideoMenu_menu"> <child> <widget class="GtkMenuItem" id="VideoZoom"> <property name="visible">True</property> <property name="label" translatable="yes">_Zoom</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="VideoZoom_menu"> <child> <widget class="GtkRadioMenuItem" id="VideoZoom1x"> <property name="visible">True</property> <property name="label" translatable="yes">_1x</property> <property name="use_underline">True</property> <property name="active">False</property> </widget> </child> <child> <widget class="GtkRadioMenuItem" id="VideoZoom2x"> <property name="visible">True</property> <property name="label" translatable="yes">_2x</property> <property name="use_underline">True</property> <property name="active">False</property> <property name="group">VideoZoom1x</property> </widget> </child> <child> <widget class="GtkRadioMenuItem" id="VideoZoom3x"> <property name="visible">True</property> <property name="label" translatable="yes">_3x</property> <property name="use_underline">True</property> <property name="active">False</property> <property name="group">VideoZoom1x</property> </widget> </child> <child> <widget class="GtkRadioMenuItem" id="VideoZoom4x"> <property name="visible">True</property> <property name="label" translatable="yes">_4x</property> <property name="use_underline">True</property> <property name="active">False</property> <property name="group">VideoZoom1x</property> </widget> </child> </widget> </child> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkMenuItem" id="HelpMenu"> <property name="visible">True</property> <property name="label" translatable="yes">_Help</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="HelpMenu_menu"> <child> <widget class="GtkMenuItem" id="HelpAbout"> <property name="visible">True</property> <property name="label" translatable="yes">_About</property> <property name="use_underline">True</property> </widget> </child> </widget> </child> </widget> </child> </widget> </child> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> </packing> </child> <child> <widget class="GtkAlignment" id="ScreenContainer"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <placeholder/> </child> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">True</property> </packing> </child> </widget> </child> </widget> <widget class="GtkDialog" id="AboutDialog"> <property name="title" translatable="yes">About VBA</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <property name="has_separator">True</property> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> <widget class="GtkButton" id="closebutton1"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-close</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-7</property> </widget> </child> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> <child> <widget class="GtkLabel" id="VersionLabel"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes"></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">False</property> <property name="selectable">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">5</property> <property name="ypad">5</property> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">An emulator for Gameboy⢠and GameboyAdvanceâ¢.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">True</property> <property name="selectable">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">5</property> <property name="ypad">5</property> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes"><small>Copyright © 1999-2004 Forgotten</small></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">True</property> <property name="selectable">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">5</property> <property name="ypad">5</property> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </glade-interface> --- NEW FILE: Makefile.am --- bin_PROGRAMS = gVisualBoyAdvance noinst_LIBRARIES = libgba.a gVisualBoyAdvance_SOURCES = \ filters.h \ input.cpp \ input.h \ intl.h \ main.cpp \ screenarea.cpp \ screenarea.h \ system.cpp \ tools.cpp \ tools.h \ window.cpp \ window.h gVisualBoyAdvance_LDADD = libgba.a @VBA_LIBS@ @GTKMM_LIBS@ @LIBINTL@ @SDL_LIBS@ gVisualBoyAdvance_CPPFLAGS = \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" gVisualBoyAdvance_CXXFLAGS = @GTKMM_CFLAGS@ @SDL_CFLAGS@ libgba_a_SOURCES = \ ../2xSaI.cpp \ ../AutoBuild.h \ ../Cheats.cpp \ ../Cheats.h \ ../EEprom.cpp \ ../EEprom.h \ ../Flash.cpp \ ../Flash.h \ ../GBA.cpp \ ../GBA.h \ ../GBAinline.h \ ../Gfx.cpp \ ../Gfx.h \ ../Globals.cpp \ ../Globals.h \ ../Mode0.cpp \ ../Mode1.cpp \ ../Mode2.cpp \ ../Mode3.cpp \ ../Mode4.cpp \ ../Mode5.cpp \ ../NLS.h \ ../Port.h \ ../RTC.cpp \ ../RTC.h \ ../Sound.cpp \ ../Sound.h \ ../Sram.cpp \ ../Sram.h \ ../System.h \ ../Text.cpp \ ../Text.h \ ../Util.cpp \ ../Util.h \ ../admame.cpp \ ../agbprint.cpp \ ../agbprint.h \ ../arm-new.h \ ../armdis.cpp \ ../armdis.h \ ../bilinear.cpp \ ../bios.cpp \ ../bios.h \ ../elf.cpp \ ../elf.h \ ../getopt.c \ ../getopt.h \ ../getopt1.c \ ../hq2x.cpp \ ../hq2x.h \ ../interframe.cpp \ ../interp.h \ ../lq2x.h \ ../memgzio.c \ ../memgzio.h \ ../motionblur.cpp \ ../pixel.cpp \ ../remote.cpp \ ../scanline.cpp \ ../simple2x.cpp \ ../thumb.h \ ../unzip.cpp \ ../unzip.h libgba_a_CPPFLAGS = -DSDL libgba_a_CXXFLAGS = -fno-exceptions dist_pkgdata_DATA = vba.glade --- NEW FILE: system.cpp --- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include <stdio.h> #include <stdarg.h> #include <SDL.h> #include "../GBA.h" #include "../gb/GB.h" #include "../gb/gbGlobals.h" #include "../Util.h" #include "window.h" int systemRedShift; int systemGreenShift; int systemBlueShift; int systemColorDepth; int systemDebug; int systemVerbose; int systemSaveUpdateCounter; int systemFrameSkip; u32 systemColorMap32[0x10000]; u16 systemColorMap16[0x10000]; u16 systemGbPalette[24]; bool systemSoundOn; int emulating; bool debugger; int RGB_LOW_BITS_MASK; inline VBA::Window * gui() { return VBA::Window::poGetInstance(); } void systemMessage(int _iId, const char * _csFormat, ...) { va_list args; va_start(args, _csFormat); char * csMsg = g_strdup_vprintf(_csFormat, args); va_end(args); Gtk::MessageDialog oDialog(*gui(), csMsg, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK); oDialog.run(); free(csMsg); } void systemDrawScreen() { gui()->vDrawScreen(); } bool systemReadJoypads() { return true; } u32 systemReadJoypad(int) { return gui()->uiReadJoypad(); } void systemShowSpeed(int _iSpeed) { char csTitle[50]; snprintf(csTitle, 50, "VisualBoyAdvance-%.3d%%", _iSpeed); gui()->set_title(csTitle); } void system10Frames(int _iRate) { } void systemFrame() { } void systemSetTitle(const char * _csTitle) { gui()->set_title(_csTitle); } void systemScreenCapture(int _iNum) { } void systemWriteDataToSoundBuffer() { } bool systemSoundInit() { return true; } void systemSoundShutdown() { } void systemSoundPause() { } void systemSoundResume() { } void systemSoundReset() { } u32 systemGetClock() { return SDL_GetTicks(); } void systemUpdateMotionSensor() { } int systemGetSensorX() { return 0; } int systemGetSensorY() { return 0; } void systemGbPrint(u8 * _puiData, int _iPages, int _iFeed, int _iPalette, int _iContrast) { } void systemScreenMessage(const char * _csMsg) { } bool systemCanChangeSoundQuality() { return false; } bool systemPauseOnFrame() { return false; } void systemGbBorderOn() { } void debuggerMain() { } void debuggerSignal(int, int) { } void debuggerOutput(char *, u32) { } void (*dbgMain)() = debuggerMain; void (*dbgSignal)(int, int) = debuggerSignal; void (*dbgOutput)(char *, u32) = debuggerOutput; --- NEW FILE: intl.h --- // -*- C++ -*- /* * VisualBoyAdvanced - Nintendo Gameboy/GameboyAdvance (TM) emulator * Copyrigh(c) 1999-2002 Forgotten (vb...@em...) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __VBA_INTL_H__ #define __VBA_INTL_H__ #ifndef GETTEXT_PACKAGE # error "GETTEXT_PACKAGE must be defined" #endif #ifdef ENABLE_NLS # include <libintl.h> # define _(String) gettext(String) # define N_(String) (String) #else # define _(String) (String) # define N_(String) (String) # define textdomain(String) (String) # define gettext(String) (String) # define dgettext(Domain,String) (String) # define dcgettext(Domain,String,Type) (String) # define bindtextdomain(Domain,Directory) (Domain) #endif #endif // __VBA_INTL_H__ --- NEW FILE: window.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #ifndef __VBA_WINDOW_H__ #define __VBA_WINDOW_H__ #include <libglademm.h> #include <gtkmm.h> #include <string> #include "screenarea.h" #include "input.h" #include "filters.h" namespace VBA { class Window : public Gtk::Window { friend class Gnome::Glade::Xml; public: inline static Window * poGetInstance() { return m_poInstance; } void vDrawScreen(); inline u32 uiReadJoypad() { return m_uiJoypadState; } enum ECartridge { NO_CARTRIDGE, GB_CARTRIDGE, GBA_CARTRIDGE }; inline ECartridge eGetCartridge() { return m_eCartridge; } protected: virtual bool on_key_press_event(GdkEventKey * _pstEvent); virtual bool on_key_release_event(GdkEventKey * _pstEvent); private: Window(GtkWindow * _pstWindow, const Glib::RefPtr<Gnome::Glade::Xml> & _poXml); ~Window(); static Window * m_poInstance; Gtk::FileSelection * m_poFileOpenDialog; ScreenArea * m_poScreenArea; Gtk::CheckMenuItem * m_poFilePauseItem; SigC::Connection m_oEmuSig; std::string m_sFilename; ECartridge m_eCartridge; EmulatedSystem m_stEmulator; Keymap m_oKeymap; u32 m_uiJoypadState; int m_iScreenWidth; int m_iScreenHeight; int m_iScreenScale; Filter2x m_vFilter2x; FilterIB m_vFilterIB; void vInitSystem(); void vInitSDL(); void vLoadKeymap(); void vUpdateScreen(); void vDrawDefaultScreen(); bool bLoadROM(const std::string & _rsFilename); void vLoadBattery(); void vSaveBattery(); void vLoadState(int _iNum); void vSaveState(int _iNum); void vStartEmu(); void vStopEmu(); void vOnFileOpen(); void vOnFilePause(); void vOnFileReset(); void vOnFileClose(); void vOnFileQuit(); void vOnVideoZoom1x(); void vOnVideoZoom2x(); void vOnVideoZoom3x(); void vOnVideoZoom4x(); void vOnHelpAbout(); bool bOnEmuIdle(); }; } // namespace VBA #endif // __VBA_WINDOW_H__ --- NEW FILE: window.cpp --- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include "window.h" #include <SDL.h> #include "../GBA.h" #include "../gb/GB.h" #include "../gb/gbGlobals.h" #include "../Util.h" #include "tools.h" #include "intl.h" extern bool debugger; extern int RGB_LOW_BITS_MASK; namespace VBA { using Gnome::Glade::Xml; Window * Window::m_poInstance = NULL; const int iGBScreenWidth = 160; const int iGBScreenHeight = 144; const int iSGBScreenWidth = 256; const int iSGBScreenHeight = 224; const int iGBAScreenWidth = 240; const int iGBAScreenHeight = 160; Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) : Gtk::Window(_pstWindow), m_poFileOpenDialog(NULL), m_eCartridge(NO_CARTRIDGE), m_uiJoypadState(0), m_iScreenWidth(iGBAScreenWidth), m_iScreenHeight(iGBAScreenHeight), m_iScreenScale(1), m_vFilter2x(NULL), m_vFilterIB(NULL) { vInitSystem(); vInitSDL(); vLoadKeymap(); Gtk::Container * poC; poC = dynamic_cast<Gtk::Container *>(_poXml->get_widget("ScreenContainer")); m_poScreenArea = Gtk::manage(new ScreenArea(m_iScreenWidth, m_iScreenHeight)); poC->add(*m_poScreenArea); vDrawDefaultScreen(); m_poScreenArea->vSetFilter2x(SuperEagle32); // TEST m_poScreenArea->show(); m_poFilePauseItem = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("FilePause")); m_poFilePauseItem->signal_toggled().connect(SigC::slot(*this, &Window::vOnFilePause)); Gtk::MenuItem * poMI; poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileOpen")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileOpen)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileReset")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileReset)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileClose")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileClose)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileQuit")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileQuit)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom1x")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom1x)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom2x")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom2x)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom3x")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom3x)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom4x")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom4x)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("HelpAbout")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnHelpAbout)); if (m_poInstance == NULL) { m_poInstance = this; } else { abort(); } } Window::~Window() { vOnFileClose(); if (m_poFileOpenDialog != NULL) { delete m_poFileOpenDialog; } m_poInstance = NULL; } void Window::vInitSystem() { Init_2xSaI(32); #if G_BYTE_ORDER == G_LITTLE_ENDIAN systemRedShift = 3; systemGreenShift = 11; systemBlueShift = 19; RGB_LOW_BITS_MASK = 0x00010101; #else systemRedShift = 27; systemGreenShift = 19; systemBlueShift = 11; RGB_LOW_BITS_MASK = 0x01010100; #endif systemColorDepth = 32; systemDebug = 0; systemVerbose = 0; systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; systemFrameSkip = 5; // TEST systemSoundOn = false; emulating = 0; debugger = true; for (int i = 0; i < 0x10000; i++) { #if G_BYTE_ORDER == G_LITTLE_ENDIAN systemColorMap32[i] = (((i & 0x1f) << systemRedShift) | (((i & 0x3e0) >> 5) << systemGreenShift) | (((i & 0x7c00) >> 10) << systemBlueShift) | 0xff000000); #else systemColorMap32[i] = (((i & 0x1f) << systemRedShift) | (((i & 0x3e0) >> 5) << systemGreenShift) | (((i & 0x7c00) >> 10) << systemBlueShift) | 0xff); #endif } // TODO : GB init and 16-bit color map (?) } void Window::vInitSDL() { static bool bDone = false; if (bDone) return; int iFlags = (SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE); if (SDL_Init(iFlags) < 0) { fprintf(stderr, "Failed to init SDL: %s", SDL_GetError()); abort(); } bDone = true; } void Window::vLoadKeymap() { // TODO : load from prefs m_oKeymap.vRegister(GDK_z, KEY_A); m_oKeymap.vRegister(GDK_Z, KEY_A); m_oKeymap.vRegister(GDK_x, KEY_B); m_oKeymap.vRegister(GDK_X, KEY_B); m_oKeymap.vRegister(GDK_BackSpace, KEY_SELECT); m_oKeymap.vRegister(GDK_Return, KEY_START); m_oKeymap.vRegister(GDK_Right, KEY_RIGHT); m_oKeymap.vRegister(GDK_Left, KEY_LEFT); m_oKeymap.vRegister(GDK_Up, KEY_UP); m_oKeymap.vRegister(GDK_Down, KEY_DOWN); m_oKeymap.vRegister(GDK_s, KEY_R); m_oKeymap.vRegister(GDK_S, KEY_R); m_oKeymap.vRegister(GDK_a, KEY_L); m_oKeymap.vRegister(GDK_A, KEY_L); m_oKeymap.vRegister(GDK_space, KEY_SPEED); m_oKeymap.vRegister(GDK_F12, KEY_CAPTURE); } void Window::vUpdateScreen() { g_return_if_fail(m_iScreenWidth >= 1 && m_iScreenHeight >= 1 && m_iScreenScale >= 1); m_poScreenArea->vSetSize(m_iScreenWidth, m_iScreenHeight); m_poScreenArea->vSetScale(m_iScreenScale); resize(1, 1); if (emulating) { vDrawScreen(); } else { vDrawDefaultScreen(); } } void Window::vDrawScreen() { m_poScreenArea->vDrawPixels(pix); } void Window::vDrawDefaultScreen() { m_poScreenArea->vDrawColor(0x000000); // Black } bool Window::bLoadROM(const std::string & _rsFilename) { vOnFileClose(); m_sFilename = _rsFilename; const char * csFilename = _rsFilename.c_str(); IMAGE_TYPE eType = utilFindType(csFilename); if (eType == IMAGE_UNKNOWN) { systemMessage(0, _("Unknown file type %s"), csFilename); return false; } bool bLoaded = false; if (eType == IMAGE_GB) { bLoaded = gbLoadRom(csFilename); if (bLoaded) { m_eCartridge = GB_CARTRIDGE; m_stEmulator = GBSystem; //if(sdlAutoIPS) { // int size = gbRomSize; // utilApplyIPS(ipsname, &gbRom, &size); // if(size != gbRomSize) { // extern bool gbUpdateSizes(); // gbUpdateSizes(); // gbReset(); // } //} if (gbBorderOn) { m_iScreenWidth = iSGBScreenWidth; m_iScreenHeight = iSGBScreenHeight; gbBorderLineSkip = iSGBScreenWidth; gbBorderColumnSkip = (iSGBScreenWidth - iGBScreenWidth) / 2; gbBorderRowSkip = (iSGBScreenHeight - iGBScreenHeight) / 2; } else { m_iScreenWidth = iGBScreenWidth; m_iScreenHeight = iGBScreenHeight; gbBorderLineSkip = iGBScreenWidth; gbBorderColumnSkip = 0; gbBorderRowSkip = 0; } // TODO //systemFrameSkip = gbFrameSkip; } } else if (eType == IMAGE_GBA) { int iSize = CPULoadRom(csFilename); bLoaded = (iSize > 0); if (bLoaded) { //sdlApplyPerImagePreferences(); m_eCartridge = GBA_CARTRIDGE; m_stEmulator = GBASystem; // TODO //CPUInit(biosFileName, useBios); useBios = false; CPUInit(NULL, useBios); CPUReset(); //if(sdlAutoIPS) { // int size = 0x2000000; // utilApplyIPS(ipsname, &rom, &size); // if(size != 0x2000000) { // CPUReset(); // } //} m_iScreenWidth = iGBAScreenWidth; m_iScreenHeight = iGBAScreenHeight; // TODO //systemFrameSkip = frameSkip; } } if (! bLoaded) { systemMessage(0, _("Failed to load file %s"), csFilename); return false; } vLoadBattery(); vUpdateScreen(); emulating = 1; if (m_poFilePauseItem->get_active()) { m_poFilePauseItem->set_active(false); } else { vStartEmu(); } return true; } void Window::vLoadBattery() { // TODO : from battery dir std::string sBattery = sCutSuffix(m_sFilename) + ".sav"; if (m_stEmulator.emuReadBattery(sBattery.c_str())) { systemScreenMessage(_("Loaded battery")); } } void Window::vSaveBattery() { // TODO : from battery dir std::string sBattery = sCutSuffix(m_sFilename) + ".sav"; if (m_stEmulator.emuWriteBattery(sBattery.c_str())) { systemScreenMessage(_("Saved battery")); } } void Window::vLoadState(int _iNum) { // TODO } void Window::vSaveState(int _iNum) { // TODO } void Window::vStartEmu() { if (m_oEmuSig.connected()) { return; } m_oEmuSig = Glib::signal_idle().connect(SigC::slot(*this, &Window::bOnEmuIdle), Glib::PRIORITY_DEFAULT_IDLE); } void Window::vStopEmu() { m_oEmuSig.disconnect(); } void Window::vOnFileOpen() { if (m_poFileOpenDialog == NULL) { m_poFileOpenDialog = new Gtk::FileSelection(_("Open a ROM")); } m_poFileOpenDialog->show(); int iResponse = m_poFileOpenDialog->run(); if (iResponse == Gtk::RESPONSE_OK) { if (! bLoadROM(m_poFileOpenDialog->get_filename())) { return; } } m_poFileOpenDialog->hide(); } void Window::vOnFilePause() { if (emulating) { if (m_poFilePauseItem->get_active()) { vStopEmu(); } else { vStartEmu(); } } } void Window::vOnFileReset() { if (emulating) { m_stEmulator.emuReset(); } } void Window::vOnFileClose() { if (emulating) { vSaveBattery(); m_stEmulator.emuCleanUp(); emulating = 0; } m_eCartridge = NO_CARTRIDGE; vStopEmu(); vDrawDefaultScreen(); } void Window::vOnFileQuit() { hide(); } void Window::vOnVideoZoom1x() { m_iScreenScale = 1; vUpdateScreen(); } void Window::vOnVideoZoom2x() { m_iScreenScale = 2; vUpdateScreen(); } void Window::vOnVideoZoom3x() { m_iScreenScale = 3; vUpdateScreen(); } void Window::vOnVideoZoom4x() { m_iScreenScale = 4; vUpdateScreen(); } void Window::vOnHelpAbout() { Glib::RefPtr<Xml> poXml; poXml = Xml::create(PKGDATADIR "/vba.glade", "AboutDialog"); Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("AboutDialog")); Gtk::Label * poLabel = dynamic_cast<Gtk::Label *>(poXml->get_widget("VersionLabel")); poLabel->set_markup("<b><big>" PACKAGE " " VERSION "</big></b>"); poDialog->run(); delete poDialog; } bool Window::bOnEmuIdle() { if (emulating) { m_stEmulator.emuMain(m_stEmulator.emuCount); } return true; } bool Window::on_key_press_event(GdkEventKey * _pstEvent) { EKey eKey; if ((_pstEvent->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)) || (eKey = m_oKeymap.eGetKey(_pstEvent->keyval)) == KEY_NONE) { return Gtk::Window::on_key_press_event(_pstEvent); } switch (eKey) { case KEY_A: m_uiJoypadState |= KEYFLAG_A; break; case KEY_B: m_uiJoypadState |= KEYFLAG_B; break; case KEY_SELECT: m_uiJoypadState |= KEYFLAG_SELECT; break; case KEY_START: m_uiJoypadState |= KEYFLAG_START; break; case KEY_RIGHT: m_uiJoypadState |= KEYFLAG_RIGHT; m_uiJoypadState &= ~KEYFLAG_LEFT; break; case KEY_LEFT: m_uiJoypadState |= KEYFLAG_LEFT; m_uiJoypadState &= ~KEYFLAG_RIGHT; break; case KEY_UP: m_uiJoypadState |= KEYFLAG_UP; m_uiJoypadState &= ~KEYFLAG_DOWN; break; case KEY_DOWN: m_uiJoypadState |= KEYFLAG_DOWN; m_uiJoypadState &= ~KEYFLAG_UP; break; case KEY_R: m_uiJoypadState |= KEYFLAG_R; break; case KEY_L: m_uiJoypadState |= KEYFLAG_L; break; case KEY_SPEED: m_uiJoypadState |= KEYFLAG_SPEED; break; case KEY_CAPTURE: m_uiJoypadState |= KEYFLAG_CAPTURE; break; case KEY_NONE: break; } return true; } bool Window::on_key_release_event(GdkEventKey * _pstEvent) { EKey eKey; if ((_pstEvent->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)) || (eKey = m_oKeymap.eGetKey(_pstEvent->keyval)) == KEY_NONE) { return Gtk::Window::on_key_press_event(_pstEvent); } switch (eKey) { case KEY_A: m_uiJoypadState &= ~KEYFLAG_A; break; case KEY_B: m_uiJoypadState &= ~KEYFLAG_B; break; case KEY_SELECT: m_uiJoypadState &= ~KEYFLAG_SELECT; break; case KEY_START: m_uiJoypadState &= ~KEYFLAG_START; break; case KEY_RIGHT: m_uiJoypadState &= ~KEYFLAG_RIGHT; break; case KEY_LEFT: m_uiJoypadState &= ~KEYFLAG_LEFT; break; case KEY_UP: m_uiJoypadState &= ~KEYFLAG_UP; break; case KEY_DOWN: m_uiJoypadState &= ~KEYFLAG_DOWN; break; case KEY_R: m_uiJoypadState &= ~KEYFLAG_R; break; case KEY_L: m_uiJoypadState &= ~KEYFLAG_L; break; case KEY_SPEED: m_uiJoypadState &= ~KEYFLAG_SPEED; break; case KEY_CAPTURE: m_uiJoypadState &= ~KEYFLAG_CAPTURE; break; case KEY_NONE: break; } return true; } } // VBA namespace --- NEW FILE: input.cpp --- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // 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. #include "input.h" #include <new> namespace VBA { Keymap::Keymap() { m_pstTable = g_hash_table_new(g_direct_hash, g_direct_equal); if (m_pstTable == NULL) { throw std::bad_alloc(); } } Keymap::~Keymap() { g_hash_table_destroy(m_pstTable); } void Keymap::vRegister(guint _uiVal, EKey _eKey) { g_hash_table_insert(m_pstTable, GUINT_TO_POINTER(_uiVal), GUINT_TO_POINTER(_eKey)); } void Keymap::vClear() { g_hash_table_destroy(m_pstTable); m_pstTable = g_hash_table_new(g_direct_hash, g_direct_equal); } } // namespace VBA |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:20:11
|
Update of /cvsroot/vba/VisualBoyAdvance/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/po Added Files: ChangeLog Makefile.in.in Makevars POTFILES.in Rules-quot boldquot.sed en@boldquot.header en@quot.header fr.gmo fr.po insert-header.sin quot.sed remove-potcdate.sin vba-1.7.2.pot Log Message: GTK+ frontend draft added. --- NEW FILE: en@quot.header --- # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation # characters, only substitutes like grave accent (0x60), apostrophe (0x27) # and double quote (0x22). These substitutes look strange; see # http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html # # This catalog translates grave accent (0x60) and apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019). # It also translates pairs of apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019) # and pairs of quotation mark (0x22) to # left double quotation mark (U+201C) and right double quotation mark (U+201D). # # When output to an UTF-8 terminal, the quotation characters appear perfectly. # When output to an ISO-8859-1 terminal, the single quotation marks are # transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to # grave/acute accent (by libiconv), and the double quotation marks are # transliterated to 0x22. # When output to an ASCII terminal, the single quotation marks are # transliterated to apostrophes, and the double quotation marks are # transliterated to 0x22. # --- NEW FILE: fr.po --- # French translation for VBA. # # Copyright (C) 2004 VBA development team # This file is distributed under the same license as the VisualBoyAdvance package. # # Sébastien Guignot <kx...@ts...>, 2004. # msgid "" msgstr "" "Project-Id-Version: VisualBoyAdvance 1.7.2\n" "Report-Msgid-Bugs-To: undefined\n" "POT-Creation-Date: 2004-03-29 19:53+0200\n" "PO-Revision-Date: 2004-03-29 20:04+0200\n" "Last-Translator: Sébastien Guignot <kx...@ts...>\n" "Language-Team: French <@>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: src/gtk/vba.glade:8 msgid "VisualBoyAdvance" msgstr "VisualBoyAdvance" #: src/gtk/vba.glade:35 msgid "_File" msgstr "_Fichier" #: src/gtk/vba.glade:52 msgid "_Pause" msgstr "_Pause" #: src/gtk/vba.glade:61 msgid "_Reset" msgstr "_Reset" #: src/gtk/vba.glade:107 msgid "_Video" msgstr "_Vidéo" #: src/gtk/vba.glade:116 msgid "_Zoom" msgstr "_Zoom" #: src/gtk/vba.glade:125 msgid "_1x" msgstr "_1x" #: src/gtk/vba.glade:134 msgid "_2x" msgstr "_2x" #: src/gtk/vba.glade:144 msgid "_3x" msgstr "_3x" #: src/gtk/vba.glade:154 msgid "_4x" msgstr "_4x" #: src/gtk/vba.glade:172 msgid "_Help" msgstr "_Aide" #: src/gtk/vba.glade:181 msgid "_About" msgstr "à _propos" #: src/gtk/vba.glade:222 msgid "About VBA" msgstr "à propos de VBA" #: src/gtk/vba.glade:287 msgid "An emulator for Gameboy⢠and GameboyAdvanceâ¢." msgstr "Ãmulateur pour Gameboy⢠et GameboyAdvanceâ¢." #: src/gtk/vba.glade:309 msgid "<small>Copyright © 1999-2004 Forgotten</small>" msgstr "<small>Copyright © 1999-2004 Forgotten</small>" #: src/gtk/window.cpp:245 #, c-format msgid "Unknown file type %s" msgstr "Type de fichier inconnu %s" #: src/gtk/window.cpp:324 #, c-format msgid "Failed to load file %s" msgstr "Le chargement du fichier %s a échoué" #: src/gtk/window.cpp:352 msgid "Loaded battery" msgstr "Sauvegarde chargée" #: src/gtk/window.cpp:363 msgid "Saved battery" msgstr "Sauvegarde effectuée" #: src/gtk/window.cpp:397 msgid "Open a ROM" msgstr "Ouvrir une ROM" --- NEW FILE: ChangeLog --- 2004-03-29 gettextize <bug...@gn...> * Makefile.in.in: New file, from gettext-0.14.1. * boldquot.sed: New file, from gettext-0.14.1. * en@boldquot.header: New file, from gettext-0.14.1. * en@quot.header: New file, from gettext-0.14.1. * insert-header.sin: New file, from gettext-0.14.1. * quot.sed: New file, from gettext-0.14.1. * remove-potcdate.sin: New file, from gettext-0.14.1. * Rules-quot: New file, from gettext-0.14.1. --- NEW FILE: quot.sed --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Rules-quot --- # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot .SUFFIXES: .insert-header .po-update-en en@quot.po-create: $(MAKE) en@quot.po-update en@boldquot.po-create: $(MAKE) en@boldquot.po-update en@quot.po-update: en@quot.po-update-en en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ :; \ else \ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ exit 1; \ fi; \ fi; \ else \ echo "creation of $$lang.po failed!" 1>&2; \ rm -f $$tmpdir/$$lang.new.po; \ fi en...@qu...sert-header: insert-header.sin sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en...@qu...sert-header en...@bo...sert-header: insert-header.sin sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en...@bo...sert-header mostlyclean: mostlyclean-quot mostlyclean-quot: rm -f *.insert-header --- NEW FILE: Makevars --- # Makefile variables for PO directory in any package using GNU gettext. # Usually the message domain is the same as the package name. DOMAIN = $(GETTEXT_PACKAGE) # These two variables depend on the location of this directory. subdir = po top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # package. (Note that the msgstr strings, extracted from the package's # sources, belong to the copyright holder of the package.) Translators are # expected to transfer the copyright for their translations to this person # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. COPYRIGHT_HOLDER = VBA development team # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines # in the GNU gettext documentation, section 'Preparing Strings'. # - Strings which use unclear terms or require additional context to be # understood. # - Strings which make invalid assumptions about notation of date, time or # money. # - Pluralisation problems. # - Incorrect English spelling. # - Incorrect formatting. # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. MSGID_BUGS_ADDRESS = undefined # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = --- NEW FILE: POTFILES.in --- # List of source files which containing translatable strings. src/gtk/vba.glade src/gtk/window.cpp --- NEW FILE: en@boldquot.header --- # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation # characters, only substitutes like grave accent (0x60), apostrophe (0x27) # and double quote (0x22). These substitutes look strange; see # http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html # # This catalog translates grave accent (0x60) and apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019). # It also translates pairs of apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019) # and pairs of quotation mark (0x22) to # left double quotation mark (U+201C) and right double quotation mark (U+201D). # # When output to an UTF-8 terminal, the quotation characters appear perfectly. # When output to an ISO-8859-1 terminal, the single quotation marks are # transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to # grave/acute accent (by libiconv), and the double quotation marks are # transliterated to 0x22. # When output to an ASCII terminal, the single quotation marks are # transliterated to apostrophes, and the double quotation marks are # transliterated to 0x22. # # This catalog furthermore displays the text between the quotation marks in # bold face, assuming the VT100/XTerm escape sequences. # --- NEW FILE: fr.gmo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: boldquot.sed --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Makefile.in.in --- # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <dr...@gn...> # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public # License but which still want to provide support for the GNU gettext # functionality. # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # # Origin: gettext-0.14 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SHELL = /bin/sh @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ localedir = $(datadir)/locale gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge MSGMERGE_UPDATE = @MSGMERGE@ --update MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter POFILES = @POFILES@ GMOFILES = @GMOFILES@ UPDATEPOFILES = @UPDATEPOFILES@ DUMMYPOFILES = @DUMMYPOFILES@ DISTFILES.common = Makefile.in.in remove-potcdate.sin \ $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ $(POFILES) $(GMOFILES) \ $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ CATALOGS = @CATALOGS@ # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: @echo "$(MSGFMT) -c -o $@ $<"; \ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ all: all-@USE_NLS@ all-yes: stamp-po all-no: # stamp-po is a timestamp denoting the last time at which the CATALOGS have # been loosely updated. Its purpose is that when a developer or translator # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, # "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent # invocations of "make" will do nothing. This timestamp would not be necessary # if updating the $(CATALOGS) would always touch them; however, the rule for # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @echo "touch stamp-po" @echo timestamp > stamp-poT @mv stamp-poT stamp-po # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ fi; \ else \ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ fi; \ } # This rule has no dependencies: we don't need to update $(DOMAIN).pot at # every "make" invocation, only create it when it is missing. # Only "make $(DOMAIN).pot-update" or "make dist" will force an update. $(srcdir)/$(DOMAIN).pot: $(MAKE) $(DOMAIN).pot-update # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ else \ $(MAKE) $${lang}.po-create; \ fi install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ for file in Makevars; do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ : ; \ fi install-data-no: all install-data-yes: all $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ for file in *; do \ if test -f $$file; then \ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ fi; \ done); \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ else \ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ :; \ else \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ fi; \ fi; \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ fi; \ done; \ done install-strip: install installdirs: installdirs-exec installdirs-data installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi installdirs-data-no: installdirs-data-yes: $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ for file in *; do \ if test -f $$file; then \ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ fi; \ done); \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ else \ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ :; \ else \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ fi; \ fi; \ fi; \ done; \ done # Define this as empty until I found a useful application. installcheck: uninstall: uninstall-exec uninstall-data uninstall-exec: uninstall-data: uninstall-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ for file in $(DISTFILES.common) Makevars.template; do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ : ; \ fi uninstall-data-no: uninstall-data-yes: catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ done; \ done check: all info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: rm -f remove-potcdate.sed rm -f stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean distclean: clean rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: $(DISTFILES) dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ fi; \ if test -f $(srcdir)/ChangeLog; then \ dists="$$dists ChangeLog"; \ fi; \ for i in 0 1 2 3 4 5 6 7 8 9; do \ if test -f $(srcdir)/ChangeLog.$$i; then \ dists="$$dists ChangeLog.$$i"; \ fi; \ done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ cp -p $$file $(distdir); \ else \ cp -p $(srcdir)/$$file $(distdir); \ fi; \ done update-po: Makefile $(MAKE) $(DOMAIN).pot-update test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) $(MAKE) update-gmo # General rule for creating PO files. .nop.po-create: @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ exit 1 # General rule for updating PO files. .nop.po-update: @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ :; \ else \ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ exit 1; \ fi; \ fi; \ else \ echo "msgmerge for $$lang.po failed!" 1>&2; \ rm -f $$tmpdir/$$lang.new.po; \ fi $(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status force: # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: remove-potcdate.sin --- # Sed script that remove the POT-Creation-Date line in the header entry # from a POT file. # # The distinction between the first and the following occurrences of the # pattern is achieved by looking at the hold space. /^"POT-Creation-Date: .*"$/{ x # Test if the hold space is empty. s/P/P/ ta # Yes it was empty. First occurrence. Remove the line. g d bb :a # The hold space was nonempty. Following occurrences. Do nothing. x :b } --- NEW FILE: vba-1.7.2.pot --- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR VBA development team # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: undefined\n" "POT-Creation-Date: 2004-03-29 19:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: src/gtk/vba.glade:8 msgid "VisualBoyAdvance" msgstr "" #: src/gtk/vba.glade:35 msgid "_File" msgstr "" #: src/gtk/vba.glade:52 msgid "_Pause" msgstr "" #: src/gtk/vba.glade:61 msgid "_Reset" msgstr "" #: src/gtk/vba.glade:107 msgid "_Video" msgstr "" #: src/gtk/vba.glade:116 msgid "_Zoom" msgstr "" #: src/gtk/vba.glade:125 msgid "_1x" msgstr "" #: src/gtk/vba.glade:134 msgid "_2x" msgstr "" #: src/gtk/vba.glade:144 msgid "_3x" msgstr "" #: src/gtk/vba.glade:154 msgid "_4x" msgstr "" #: src/gtk/vba.glade:172 msgid "_Help" msgstr "" #: src/gtk/vba.glade:181 msgid "_About" msgstr "" #: src/gtk/vba.glade:222 msgid "About VBA" msgstr "" #: src/gtk/vba.glade:287 msgid "An emulator for Gameboy⢠and GameboyAdvanceâ¢." msgstr "" #: src/gtk/vba.glade:309 msgid "<small>Copyright © 1999-2004 Forgotten</small>" msgstr "" #: src/gtk/window.cpp:245 #, c-format msgid "Unknown file type %s" msgstr "" #: src/gtk/window.cpp:324 #, c-format msgid "Failed to load file %s" msgstr "" #: src/gtk/window.cpp:352 msgid "Loaded battery" msgstr "" #: src/gtk/window.cpp:363 msgid "Saved battery" msgstr "" #: src/gtk/window.cpp:397 msgid "Open a ROM" msgstr "" --- NEW FILE: insert-header.sin --- # Sed script that inserts the file called HEADER before the header entry. # # At each occurrence of a line starting with "msgid ", we execute the following # commands. At the first occurrence, insert the file. At the following # occurrences, do nothing. The distinction between the first and the following # occurrences is achieved by looking at the hold space. /^msgid /{ x # Test if the hold space is empty. s/m/m/ ta # Yes it was empty. First occurrence. Read the file. r HEADER # Output the file's contents by reading the next line. But don't lose the # current line while doing this. g N bb :a # The hold space was nonempty. Following occurrences. Do nothing. x :b } |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:19:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3450 Modified Files: arm-new.h Log Message: Little optimization. Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** arm-new.h 20 Mar 2004 00:18:33 -0000 1.9 --- arm-new.h 29 Mar 2004 22:07:47 -0000 1.10 *************** *** 275,293 **** #define OP_SUBS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_RSB \ --- 275,293 ---- #define OP_SUBS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_RSB \ *************** *** 297,315 **** #define OP_RSBS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subfco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_ADD \ --- 297,315 ---- #define OP_RSBS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subfco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_ADD \ *************** *** 320,338 **** #define OP_ADDS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("addco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_ADC \ --- 320,338 ---- #define OP_ADDS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("addco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_ADC \ *************** *** 342,362 **** #define OP_ADCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "addeo. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_SBC \ --- 342,362 ---- #define OP_ADCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "addeo. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_SBC \ *************** *** 366,386 **** #define OP_SBCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "subfeo. %0, %3, %2\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_RSC \ --- 366,386 ---- #define OP_SBCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "subfeo. %0, %3, %2\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_RSC \ *************** *** 390,444 **** #define OP_RSCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "subfeo. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_CMP \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_CMN \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("addco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } --- 390,444 ---- #define OP_RSCS \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("mtspr xer, %4\n" \ ! "subfeo. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value), \ ! "r" (C_FLAG << 29) \ ! ); \ ! reg[dest].I = Result; \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_CMP \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("subco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } #define OP_CMN \ {\ ! register int Flags; \ ! register int Result; \ ! asm volatile("addco. %0, %2, %3\n" \ ! "mcrxr cr1\n" \ ! "mfcr %1\n" \ ! : "=r" (Result), \ ! "=r" (Flags) \ ! : "r" (reg[base].I), \ ! "r" (value) \ ! ); \ ! Z_FLAG = (Flags >> 29) & 1; \ ! N_FLAG = (Flags >> 31) & 1; \ ! C_FLAG = (Flags >> 25) & 1; \ ! V_FLAG = (Flags >> 26) & 1; \ } *************** *** 1475,1478 **** --- 1475,1842 ---- break; + #define LOGICAL_DATA_OPCODE_WITHOUT_base(OPCODE, OPCODE2, BASE) \ + case BASE: \ + case BASE+8:\ + {\ + /* OP Rd,Rb,Rm LSL # */ \ + int shift = (opcode >> 7) & 0x1F;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + \ + if(shift) {\ + LOGICAL_LSL_REG\ + } else {\ + value = reg[opcode & 0x0F].I;\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+2:\ + case BASE+10:\ + {\ + /* OP Rd,Rb,Rm LSR # */ \ + int shift = (opcode >> 7) & 0x1F;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + LOGICAL_LSR_REG\ + } else {\ + value = 0;\ + C_OUT = (reg[opcode & 0x0F].I & 0x80000000) ? true : false;\ + }\ + \ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+4:\ + case BASE+12:\ + {\ + /* OP Rd,Rb,Rm ASR # */\ + int shift = (opcode >> 7) & 0x1F;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + LOGICAL_ASR_REG\ + } else {\ + if(reg[opcode & 0x0F].I & 0x80000000){\ + value = 0xFFFFFFFF;\ + C_OUT = true;\ + } else {\ + value = 0;\ + C_OUT = false;\ + } \ + }\ + \ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+6:\ + case BASE+14:\ + {\ + /* OP Rd,Rb,Rm ROR # */\ + int shift = (opcode >> 7) & 0x1F;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + LOGICAL_ROR_REG\ + } else {\ + LOGICAL_RRX_REG\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+1:\ + {\ + /* OP Rd,Rb,Rm LSL Rs */\ + clockTicks++;\ + int shift = reg[(opcode >> 8)&15].B.B0;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + if(shift == 32) {\ + value = 0;\ + C_OUT = (reg[opcode & 0x0F].I & 1 ? true : false);\ + } else if(shift < 32) {\ + LOGICAL_LSL_REG\ + } else {\ + value = 0;\ + C_OUT = false;\ + }\ + } else {\ + value = reg[opcode & 0x0F].I;\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+3:\ + {\ + /* OP Rd,Rb,Rm LSR Rs */ \ + clockTicks++;\ + int shift = reg[(opcode >> 8)&15].B.B0;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + if(shift == 32) {\ + value = 0;\ + C_OUT = (reg[opcode & 0x0F].I & 0x80000000 ? true : false);\ + } else if(shift < 32) {\ + LOGICAL_LSR_REG\ + } else {\ + value = 0;\ + C_OUT = false;\ + }\ + } else {\ + value = reg[opcode & 0x0F].I;\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+5:\ + {\ + /* OP Rd,Rb,Rm ASR Rs */ \ + clockTicks++;\ + int shift = reg[(opcode >> 8)&15].B.B0;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift < 32) {\ + if(shift) {\ + LOGICAL_ASR_REG\ + } else {\ + value = reg[opcode & 0x0F].I;\ + }\ + } else {\ + if(reg[opcode & 0x0F].I & 0x80000000){\ + value = 0xFFFFFFFF;\ + C_OUT = true;\ + } else {\ + value = 0;\ + C_OUT = false;\ + }\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+7:\ + {\ + /* OP Rd,Rb,Rm ROR Rs */\ + clockTicks++;\ + int shift = reg[(opcode >> 8)&15].B.B0;\ + int dest = (opcode>>12) & 15;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + shift &= 0x1f;\ + if(shift) {\ + LOGICAL_ROR_REG\ + } else {\ + value = reg[opcode & 0x0F].I;\ + C_OUT = (value & 0x80000000 ? true : false);\ + }\ + } else {\ + value = reg[opcode & 0x0F].I;\ + C_OUT = (value & 0x80000000 ? true : false);\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break;\ + case BASE+0x200:\ + case BASE+0x201:\ + case BASE+0x202:\ + case BASE+0x203:\ + case BASE+0x204:\ + case BASE+0x205:\ + case BASE+0x206:\ + case BASE+0x207:\ + case BASE+0x208:\ + case BASE+0x209:\ + case BASE+0x20a:\ + case BASE+0x20b:\ + case BASE+0x20c:\ + case BASE+0x20d:\ + case BASE+0x20e:\ + case BASE+0x20f:\ + {\ + int shift = (opcode & 0xF00) >> 7;\ + int dest = (opcode >> 12) & 0x0F;\ + bool C_OUT = C_FLAG;\ + u32 value;\ + if(shift) {\ + LOGICAL_ROR_IMM\ + } else {\ + value = opcode & 0xff;\ + }\ + if(dest == 15) {\ + OPCODE2\ + /* todo */\ + if(opcode & 0x00100000) {\ + clockTicks++;\ + CPUSwitchMode(reg[17].I & 0x1f, false);\ + }\ + if(armState) {\ + reg[15].I &= 0xFFFFFFFC;\ + armNextPC = reg[15].I;\ + reg[15].I += 4;\ + } else {\ + reg[15].I &= 0xFFFFFFFE;\ + armNextPC = reg[15].I;\ + reg[15].I += 2;\ + }\ + } else {\ + OPCODE \ + }\ + }\ + break; + #define ARITHMETIC_DATA_OPCODE(OPCODE, OPCODE2, BASE) \ case BASE:\ *************** *** 1889,1894 **** if(cond_res) { switch(((opcode>>16)&0xFF0) | ((opcode>>4)&0x0F)) { ! LOGICAL_DATA_OPCODE(OP_AND, OP_AND, 0x000); ! LOGICAL_DATA_OPCODE(OP_ANDS, OP_AND, 0x010); case 0x009: { --- 2253,2258 ---- if(cond_res) { switch(((opcode>>16)&0xFF0) | ((opcode>>4)&0x0F)) { ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_AND, OP_AND, 0x000); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_ANDS, OP_AND, 0x010); case 0x009: { *************** *** 2527,2532 **** } break; ! LOGICAL_DATA_OPCODE(OP_EOR, OP_EOR, 0x020); ! LOGICAL_DATA_OPCODE(OP_EORS, OP_EOR, 0x030); case 0x029: { --- 2891,2896 ---- } break; ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_EOR, OP_EOR, 0x020); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_EORS, OP_EOR, 0x030); case 0x029: { *************** *** 2862,2873 **** } break; ! LOGICAL_DATA_OPCODE(OP_ORR, OP_ORR, 0x180); ! LOGICAL_DATA_OPCODE(OP_ORRS, OP_ORR, 0x190); ! LOGICAL_DATA_OPCODE(OP_MOV, OP_MOV, 0x1a0); ! LOGICAL_DATA_OPCODE(OP_MOVS, OP_MOV, 0x1b0); ! LOGICAL_DATA_OPCODE(OP_BIC, OP_BIC, 0x1c0); ! LOGICAL_DATA_OPCODE(OP_BICS, OP_BIC, 0x1d0); ! LOGICAL_DATA_OPCODE(OP_MVN, OP_MVN, 0x1e0); ! LOGICAL_DATA_OPCODE(OP_MVNS, OP_MVN, 0x1f0); #ifdef BKPT_SUPPORT case 0x127: --- 3226,3237 ---- } break; ! LOGICAL_DATA_OPCODE (OP_ORR, OP_ORR, 0x180); ! LOGICAL_DATA_OPCODE (OP_ORRS, OP_ORR, 0x190); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MOV, OP_MOV, 0x1a0); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MOVS, OP_MOV, 0x1b0); ! LOGICAL_DATA_OPCODE (OP_BIC, OP_BIC, 0x1c0); ! LOGICAL_DATA_OPCODE (OP_BICS, OP_BIC, 0x1d0); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MVN, OP_MVN, 0x1e0); ! LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MVNS, OP_MVN, 0x1f0); #ifdef BKPT_SUPPORT case 0x127: *************** *** 6133,6138 **** // LDMIA Rn, {Rlist}^ int base = (opcode & 0x000F0000) >> 16; - u32 temp = reg[base].I + - 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]); u32 address = reg[base].I & 0xFFFFFFFC; clockTicks += 2; --- 6497,6500 ---- *************** *** 6585,6590 **** // LDMIB Rn, {Rlist}^ int base = (opcode & 0x000F0000) >> 16; - u32 temp = reg[base].I + - 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]); u32 address = (reg[base].I+4) & 0xFFFFFFFC; clockTicks += 2; --- 6947,6950 ---- |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:16:45
|
Update of /cvsroot/vba/VisualBoyAdvance/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3047/po Log Message: Directory /cvsroot/vba/VisualBoyAdvance/po added to the repository |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:16:13
|
Update of /cvsroot/vba/VisualBoyAdvance/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2794/m4 Log Message: Directory /cvsroot/vba/VisualBoyAdvance/m4 added to the repository |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:11:26
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1751/gtk Log Message: Directory /cvsroot/vba/VisualBoyAdvance/src/gtk added to the repository |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:11:26
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1751/sdl Log Message: Directory /cvsroot/vba/VisualBoyAdvance/src/sdl added to the repository |
|
From: S?bastien G. <kx...@us...> - 2004-03-29 22:09:04
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1315 Modified Files: Gfx.h Log Message: Fixed the mosaic rendering. Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Gfx.h 20 Mar 2004 00:18:33 -0000 1.11 --- Gfx.h 29 Mar 2004 21:57:33 -0000 1.12 *************** *** 252,258 **** } if(mosaicOn) { ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { ! line[i] = line[i-1]; i++; } } --- 252,264 ---- } if(mosaicOn) { ! if(mosaicX > 1) { ! int m = 1; ! for(int i = 0; i < 239; i++) { ! line[i+1] = line[i]; ! m++; ! if(m == mosaicX) { ! m = 1; ! i++; ! } } } *************** *** 412,418 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { ! line[i] = line[i-1]; i++; } } --- 418,430 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! if(mosaicX > 1) { ! int m = 1; ! for(int i = 0; i < 239; i++) { ! line[i+1] = line[i]; ! m++; ! if(m == mosaicX) { ! m = 1; ! i++; ! } } } *************** *** 503,509 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { ! line[i] = line[i-1]; i++; } } --- 515,527 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! if(mosaicX > 1) { ! int m = 1; ! for(int i = 0; i < 239; i++) { ! line[i+1] = line[i]; ! m++; ! if(m == mosaicX) { ! m = 1; ! i++; ! } } } *************** *** 598,604 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { ! line[i] = line[i-1]; i++; } } --- 616,628 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! if(mosaicX > 1) { ! int m = 1; ! for(int i = 0; i < 239; i++) { ! line[i+1] = line[i]; ! m++; ! if(m == mosaicX) { ! m = 1; ! i++; ! } } } *************** *** 691,697 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { ! line[i] = line[i-1]; i++; } } --- 715,727 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! if(mosaicX > 1) { ! int m = 1; ! for(int i = 0; i < 239; i++) { ! line[i+1] = line[i]; ! m++; ! if(m == mosaicX) { ! m = 1; ! i++; ! } } } |
|
From: Forgotten <for...@us...> - 2004-03-20 00:28:27
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11808/src Modified Files: GBA.cpp Gfx.h arm-new.h thumb.h Log Message: Final updates Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Gfx.h 16 Feb 2004 03:08:40 -0000 1.10 --- Gfx.h 20 Mar 2004 00:18:33 -0000 1.11 *************** *** 26,29 **** --- 26,31 ---- #include "Port.h" + //#define SPRITE_DEBUG + void gfxDrawTextScreen(u16, u16, u16, u32 *); void gfxDrawRotScreen(u16, *************** *** 763,766 **** --- 765,773 ---- } + #ifdef SPRITE_DEBUG + int maskX = sizeX-1; + int maskY = sizeY-1; + #endif + int sy = (a0 & 255); *************** *** 828,844 **** (xxx & 7))&0x7FFF)]; if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[color]) | prio; } if (a0 & 0x1000) { - if (m) - lineOBJ[sx]=lineOBJ[sx-1]; m++; if (m==mosaicX) m=0; } } sx = (sx+1)&511;; --- 835,857 ---- (xxx & 7))&0x7FFF)]; if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) { lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! if((a0 & 0x1000) && m) ! lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; ! } else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[color]) | prio; + if((a0 & 0x1000) && m) + lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; } if (a0 & 0x1000) { m++; if (m==mosaicX) m=0; } + #ifdef SPRITE_DEBUG + if(t == 0 || t == maskY || x == 0 || x == maskX) + lineOBJ[sx] = 0x001F; + #endif } sx = (sx+1)&511;; *************** *** 871,887 **** if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette+color]) | prio; } } ! if (a0 & 0x1000) { ! if (m) ! lineOBJ[sx]=lineOBJ[sx-1]; m++; if (m==mosaicX) m=0; } sx = (sx+1)&511;; realX += dx; --- 884,907 ---- if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) { lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! if((a0 & 0x1000) && m) ! lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; ! } else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette+color]) | prio; + if((a0 & 0x1000) && m) + lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; } } ! if((a0 & 0x1000) && m) { m++; if (m==mosaicX) m=0; } + + #ifdef SPRITE_DEBUG + if(t == 0 || t == maskY || x == 0 || x == maskX) + lineOBJ[sx] = 0x001F; + #endif sx = (sx+1)&511;; realX += dx; *************** *** 929,944 **** u8 color = vram[address]; if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[color]) | prio; } if (a0 & 0x1000) { - if (m) - lineOBJ[sx]=lineOBJ[sx-1]; m++; if (m==mosaicX) m=0; } } --- 949,972 ---- u8 color = vram[address]; if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) { lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! if((a0 & 0x1000) && m) ! lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; ! } else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[color]) | prio; + if((a0 & 0x1000) && m) + lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; } + if (a0 & 0x1000) { m++; if (m==mosaicX) m=0; } + + #ifdef SPRITE_DEBUG + if(t == 0 || t == maskY || xx == 0 || xx == maskX) + lineOBJ[sx] = 0x001F; + #endif } *************** *** 998,1014 **** if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette + color]) | prio; } } if (a0 & 0x1000) { - if (m) - lineOBJ[sx]=lineOBJ[sx-1]; m++; if (m==mosaicX) m=0; } sx = (sx+1) & 511; xxx--; --- 1026,1048 ---- if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) { lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! if((a0 & 0x1000) && m) ! lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; ! } else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette + color]) | prio; + if((a0 & 0x1000) && m) + lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; } } if (a0 & 0x1000) { m++; if (m==mosaicX) m=0; } + #ifdef SPRITE_DEBUG + if(t == 0 || t == maskY || xx == 0 || xx == maskX) + lineOBJ[sx] = 0x001F; + #endif sx = (sx+1) & 511; xxx--; *************** *** 1032,1048 **** if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette + color]) | prio; } } if (a0 & 0x1000) { - if (m) - lineOBJ[sx]=lineOBJ[sx-1]; m++; if (m==mosaicX) m=0; } sx = (sx+1) & 511; xxx++; --- 1066,1089 ---- if ((color==0) && (((prio >> 25)&3) < ! ((lineOBJ[sx]>>25)&3))) { lineOBJ[sx] = (lineOBJ[sx] & 0xF9FFFFFF) | prio; ! if((a0 & 0x1000) && m) ! lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; ! } else if((color) && (prio < (lineOBJ[sx]&0xFF000000))) { lineOBJ[sx] = READ16LE(&spritePalette[palette + color]) | prio; + if((a0 & 0x1000) && m) + lineOBJ[sx]=(lineOBJ[sx-1] & 0xF9FFFFFF) | prio; + } } if (a0 & 0x1000) { m++; if (m==mosaicX) m=0; } + #ifdef SPRITE_DEBUG + if(t == 0 || t == maskY || xx == 0 || xx == maskX) + lineOBJ[sx] = 0x001F; + #endif sx = (sx+1) & 511; xxx++; Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** arm-new.h 8 Dec 2003 11:38:17 -0000 1.8 --- arm-new.h 20 Mar 2004 00:18:33 -0000 1.9 *************** *** 1817,1821 **** u32 opcode = CPUReadMemoryQuick(armNextPC); ! clockTicks = memoryWait32[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION --- 1817,1821 ---- u32 opcode = CPUReadMemoryQuick(armNextPC); ! clockTicks = memoryWaitFetch32[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION Index: thumb.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/thumb.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** thumb.h 4 Nov 2003 14:11:52 -0000 1.9 --- thumb.h 20 Mar 2004 00:18:34 -0000 1.10 *************** *** 764,768 **** u32 opcode = CPUReadHalfWordQuick(armNextPC); ! clockTicks = thumbCycles[opcode >> 8] + cpuMemoryWait[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION if(armNextPC == stop) { --- 764,768 ---- u32 opcode = CPUReadHalfWordQuick(armNextPC); ! clockTicks = thumbCycles[opcode >> 8] + memoryWaitFetch[(armNextPC >> 24) & 15]; #ifndef FINAL_VERSION if(armNextPC == stop) { Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** GBA.cpp 6 Feb 2004 11:26:58 -0000 1.52 --- GBA.cpp 20 Mar 2004 00:18:33 -0000 1.53 *************** *** 165,169 **** { 0, 0, 2, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 0 }; int memoryWait32[16] = ! { 0, 0, 6, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 0 }; int memoryWaitSeq[16] = { 0, 0, 2, 0, 0, 0, 0, 0, 2, 2, 4, 4, 8, 8, 4, 0 }; --- 165,169 ---- { 0, 0, 2, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 0 }; int memoryWait32[16] = ! { 0, 0, 9, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 0 }; int memoryWaitSeq[16] = { 0, 0, 2, 0, 0, 0, 0, 0, 2, 2, 4, 4, 8, 8, 4, 0 }; *************** *** 529,540 **** } ! inline void CPUUpdateTicks(int &cpuLoopTicks) { ! cpuLoopTicks = lcdTicks; if(soundTicks < cpuLoopTicks) cpuLoopTicks = soundTicks; ! if(timer0On && (timer0Ticks < cpuLoopTicks)) { cpuLoopTicks = timer0Ticks; } --- 529,540 ---- } ! inline int CPUUpdateTicks() { ! int cpuLoopTicks = lcdTicks; if(soundTicks < cpuLoopTicks) cpuLoopTicks = soundTicks; ! if(timer0On && !(TM0CNT & 4) && (timer0Ticks < cpuLoopTicks)) { cpuLoopTicks = timer0Ticks; } *************** *** 556,559 **** --- 556,560 ---- #endif cpuSavedTicks = cpuLoopTicks; + return cpuLoopTicks; } *************** *** 2650,2690 **** break; case 0x204: - memoryWait[0x0e] = memoryWaitSeq[0x0e] = gamepakRamWaitState[value & 3]; - - if(!speedHack) { - memoryWait[0x08] = memoryWait[0x09] = gamepakWaitState[(value >> 2) & 7]; - memoryWaitSeq[0x08] = memoryWaitSeq[0x09] = - gamepakWaitState0[(value >> 2) & 7]; - - memoryWait[0x0a] = memoryWait[0x0b] = gamepakWaitState[(value >> 5) & 7]; - memoryWaitSeq[0x0a] = memoryWaitSeq[0x0b] = - gamepakWaitState1[(value >> 5) & 7]; - - memoryWait[0x0c] = memoryWait[0x0d] = gamepakWaitState[(value >> 8) & 7]; - memoryWaitSeq[0x0c] = memoryWaitSeq[0x0d] = - gamepakWaitState2[(value >> 8) & 7]; - } else { - memoryWait[0x08] = memoryWait[0x09] = 4; - memoryWaitSeq[0x08] = memoryWaitSeq[0x09] = 2; - - memoryWait[0x0a] = memoryWait[0x0b] = 4; - memoryWaitSeq[0x0a] = memoryWaitSeq[0x0b] = 4; - - memoryWait[0x0c] = memoryWait[0x0d] = 4; - memoryWaitSeq[0x0c] = memoryWaitSeq[0x0d] = 8; - } { ! for(int i = 0; i < 16; i++) { memoryWaitFetch32[i] = memoryWait32[i] = memoryWait[i] * (memory32[i] ? 1 : 2); memoryWaitFetch[i] = memoryWait[i]; } ! } ! if(value & 0x4000) { ! for(int i = 0; i < 16; i++) { ! memoryWaitFetch32[i] = memoryWaitFetch[i] = cpuMemoryWait[i]; } } - UPDATE_REG(0x204, value); break; case 0x208: --- 2651,2696 ---- break; case 0x204: { ! int i; ! memoryWait[0x0e] = memoryWaitSeq[0x0e] = gamepakRamWaitState[value & 3]; ! ! if(!speedHack) { ! memoryWait[0x08] = memoryWait[0x09] = gamepakWaitState[(value >> 2) & 7]; ! memoryWaitSeq[0x08] = memoryWaitSeq[0x09] = ! gamepakWaitState0[(value >> 2) & 7]; ! ! memoryWait[0x0a] = memoryWait[0x0b] = gamepakWaitState[(value >> 5) & 7]; ! memoryWaitSeq[0x0a] = memoryWaitSeq[0x0b] = ! gamepakWaitState1[(value >> 5) & 7]; ! ! memoryWait[0x0c] = memoryWait[0x0d] = gamepakWaitState[(value >> 8) & 7]; ! memoryWaitSeq[0x0c] = memoryWaitSeq[0x0d] = ! gamepakWaitState2[(value >> 8) & 7]; ! } else { ! memoryWait[0x08] = memoryWait[0x09] = 4; ! memoryWaitSeq[0x08] = memoryWaitSeq[0x09] = 2; ! ! memoryWait[0x0a] = memoryWait[0x0b] = 4; ! memoryWaitSeq[0x0a] = memoryWaitSeq[0x0b] = 4; ! ! memoryWait[0x0c] = memoryWait[0x0d] = 4; ! memoryWaitSeq[0x0c] = memoryWaitSeq[0x0d] = 8; ! } ! for(i = 0; i < 16; i++) { memoryWaitFetch32[i] = memoryWait32[i] = memoryWait[i] * (memory32[i] ? 1 : 2); memoryWaitFetch[i] = memoryWait[i]; } ! memoryWaitFetch32[3] += 1; ! memoryWaitFetch32[2] += 3; ! ! if(value & 0x4000) { ! for(i = 8; i < 16; i++) { ! memoryWaitFetch32[i] = 2*cpuMemoryWait[i]; ! memoryWaitFetch[i] = cpuMemoryWait[i]; ! } } + UPDATE_REG(0x204, value); } break; case 0x208: *************** *** 3348,3352 **** extTicks = &ticks; ! CPUUpdateTicks(cpuLoopTicks); if(cpuLoopTicks > ticks) { cpuLoopTicks = ticks; --- 3354,3358 ---- extTicks = &ticks; ! cpuLoopTicks = CPUUpdateTicks(); if(cpuLoopTicks > ticks) { cpuLoopTicks = ticks; *************** *** 3423,3426 **** --- 3429,3433 ---- clockTicks = cpuSavedTicks;// + cpuLoopTicks; } + cpuDmaTicksToUpdate = -cpuLoopTicks; updateLoop: *************** *** 3866,3870 **** ticks -= clockTicks; ! CPUUpdateTicks(cpuLoopTicks); if(cpuDmaTicksToUpdate > 0) { --- 3873,3877 ---- ticks -= clockTicks; ! cpuLoopTicks = CPUUpdateTicks(); if(cpuDmaTicksToUpdate > 0) { |
|
From: Forgotten <for...@us...> - 2004-03-20 00:28:26
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11808 Modified Files: ChangeLog Added Files: ChangeLog.1.7.1 Log Message: Final updates --- NEW FILE: ChangeLog.1.7.1 --- 2004-02-07 Forgotten <for...@us...> * src/SDL.cpp (main): disable remove intros option * src/win32/MainWndOptions.cpp (OnUpdateOptionsEmulatorRemoveintrosgba): disable remove intros option * src/win32/MainWnd.cpp: disable remove intros option * src/win32/VBA.cpp: fix power management code * src/win32/MainWnd.cpp (OnMySysCommand): fix power management code * src/win32/MainWndFile.cpp: fix power management code 2004-02-06 Forgotten <for...@us...> * src/Sound.cpp (soundSetQuality): avoid turning sound on if sound off is checked * src/gb/gbSound.cpp (gbSoundSetQuality): avoid turning sound on if sound off is checked * src/GBA.cpp (CPUSoftwareInterrupt): added SWI call to exit emulator 2004-02-05 Forgotten <for...@us...> * src/win32/MainWnd.cpp (FileRun): update battery file more often * src/win32/VBA.cpp (system10Frames): update battery file more often * src/gb/gbMemory.cpp: update battery file more often * src/gb/GB.cpp: update battery file more often * src/System.h: update battery file more often * src/Sram.cpp (sramWrite): update battery file more often * src/SDL.cpp (main): update battery file more often * src/GBA.cpp: update battery file more often * src/Flash.cpp (flashWrite): update battery file more often * src/EEprom.cpp (eepromWrite): update battery file more often 2004-01-30 Forgotten <for...@us...> * src/win32/OpenGL.cpp (render): fix memory leak in OpenGL rendering 2004-01-29 Forgotten <for...@us...> * src/gb/gbCodes.h: fix HALT when no matching in IE and IF 2004-01-28 Forgotten <for...@us...> * src/prof/prof.cpp: fix compile warnings * src/win32/MainWndTools.cpp: switch to use structure functions * src/win32/MainWndFile.cpp: switch to use structure functions * src/win32/VBA.cpp (VBA): use structure instead of individual functions for emulation * src/win32/VBA.h (class VBA): use structure instead of individual functions for emulation * src/win32/MainWnd.cpp: switch to use structure functions * src/System.h: structure for emulator functions * src/win32/MainWnd.cpp (FileRun): save rom size for later use * src/win32/BugReport.cpp (createReport): include cart save strings to bug report 2004-01-25 Forgotten <for...@us...> * src/win32/AboutDialog.cpp (OnInitDialog): fix problem with translator URLs not working correctly and force URL to new site * src/win32/MainWndHelp.cpp (OnHelpFaq): update FAQ URL to new site 2004-01-21 Forgotten <for...@us...> * src/Util.cpp (utilLoad): fix possible memory corruption when loading files with a passed in memory location 2004-01-20 Forgotten <for...@us...> * src/Port.h (READ32LE): big endian updates from flea * src/GBA.cpp: big endian updates from flea * src/Cheats.cpp: big endian updates from flea * src/win32/VBA.cpp (VBA): initialize default GB color palette * src/win32/Direct3D.cpp (initialize): avoid resetting GB colors set by user * src/win32/OpenGL.cpp (initialize): avoid resetting GB colors set by user * src/win32/GDIDisplay.cpp (initialize): avoid resetting GB colors set by user * src/win32/DirectDraw.cpp (initializeOffscreen): avoid resetting GB colors set by user 2004-01-19 Forgotten <for...@us...> * src/gb/GB.cpp (gbEmulate): reset the window line before starting a new frame * src/elf.cpp (elfRead): fix memory leak * src/GBA.cpp (CPULoadRom): avoid crash with invalid ELF file 2004-01-18 Forgotten <for...@us...> * src/win32/FileDlg.cpp (FileDlg): fix problem on 320x240 mode * src/win32/ZoomControl.cpp (OnPaint): fix crash on map/oam/tile viewer 2004-01-16 Forgotten <for...@us...> * win32/GBMemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump * win32/MemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump 2004-01-15 Forgotten <for...@us...> * win32/VBA.cpp: store throttle value 2004-01-14 Forgotten <for...@us...> * win32/VBA.cpp (adjustDestRect): fix multi-mon support * win32/FileDlg.cpp (FileDlg): fix problem on VC 7.1 * win32/MainWnd.cpp (OnActivateApp): fix compile errors on VC 7.1 * win32/GBCheatsDlg.cpp: fix compile errors on VC 7.1 * win32/GBACheats.cpp: fix compile errors on VC 7.1 * bios.cpp: fix compile errors on VC 7.1 Index: ChangeLog =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** ChangeLog 7 Feb 2004 14:07:28 -0000 1.68 --- ChangeLog 20 Mar 2004 00:18:32 -0000 1.69 *************** *** 1,97 **** ! 2004-02-07 Forgotten <for...@us...> ! ! * src/SDL.cpp (main): disable remove intros option ! * src/win32/MainWndOptions.cpp (OnUpdateOptionsEmulatorRemoveintrosgba): disable remove intros option ! * src/win32/MainWnd.cpp: disable remove intros option ! * src/win32/VBA.cpp: fix power management code ! * src/win32/MainWnd.cpp (OnMySysCommand): fix power management code ! * src/win32/MainWndFile.cpp: fix power management code ! ! 2004-02-06 Forgotten <for...@us...> ! ! * src/Sound.cpp (soundSetQuality): avoid turning sound on if sound off is checked ! * src/gb/gbSound.cpp (gbSoundSetQuality): avoid turning sound on if sound off is checked ! * src/GBA.cpp (CPUSoftwareInterrupt): added SWI call to exit emulator ! ! 2004-02-05 Forgotten <for...@us...> ! ! * src/win32/MainWnd.cpp (FileRun): update battery file more often ! * src/win32/VBA.cpp (system10Frames): update battery file more often ! * src/gb/gbMemory.cpp: update battery file more often ! * src/gb/GB.cpp: update battery file more often ! * src/System.h: update battery file more often ! * src/Sram.cpp (sramWrite): update battery file more often ! * src/SDL.cpp (main): update battery file more often ! * src/GBA.cpp: update battery file more often ! * src/Flash.cpp (flashWrite): update battery file more often ! * src/EEprom.cpp (eepromWrite): update battery file more often ! ! 2004-01-30 Forgotten <for...@us...> ! ! * src/win32/OpenGL.cpp (render): fix memory leak in OpenGL rendering ! ! 2004-01-29 Forgotten <for...@us...> ! ! * src/gb/gbCodes.h: fix HALT when no matching in IE and IF ! ! 2004-01-28 Forgotten <for...@us...> ! ! * src/prof/prof.cpp: fix compile warnings ! * src/win32/MainWndTools.cpp: switch to use structure functions ! * src/win32/MainWndFile.cpp: switch to use structure functions ! * src/win32/VBA.cpp (VBA): use structure instead of individual functions for emulation ! * src/win32/VBA.h (class VBA): use structure instead of individual functions for emulation ! * src/win32/MainWnd.cpp: switch to use structure functions ! * src/System.h: structure for emulator functions ! * src/win32/MainWnd.cpp (FileRun): save rom size for later use ! * src/win32/BugReport.cpp (createReport): include cart save strings to bug report ! ! 2004-01-25 Forgotten <for...@us...> ! ! * src/win32/AboutDialog.cpp (OnInitDialog): fix problem with translator URLs not working correctly and force URL to new site ! * src/win32/MainWndHelp.cpp (OnHelpFaq): update FAQ URL to new site ! ! 2004-01-21 Forgotten <for...@us...> ! * src/Util.cpp (utilLoad): fix possible memory corruption when loading files with a passed in memory location ! 2004-01-20 Forgotten <for...@us...> ! * src/Port.h (READ32LE): big endian updates from flea ! * src/GBA.cpp: big endian updates from flea ! * src/Cheats.cpp: big endian updates from flea ! * src/win32/VBA.cpp (VBA): initialize default GB color palette ! * src/win32/Direct3D.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/OpenGL.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/GDIDisplay.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/DirectDraw.cpp (initializeOffscreen): avoid resetting GB colors set by user ! 2004-01-19 Forgotten <for...@us...> ! * src/gb/GB.cpp (gbEmulate): reset the window line before starting a new frame ! * src/elf.cpp (elfRead): fix memory leak ! * src/GBA.cpp (CPULoadRom): avoid crash with invalid ELF file ! 2004-01-18 Forgotten <for...@us...> ! * src/win32/FileDlg.cpp (FileDlg): fix problem on 320x240 mode ! * src/win32/ZoomControl.cpp (OnPaint): fix crash on map/oam/tile viewer ! 2004-01-16 Forgotten <for...@us...> ! * win32/GBMemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump ! * win32/MemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump ! 2004-01-15 Forgotten <for...@us...> ! * win32/VBA.cpp: store throttle value ! 2004-01-14 Forgotten <for...@us...> ! * win32/VBA.cpp (adjustDestRect): fix multi-mon support ! * win32/FileDlg.cpp (FileDlg): fix problem on VC 7.1 ! * win32/MainWnd.cpp (OnActivateApp): fix compile errors on VC 7.1 ! * win32/GBCheatsDlg.cpp: fix compile errors on VC 7.1 ! * win32/GBACheats.cpp: fix compile errors on VC 7.1 ! * bios.cpp: fix compile errors on VC 7.1 --- 1,38 ---- ! 2004-03-11 Forgotten <for...@us...> ! * src/win32/MainWndFile.cpp: changed import/export battery file to default to battery directory ! 2004-03-10 Forgotten <for...@us...> ! * src/win32/DirectSound.cpp (class DirectSound): make destructor virtual to avoid problems when deleting ! * src/win32/Sound.h (class ISound ): make destructor virtual to avoid problems when changing sound quality ! 2004-03-09 Forgotten <for...@us...> ! * src/elf.cpp (elfCleanUp): fix corruption on ELF clean up ! 2004-03-08 Forgotten <for...@us...> ! * src/win32/MapView.cpp (enableButtons): fix radio button bug using keyboard ! * src/win32/GBMapView.cpp (OnInitDialog): fix radio button bug using keyboard ! * src/win32/MapView.cpp (GetClickAddress): fixes for rot. bgs ! 2004-02-29 Forgotten <for...@us...> ! * src/win32/skin.cpp (GetSkinData): allow for JPEG and PNG images to also be loaded ! 2004-02-24 Forgotten <for...@us...> ! * src/admame.cpp: sync code with Scale2x 2.0 ! * src/Cheats.cpp (cheatsCheckKeys): improve CodeBreaker 0xDxxxxxxx code support ! 2004-02-17 Forgotten <for...@us...> ! * src/win32/skinButton.cpp (OnPaint): fix GDI problems with selected bitmap being deleted ! * src/win32/ZoomControl.cpp (OnPaint): fix GDI problems with selected bitmap being deleted ! * src/win32/PaletteViewControl.cpp (OnPaint): fix GDI problems with selected bitmap being deleted ! * src/win32/MemoryViewer.cpp (OnPaint): fix GDI problems with selected bitmap being deleted ! * src/win32/BitmapControl.cpp (OnDraw): fix GDI problems with selected bitmap being deleted ! * src/win32/VBA.cpp (winSetLanguageOption): patch for searching for base language dll ! * elf.cpp (elfRead): fix problem caused by previous memory leak fix |
|
From: <for...@us...> - 2004-03-11 11:36:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26660 Modified Files: MainWndFile.cpp Log Message: Change default directory for import/export battery file to the battery dir. Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainWndFile.cpp 7 Feb 2004 13:55:16 -0000 1.4 --- MainWndFile.cpp 11 Mar 2004 11:18:02 -0000 1.5 *************** *** 350,354 **** CString title = winResLoadString(IDS_SELECT_BATTERY_FILE); ! FileDlg dlg(this, "", filter, 0, "", exts, "", title, false); if(dlg.DoModal() == IDCANCEL) --- 350,359 ---- CString title = winResLoadString(IDS_SELECT_BATTERY_FILE); ! CString saveDir = regQueryStringValue("batteryDir", NULL); ! ! if(saveDir.IsEmpty()) ! saveDir = getDirFromFile(theApp.filename); ! ! FileDlg dlg(this, "", filter, 0, "", exts, saveDir, title, false); if(dlg.DoModal() == IDCANCEL) *************** *** 461,464 **** --- 466,474 ---- CString title = winResLoadString(IDS_SELECT_BATTERY_FILE); + CString saveDir = regQueryStringValue("batteryDir", NULL); + + if(saveDir.IsEmpty()) + saveDir = getDirFromFile(theApp.filename); + FileDlg dlg(this, name, *************** *** 467,471 **** "SAV", exts, ! "", title, true); --- 477,481 ---- "SAV", exts, ! saveDir, title, true); |
|
From: <for...@us...> - 2004-03-10 11:24:13
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31464 Modified Files: DirectSound.cpp Sound.h Log Message: Fix bug when loading a state with a different sound quality when menu is not visible Index: DirectSound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectSound.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectSound.cpp 4 Nov 2003 14:09:52 -0000 1.1 --- DirectSound.cpp 10 Mar 2004 11:06:20 -0000 1.2 *************** *** 44,48 **** public: DirectSound(); ! ~DirectSound(); bool init(); --- 44,48 ---- public: DirectSound(); ! virtual ~DirectSound(); bool init(); Index: Sound.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Sound.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sound.h 4 Nov 2003 14:09:53 -0000 1.1 --- Sound.h 10 Mar 2004 11:06:20 -0000 1.2 *************** *** 23,27 **** { public: ! virtual bool init() = 0; virtual void pause() = 0; --- 23,28 ---- { public: ! virtual ~ISound() {}; ! virtual bool init() = 0; virtual void pause() = 0; |
|
From: <kx...@us...> - 2004-03-09 21:20:47
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2804 Modified Files: GBA.vcproj Log Message: Added support for JPEG/PNG skin images Index: GBA.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/GBA.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GBA.vcproj 20 Jan 2004 02:16:02 -0000 1.1 --- GBA.vcproj 9 Mar 2004 21:03:21 -0000 1.2 *************** *** 24,28 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="include\zlib,include\png" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;FINAL_VERSION;BKPT_SUPPORT;DEV_VERSION" StringPooling="TRUE" --- 24,28 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="include\zlib,include\png,include\cxImage" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;FINAL_VERSION;BKPT_SUPPORT;DEV_VERSION" StringPooling="TRUE" *************** *** 43,47 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="Release/VisualBoyAdvance.exe" LinkIncremental="1" --- 43,47 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib CxImage.lib jpeg.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="Release/VisualBoyAdvance.exe" LinkIncremental="1" *************** *** 88,92 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="include\zlib,include\png" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;DEV_VERSION;BKPT_SUPPORT" BasicRuntimeChecks="3" --- 88,92 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="include\zlib,include\png,include\cxImage" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;DEV_VERSION;BKPT_SUPPORT" BasicRuntimeChecks="3" *************** *** 106,110 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="Debug/VisualBoyAdvance.exe" LinkIncremental="1" --- 106,110 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib CxImage.lib jpeg.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="Debug/VisualBoyAdvance.exe" LinkIncremental="1" *************** *** 152,156 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="include\zlib,include\png" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;FINAL_VERSION;BKPT_SUPPORT" StringPooling="TRUE" --- 152,156 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="include\zlib,include\png,include\cxImage" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;OEMRESOURCE;MMX;FINAL_VERSION;BKPT_SUPPORT" StringPooling="TRUE" *************** *** 170,174 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="ReleaseNoDev/VisualBoyAdvance.exe" LinkIncremental="1" --- 170,174 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="libpngMD.lib zlibMD.lib CxImage.lib jpeg.lib d3dx8.lib wsock32.lib ddraw.lib dxguid.lib winmm.lib dinput.lib vfw32.lib opengl32.lib" OutputFile="ReleaseNoDev/VisualBoyAdvance.exe" LinkIncremental="1" *************** *** 919,922 **** --- 919,928 ---- RelativePath=".\lib\win32\zlibMD.lib"> </File> + <File + RelativePath=".\lib\win32\CxImage.lib"> + </File> + <File + RelativePath=".\lib\win32\jpeg.lib"> + </File> </Files> <Globals> |
|
From: <for...@us...> - 2004-03-09 11:21:11
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16004 Modified Files: elf.cpp Log Message: Fix memory being free'd twice. Index: elf.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** elf.cpp 17 Feb 2004 11:10:53 -0000 1.14 --- elf.cpp 9 Mar 2004 11:03:59 -0000 1.15 *************** *** 2962,2966 **** elfDebugStrings = NULL; if(elfDebugInfo) { - free(elfDebugInfo->debugdata); int num = elfDebugInfo->numRanges; int i; --- 2962,2965 ---- |
