[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot Makefile.am configure.in dic/Makefile.am ...
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot Makefile.am configure.in dic/Makefile.am ... |
|
Date: |
Sun, 07 Sep 2008 13:17:43 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 08/09/07 13:17:42
Modified files:
. : Makefile.am configure.in
dic : Makefile.am compdic.cpp listdic.cpp
regexpmain.cpp
po : eliot.pot fr.po
qt : Makefile.am main.cpp
qt/ui : dic_tools_widget.ui prefs_dialog.ui
utils : ncurses.cpp
wxwin : Makefile.am
Added files:
qt/images : eliot.ico
Log message:
- Renamed the binaries: eliot is now the Qt interface, whereas wxeliot
is the wxWidgets interface
- Embed the program icon into the executable on Windows: the icon is
not visible in Windows explorer
- Fixed gettext configuration on Windows. The translations now appear,
but the accents still don't display correctly.
- Fixed a few translation issues
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/Makefile.am?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/configure.in?cvsroot=eliot&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/Makefile.am?cvsroot=eliot&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/compdic.cpp?cvsroot=eliot&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/listdic.cpp?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexpmain.cpp?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/Makefile.am?cvsroot=eliot&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/main.cpp?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/eliot.ico?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/dic_tools_widget.ui?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/prefs_dialog.ui?cvsroot=eliot&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/ncurses.cpp?cvsroot=eliot&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/Makefile.am?cvsroot=eliot&r1=1.12&r2=1.13
Patches:
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Makefile.am 3 Sep 2008 17:28:27 -0000 1.9
+++ Makefile.am 7 Sep 2008 13:17:39 -0000 1.10
@@ -18,7 +18,7 @@
mkdir -p $(WIN32_PACKAGE_DIR)
# Copy the binaries and strip them
- cp $(top_builddir)/wxwin/eliot$(EXEEXT)
$(top_builddir)/dic/compdic$(EXEEXT) $(top_builddir)/dic/listdic$(EXEEXT)
$(top_builddir)/qt/qeliot$(EXEEXT) $(WIN32_PACKAGE_DIR)
+ cp $(top_builddir)/wxwin/wxeliot$(EXEEXT)
$(top_builddir)/dic/compdic$(EXEEXT) $(top_builddir)/dic/listdic$(EXEEXT)
$(top_builddir)/qt/eliot$(EXEEXT) $(WIN32_PACKAGE_DIR)
$(STRIP) $(WIN32_PACKAGE_DIR)/*
# Copy the i18n files
Index: configure.in
===================================================================
RCS file: /cvsroot/eliot/eliot/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- configure.in 3 Sep 2008 17:28:27 -0000 1.26
+++ configure.in 7 Sep 2008 13:17:40 -0000 1.27
@@ -4,7 +4,7 @@
dnl configure.in for Eliot
dnl --------------------------------------------------------------
AC_INIT(eliot, 1.7-cvs)
-AC_CONFIG_SRCDIR(wxwin/main.cc)
+AC_CONFIG_SRCDIR(qt/main.cpp)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
@@ -69,6 +69,9 @@
AC_ARG_ENABLE([dictools],AC_HELP_STRING([--enable-dictools],[build independant
dictionary tools (default enabled)]))
AM_CONDITIONAL([BUILD_DICTOOLS], [test "${enable_dictools}" != "no"])
+dnl Define WIN32_BUILD if the compiler is i586-mingw32msvc-g++
+AM_CONDITIONAL([WIN32_BUILD], [test "${CXX}" = "i586-mingw32msvc-g++"])
+
dnl --------------------------------------------------------------
dnl Checks for header files.
dnl --------------------------------------------------------------
Index: dic/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- dic/Makefile.am 7 Jul 2008 17:29:59 -0000 1.19
+++ dic/Makefile.am 7 Sep 2008 13:17:40 -0000 1.20
@@ -22,9 +22,6 @@
localedir = $(datadir)/locale
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) -I../intl
-I$(top_srcdir)/intl $(INCICONV)
-libdic_a_CFLAGS=
-libdic_a_YFLAGS=-d
-libdic_a_LFLAGS=
libdic_a_SOURCES = \
dic_exception.cpp dic_exception.h \
header.cpp header.h \
Index: dic/compdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/compdic.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dic/compdic.cpp 5 Sep 2008 21:31:30 -0000 1.5
+++ dic/compdic.cpp 7 Sep 2008 13:17:40 -0000 1.6
@@ -443,15 +443,16 @@
// Set the message domain
#ifdef WIN32
// Get the absolute path, as returned by GetFullPathName()
- char localeDir[MAX_PATH];
- GetFullPathName(argv[0], MAX_PATH, localeDir, NULL);
- char *pos = strrchr(localeDir, L'\\');
+ char baseDir[MAX_PATH];
+ GetFullPathName(argv[0], MAX_PATH, baseDir, NULL);
+ char *pos = strrchr(baseDir, L'\\');
if (pos)
*pos = '\0';
+ const string localeDir = baseDir + string("\\locale");
#else
- static const char *localeDir = LOCALEDIR;
+ static const string localeDir = LOCALEDIR;
#endif
- bindtextdomain(PACKAGE, localeDir);
+ bindtextdomain(PACKAGE, localeDir.c_str());
textdomain(PACKAGE);
#endif
Index: dic/listdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/listdic.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dic/listdic.cpp 5 Sep 2008 21:31:30 -0000 1.3
+++ dic/listdic.cpp 7 Sep 2008 13:17:40 -0000 1.4
@@ -130,15 +130,16 @@
// Set the message domain
#ifdef WIN32
// Get the absolute path, as returned by GetFullPathName()
- char localeDir[MAX_PATH];
- GetFullPathName(argv[0], MAX_PATH, localeDir, NULL);
- char *pos = strrchr(localeDir, L'\\');
+ char baseDir[MAX_PATH];
+ GetFullPathName(argv[0], MAX_PATH, baseDir, NULL);
+ char *pos = strrchr(baseDir, L'\\');
if (pos)
*pos = '\0';
+ const string localeDir = baseDir + string("\\locale");
#else
- static const char *localeDir = LOCALEDIR;
+ static const string localeDir = LOCALEDIR;
#endif
- bindtextdomain(PACKAGE, localeDir);
+ bindtextdomain(PACKAGE, localeDir.c_str());
textdomain(PACKAGE);
#endif
Index: dic/regexpmain.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/regexpmain.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dic/regexpmain.cpp 5 Sep 2008 21:31:30 -0000 1.9
+++ dic/regexpmain.cpp 7 Sep 2008 13:17:40 -0000 1.10
@@ -66,15 +66,16 @@
// Set the message domain
#ifdef WIN32
// Get the absolute path, as returned by GetFullPathName()
- char localeDir[MAX_PATH];
- GetFullPathName(argv[0], MAX_PATH, localeDir, NULL);
- char *pos = strrchr(localeDir, L'\\');
+ char baseDir[MAX_PATH];
+ GetFullPathName(argv[0], MAX_PATH, baseDir, NULL);
+ char *pos = strrchr(baseDir, L'\\');
if (pos)
*pos = '\0';
+ const string localeDir = baseDir + string("\\locale");
#else
- static const char *localeDir = LOCALEDIR;
+ static const string localeDir = LOCALEDIR;
#endif
- bindtextdomain(PACKAGE, localeDir);
+ bindtextdomain(PACKAGE, localeDir.c_str());
textdomain(PACKAGE);
#endif
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/eliot.pot 6 Sep 2008 20:06:58 -0000 1.12
+++ po/eliot.pot 7 Sep 2008 13:17:40 -0000 1.13
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:02+0200\n"
+"POT-Creation-Date: 2008-09-07 10:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -192,29 +192,29 @@
msgid "? 0 2 1 1"
msgstr ""
-#: dic/compdic.cpp:511
+#: dic/compdic.cpp:512
msgid "A mandatory option is missing"
msgstr ""
-#: dic/compdic.cpp:519
+#: dic/compdic.cpp:520
msgid "Cannot stat uncompressed dictionary "
msgstr ""
-#: dic/compdic.cpp:527
+#: dic/compdic.cpp:528
msgid "Cannot open output file "
msgstr ""
-#: dic/compdic.cpp:575
+#: dic/compdic.cpp:576
#, c-format
msgid " Load time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:576
+#: dic/compdic.cpp:577
#, c-format
msgid " Compression time: %.3f s\n"
msgstr ""
-#: dic/compdic.cpp:578
+#: dic/compdic.cpp:579
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr ""
@@ -258,15 +258,15 @@
msgid " dictionary: path to eliot dawg dictionary"
msgstr ""
-#: dic/regexpmain.cpp:94 dic/regexpmain.cpp:118
+#: dic/regexpmain.cpp:95 dic/regexpmain.cpp:119
msgid "Enter a regular expression:"
msgstr ""
-#: dic/regexpmain.cpp:105
+#: dic/regexpmain.cpp:106
msgid "result:"
msgstr ""
-#: dic/regexpmain.cpp:114 wxwin/searchpanel.cc:296
+#: dic/regexpmain.cpp:115 wxwin/searchpanel.cc:296
msgid "Invalid regular expression: "
msgstr ""
@@ -1455,7 +1455,8 @@
msgid "History"
msgstr ""
-#: qt/main_window.cpp:681 qt/ui/main_window.ui:136
+#: qt/main_window.cpp:681 qt/ui/dic_tools_widget.ui:13
+#: qt/ui/main_window.ui:136
msgid "Dictionary tools"
msgstr ""
@@ -1608,6 +1609,10 @@
msgid "Pass"
msgstr ""
+#: qt/ui/prefs_dialog.ui:13
+msgid "Preferences"
+msgstr ""
+
#: qt/ui/prefs_dialog.ui:19
msgid "Interface"
msgstr ""
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/fr.po 6 Sep 2008 20:06:58 -0000 1.13
+++ po/fr.po 7 Sep 2008 13:17:41 -0000 1.14
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:02+0200\n"
+"POT-Creation-Date: 2008-09-07 10:38+0200\n"
"PO-Revision-Date: 2008-08-31 10:43+0100\n"
"Last-Translator: Olivier Teuliere <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -210,29 +210,29 @@
msgid "? 0 2 1 1"
msgstr "? 0 2 1 1"
-#: dic/compdic.cpp:511
+#: dic/compdic.cpp:512
msgid "A mandatory option is missing"
msgstr "Une option obligatoire est manquante"
-#: dic/compdic.cpp:519
+#: dic/compdic.cpp:520
msgid "Cannot stat uncompressed dictionary "
msgstr "Impossible de trouver le dictionnaire non compressé "
-#: dic/compdic.cpp:527
+#: dic/compdic.cpp:528
msgid "Cannot open output file "
msgstr "Impossible d'ouvrir le fichier d'output "
-#: dic/compdic.cpp:575
+#: dic/compdic.cpp:576
#, c-format
msgid " Load time: %.3f s\n"
msgstr " Temps de chargement : %.3f s\n"
-#: dic/compdic.cpp:576
+#: dic/compdic.cpp:577
#, c-format
msgid " Compression time: %.3f s\n"
msgstr " Temps de compression : %.3f s\n"
-#: dic/compdic.cpp:578
+#: dic/compdic.cpp:579
#, c-format
msgid " Maximum recursion level reached: %d\n"
msgstr " Niveau maximum de rcursion atteint : %d\n"
@@ -276,15 +276,15 @@
msgid " dictionary: path to eliot dawg dictionary"
msgstr " dictionnaire : chemin vers un dictionnaire de type dawg pour Eliot"
-#: dic/regexpmain.cpp:94 dic/regexpmain.cpp:118
+#: dic/regexpmain.cpp:95 dic/regexpmain.cpp:119
msgid "Enter a regular expression:"
msgstr "Entrer une expression régulière :"
-#: dic/regexpmain.cpp:105
+#: dic/regexpmain.cpp:106
msgid "result:"
msgstr "résultat :"
-#: dic/regexpmain.cpp:114 wxwin/searchpanel.cc:296
+#: dic/regexpmain.cpp:115 wxwin/searchpanel.cc:296
msgid "Invalid regular expression: "
msgstr "Expression régulière invalide : "
@@ -1379,7 +1379,7 @@
#: qt/main_window.cpp:326
msgid "Ctrl+F"
-msgstr "Ctrl-F"
+msgstr "Ctrl+F"
#: qt/main_window.cpp:327
msgid "Edit the preferences"
@@ -1487,7 +1487,8 @@
msgid "History"
msgstr "Historique"
-#: qt/main_window.cpp:681 qt/ui/main_window.ui:136
+#: qt/main_window.cpp:681 qt/ui/dic_tools_widget.ui:13
+#: qt/ui/main_window.ui:136
msgid "Dictionary tools"
msgstr "Outils du dictionnaire"
@@ -1648,6 +1649,10 @@
msgid "Pass"
msgstr "Passer"
+#: qt/ui/prefs_dialog.ui:13
+msgid "Preferences"
+msgstr "Préférences"
+
#: qt/ui/prefs_dialog.ui:19
msgid "Interface"
msgstr "Interface"
@@ -1729,9 +1734,6 @@
#~ msgid "New..."
#~ msgstr "&Nouvelle partie..."
-#~ msgid "Preferences..."
-#~ msgstr "&Préférences..."
-
#~ msgid "Save"
#~ msgstr "Sauver"
Index: qt/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- qt/Makefile.am 3 Sep 2008 17:28:27 -0000 1.5
+++ qt/Makefile.am 7 Sep 2008 13:17:41 -0000 1.6
@@ -24,7 +24,7 @@
SUFFIXES=.ui.h .moc.cpp
-bin_PROGRAMS = qeliot
+bin_PROGRAMS = eliot
RESOURCES = \
images/eliot.xpm
@@ -37,7 +37,8 @@
ui/prefs_dialog.ui \
ui/training_widget.ui \
eliot.qrc \
- $(RESOURCES)
+ $(RESOURCES) \
+ images/eliot.ico
BUILT_SOURCES = \
ui/main_window.ui.h \
@@ -59,7 +60,7 @@
main_window.moc.cpp \
resources.cpp
-qeliot_SOURCES = \
+eliot_SOURCES = \
qtcommon.h \
bag_widget.cpp bag_widget.h \
dic_tools_widget.cpp dic_tools_widget.h \
@@ -73,9 +74,9 @@
aux_window.cpp aux_window.h \
main_window.cpp main_window.h \
main.cpp
-qeliot_SOURCES += $(BUILT_SOURCES)
+eliot_SOURCES += $(BUILT_SOURCES)
-qeliot_LDADD = @QT_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@
+eliot_LDADD = @QT_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@
# Generate a cpp file from the resources
resources.cpp: eliot.qrc $(RESOURCES)
@@ -97,6 +98,18 @@
sed 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' address@hidden >$@
rm -f address@hidden
+# Embed the icon in the win32 binary, see
http://doc.trolltech.com/4.4/appicon.html
+if WIN32_BUILD
+BUILT_SOURCES += win32icon.rc
+eliot_SOURCES += win32icon.rc
+eliot_LDADD += win32icon.o
+
+win32icon.rc: images/eliot.ico
+ echo "IDI_ICON1 ICON DISCARDABLE \"$(top_srcdir)/qt/images/eliot.ico\""
> $@
+
+win32icon.o: win32icon.rc
+ i586-mingw32msvc-windres -o $@ -i $<
+endif
endif
Index: qt/main.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qt/main.cpp 5 Sep 2008 21:31:31 -0000 1.3
+++ qt/main.cpp 7 Sep 2008 13:17:41 -0000 1.4
@@ -20,6 +20,7 @@
#include "config.h"
+#include <string>
#include <QApplication>
#include <QLocale>
#include <QTranslator>
@@ -28,6 +29,9 @@
# include <windows.h>
#endif
+using std::string;
+
+
int main(int argc, char **argv)
{
#ifdef HAVE_SETLOCALE
@@ -42,22 +46,23 @@
// Set the message domain
#ifdef WIN32
// Get the absolute path, as returned by GetFullPathName()
- char localeDir[MAX_PATH];
- GetFullPathName(argv[0], MAX_PATH, localeDir, NULL);
- char *pos = strrchr(localeDir, L'\\');
+ char baseDir[MAX_PATH];
+ GetFullPathName(argv[0], MAX_PATH, baseDir, NULL);
+ char *pos = strrchr(baseDir, L'\\');
if (pos)
*pos = '\0';
+ const string localeDir = baseDir + string("\\locale");
#else
- static const char *localeDir = LOCALEDIR;
+ static const string localeDir = LOCALEDIR;
#endif
- bindtextdomain(PACKAGE, localeDir);
+ bindtextdomain(PACKAGE, localeDir.c_str());
textdomain(PACKAGE);
// Translations for Qt's own strings
QTranslator translator;
// Set the path for the translation file
#ifdef WIN32
- QString path = localeDir;
+ QString path = QString(localeDir.c_str()) + "\\qt4";
#else
QString path = QString(QT4LOCALEDIR);
#endif
Index: qt/ui/dic_tools_widget.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/dic_tools_widget.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- qt/ui/dic_tools_widget.ui 31 Aug 2008 11:48:20 -0000 1.2
+++ qt/ui/dic_tools_widget.ui 7 Sep 2008 13:17:42 -0000 1.3
@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>Form</string>
+ <string>_("Dictionary tools")</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<item>
Index: qt/ui/prefs_dialog.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/prefs_dialog.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- qt/ui/prefs_dialog.ui 5 Sep 2008 21:31:32 -0000 1.5
+++ qt/ui/prefs_dialog.ui 7 Sep 2008 13:17:42 -0000 1.6
@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>Preferences</string>
+ <string>_("Preferences")</string>
</property>
<layout class="QVBoxLayout" >
<item>
Index: utils/ncurses.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/ncurses.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- utils/ncurses.cpp 5 Sep 2008 21:31:32 -0000 1.27
+++ utils/ncurses.cpp 7 Sep 2008 13:17:42 -0000 1.28
@@ -1123,15 +1123,16 @@
// Set the message domain
#ifdef WIN32
// Get the absolute path, as returned by GetFullPathName()
- char localeDir[MAX_PATH];
- GetFullPathName(argv[0], MAX_PATH, localeDir, NULL);
- char *pos = strrchr(localeDir, L'\\');
+ char baseDir[MAX_PATH];
+ GetFullPathName(argv[0], MAX_PATH, baseDir, NULL);
+ char *pos = strrchr(baseDir, L'\\');
if (pos)
*pos = '\0';
+ const string localeDir = baseDir + string("\\locale");
#else
- static const char *localeDir = LOCALEDIR;
+ static const string localeDir = LOCALEDIR;
#endif
- bindtextdomain(PACKAGE, localeDir);
+ bindtextdomain(PACKAGE, localeDir.c_str());
textdomain(PACKAGE);
#endif
Index: wxwin/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- wxwin/Makefile.am 8 Jan 2008 16:09:09 -0000 1.12
+++ wxwin/Makefile.am 7 Sep 2008 13:17:42 -0000 1.13
@@ -20,11 +20,11 @@
if BUILD_WXWIDGETS
-bin_PROGRAMS = eliot
+bin_PROGRAMS = wxeliot
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @WX_CPPFLAGS@ -I$(top_srcdir)
-I$(top_srcdir)/dic -I$(top_srcdir)/game
-eliot_SOURCES = \
+wxeliot_SOURCES = \
configdb.cc configdb.h \
gfxboard.cc gfxboard.h \
gfxresult.cc gfxresult.h \
@@ -36,7 +36,7 @@
mainframe.cc mainframe.h \
main.cc ewx.h
-eliot_LDADD = @WX_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@
+wxeliot_LDADD = @WX_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@
EXTRA_DIST = \
eliot.xpm \
Index: qt/images/eliot.ico
===================================================================
RCS file: qt/images/eliot.ico
diff -N qt/images/eliot.ico
Binary files /dev/null and /tmp/cvsKvhMwa differ
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot Makefile.am configure.in dic/Makefile.am ...,
eliot-dev <=