mirror of
git://git.savannah.nongnu.org/eliot.git
synced 2024-11-16 07:47:39 +01:00
- Several fixes in the build system
- Added a bootstrap script to reduce manual work - Added a --enable-debug configure switch to define the DEBUG variable
This commit is contained in:
Olivier Teulière
parent
a2648f74bb
commit
6b025b9541
8 changed files with 54 additions and 53 deletions
17
INSTALL
17
INSTALL
|
|
@ -2,11 +2,7 @@ Installation sous Linux (Un*x) (bien/facile)
|
|||
------------------------------
|
||||
* Pour installer à partir de l'archive CVS :
|
||||
|
||||
autopoint -f
|
||||
aclocal -I m4
|
||||
autoheader
|
||||
automake --add-missing --foreign --copy
|
||||
autoconf
|
||||
./bootstrap
|
||||
|
||||
./configure --prefix=/usr/local/eliot
|
||||
make
|
||||
|
|
@ -40,13 +36,9 @@ Dans les 2 cas, les
|
|||
|
||||
* compilation d'Eliot :
|
||||
|
||||
- si vous utilisez l'archive CVS, il y a quelques commandes préalables
|
||||
à exécuter (aussi bien sous Cygwin que sous GNU/Linux) :
|
||||
autopoint -f
|
||||
aclocal -I m4
|
||||
autoheader
|
||||
automake --add-missing --foreign --copy
|
||||
autoconf
|
||||
- si vous utilisez l'archive CVS, il faut générer le script 'configure'
|
||||
(aussi bien sous Cygwin que sous GNU/Linux) :
|
||||
./bootstrap
|
||||
|
||||
- avec Cygwin, configurer avec la ligne de commande suivante :
|
||||
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
|
||||
|
|
@ -66,4 +58,3 @@ Dans les 2 cas, les
|
|||
Ensuite, un simple 'make' suffit pour terminer la compilation,
|
||||
éventuellement suivi de 'make install'.
|
||||
|
||||
|
||||
|
|
|
|||
7
bootstrap
Executable file
7
bootstrap
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
autopoint -f
|
||||
aclocal -I m4
|
||||
autoheader
|
||||
automake --add-missing --foreign --copy
|
||||
autoconf
|
||||
22
configure.in
22
configure.in
|
|
@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
|
|||
dnl --------------------------------------------------------------
|
||||
dnl configure.in for Eliot
|
||||
dnl --------------------------------------------------------------
|
||||
dnl AC_REVISION($Id: configure.in,v 1.9 2005/03/03 22:14:41 ipkiss Exp $)
|
||||
dnl AC_REVISION($Id: configure.in,v 1.10 2005/04/03 21:12:03 ipkiss Exp $)
|
||||
AC_INIT(eliot, 1.5-cvs)
|
||||
AC_CONFIG_SRCDIR(wxwin/main.cc)
|
||||
AM_INIT_AUTOMAKE
|
||||
|
|
@ -22,14 +22,24 @@ AC_PROG_RANLIB
|
|||
dnl --------------------------------------------------------------
|
||||
dnl Checks for compilation flags
|
||||
dnl --------------------------------------------------------------
|
||||
CFLAGS_save="${CFLAGS}"
|
||||
AC_CACHE_CHECK([if \$CC accepts -Wall],
|
||||
[ac_cv_c_Wall],
|
||||
[CFLAGS="-Wall ${CFLAGS_save}"
|
||||
AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
|
||||
|
||||
CFLAGS="${CFLAGS_save}"
|
||||
if test "${ac_cv_c_Wall}" != "no"; then
|
||||
CFLAGS="-Wall ${CFLAGS_save}"
|
||||
CXXFLAGS="-Wall ${CXXFLAGS_save}"
|
||||
CFLAGS="-Wall ${CFLAGS}"
|
||||
CXXFLAGS="-Wall ${CXXFLAGS}"
|
||||
fi
|
||||
|
||||
dnl Debug mode
|
||||
AC_ARG_ENABLE(debug,
|
||||
[ --enable-debug debug mode (default enabled)])
|
||||
if test "${enable_debug}" != "no"; then
|
||||
CPPFLAGS="${CPPFLAGS} -DDEBUG"
|
||||
dnl CFLAGS="${CFLAGS} -O0"
|
||||
dnl CXXFLAGS="${CXXFLAGS} -O0"
|
||||
fi
|
||||
|
||||
dnl --------------------------------------------------------------
|
||||
|
|
@ -63,7 +73,7 @@ dnl --------------------------------------------------------------
|
|||
|
||||
dnl Check for wxWidgets
|
||||
AC_ARG_ENABLE(wxwidgets,
|
||||
[ --enable-wxwidgets wxWidgets support (default disabled)])
|
||||
[ --enable-wxwidgets wxWidgets interface support (default disabled)])
|
||||
if test "${enable_wxwidgets}" = "yes"
|
||||
then
|
||||
AM_PATH_WXCONFIG(2.4.0, wxwin=1)
|
||||
|
|
@ -100,7 +110,7 @@ AC_ARG_ENABLE(text,
|
|||
[ --enable-text text interface support (default enabled)])
|
||||
AM_CONDITIONAL([BUILD_TEXT], [test "${enable_text}" != "no"])
|
||||
|
||||
dnl internationalization macros
|
||||
dnl Internationalization macros
|
||||
AM_GNU_GETTEXT_VERSION(0.11.5)
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,12 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
# $Id: Makefile.am,v 1.3 2004/06/20 20:13:59 afrab Exp $
|
||||
# $Id: Makefile.am,v 1.4 2005/04/03 21:12:03 ipkiss Exp $
|
||||
|
||||
bin_PROGRAMS = compdic listdic
|
||||
|
||||
noinst_LIBRARIES = libdic.a
|
||||
|
||||
libdic_a_CFLAGS=-Wall -pipe -g
|
||||
libdic_a_SOURCES = \
|
||||
dic_internals.h \
|
||||
dic_search.c dic_search.h \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Copyright (C) 1999-2005 Eliot
|
||||
* Authors: Antoine Fraboulet <antoine.fraboulet@free.fr>
|
||||
*
|
||||
* $Id: debug.h,v 1.6 2005/03/27 22:08:31 ipkiss Exp $
|
||||
* $Id: debug.h,v 1.7 2005/04/03 21:12:03 ipkiss Exp $
|
||||
*
|
||||
* 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
|
||||
|
|
@ -26,10 +26,7 @@
|
|||
* General
|
||||
**********/
|
||||
|
||||
// XXX: Temporary
|
||||
#define _DEBUG_
|
||||
|
||||
#ifdef _DEBUG_
|
||||
#ifdef DEBUG
|
||||
# include <iostream>
|
||||
// Assertion macro: if the condition is not verified, print a message on stderr
|
||||
// and stops execution, otherwise do nothing.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
# $Id: Makefile.am,v 1.5 2005/02/26 22:57:34 ipkiss Exp $
|
||||
# $Id: Makefile.am,v 1.6 2005/04/03 21:12:03 ipkiss Exp $
|
||||
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ noinst_PROGRAMS =
|
|||
if BUILD_TEXT
|
||||
noinst_PROGRAMS += eliottxt
|
||||
eliottxt_SOURCES = game_io.h game_io.cpp eliottxt.cpp
|
||||
eliottxt_LDADD = ../dic/libdic.a ../game/libgame.a
|
||||
eliottxt_LDADD = ../game/libgame.a ../dic/libdic.a
|
||||
endif
|
||||
|
||||
if BUILD_NCURSES
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
# $Id: Makefile.am,v 1.4 2005/02/05 11:14:56 ipkiss Exp $
|
||||
# $Id: Makefile.am,v 1.5 2005/04/03 21:12:03 ipkiss Exp $
|
||||
|
||||
if BUILD_WXWIDGETS
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ bin_PROGRAMS = eliot
|
|||
|
||||
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game
|
||||
|
||||
AM_CPPFLAGS=@WX_CPPFLAGS@
|
||||
AM_CPPFLAGS = @WX_CPPFLAGS@
|
||||
|
||||
eliot_SOURCES = \
|
||||
configdb.cc configdb.h \
|
||||
|
|
@ -39,8 +39,8 @@ eliot_SOURCES = \
|
|||
|
||||
eliot_LDADD = @WX_LIBS@ ../dic/libdic.a ../game/libgame.a
|
||||
|
||||
EXTRA_DIST = \
|
||||
eliot.xpm
|
||||
EXTRA_DIST = \
|
||||
eliot.xpm
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
39
wxwin/ewx.h
39
wxwin/ewx.h
|
|
@ -16,17 +16,15 @@
|
|||
/* along with this program; if not, write to the Free Software */
|
||||
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
/* $Id: ewx.h,v 1.4 2005/03/29 07:00:39 afrab Exp $ */
|
||||
/* $Id: ewx.h,v 1.5 2005/04/03 21:12:03 ipkiss Exp $ */
|
||||
|
||||
#ifndef __EWX__
|
||||
#define __EWX__
|
||||
|
||||
#define DEBUG_
|
||||
|
||||
#ifdef DEBUG
|
||||
# define debug(x...) { fprintf(stderr,x); }
|
||||
#else
|
||||
# define debug(x...)
|
||||
#else
|
||||
# define debug(x...)
|
||||
#endif
|
||||
|
||||
#if defined(TRACE_TODO)
|
||||
|
|
@ -35,7 +33,7 @@
|
|||
fprintf(stderr,x); \
|
||||
}
|
||||
#else
|
||||
# define TODO(x...)
|
||||
# define TODO(x...)
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__) || defined(__WIN95__) || defined(__WXMSW__)
|
||||
|
|
@ -49,22 +47,21 @@
|
|||
|
||||
#include "config.h"
|
||||
#define APPNAME "Eliot"
|
||||
#define DATE "$Date: 2005/03/29 07:00:39 $"
|
||||
#endif
|
||||
#define DATE "$Date: 2005/04/03 21:12:03 $"
|
||||
|
||||
/* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
|
||||
// wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t)
|
||||
#if defined( ENABLE_NLS ) && defined( ENABLE_UTF8 )
|
||||
#if wxUSE_UNICODE
|
||||
# define wxU(utf8) wxString(utf8, wxConvUTF8)
|
||||
#else
|
||||
# define wxU(utf8) wxString(wxConvUTF8.cMB2WC(utf8), *wxConvCurrent)
|
||||
#endif
|
||||
|
||||
# if wxUSE_UNICODE
|
||||
# define wxU(utf8) wxString(utf8, wxConvUTF8)
|
||||
# else
|
||||
# define wxU(utf8) wxString(wxConvUTF8.cMB2WC(utf8), *wxConvCurrent)
|
||||
# endif
|
||||
#else // ENABLE_NLS && ENABLE_UTF8
|
||||
#if wxUSE_UNICODE
|
||||
# define wxU(ansi) wxString(ansi, *wxConvCurrent)
|
||||
#else
|
||||
# define wxU(ansi) ansi
|
||||
#endif
|
||||
# if wxUSE_UNICODE
|
||||
# define wxU(ansi) wxString(ansi, *wxConvCurrent)
|
||||
# else
|
||||
# define wxU(ansi) ansi
|
||||
# endif
|
||||
#endif // ENABLE_NLS && ENABLE_UTF8
|
||||
|
||||
#endif
|
||||
#endif // __EWX__
|
||||
|
|
|
|||
Loading…
Reference in a new issue