You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <eg...@us...> - 2006-07-16 18:44:39
|
Revision: 85 Author: egore Date: 2006-07-16 11:43:52 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=85&view=rev Log Message: ----------- merge loader branch Modified Paths: -------------- data/Makefile.am data/Makefile.in data/Ships/Conflux/C-1/conflux_c1.xml data/Ships/Conflux/C-2/conflux_c2.xml data/Ships/Conflux/C-3/conflux_c3.xml data/Ships/Octavius/Phoenix/octavius_phoenix.xml Added Paths: ----------- data/Ships/Conflux/C-0/Makefile.am data/Ships/Conflux/C-0/Makefile.in data/Ships/Conflux/C-1/Makefile.am data/Ships/Conflux/C-1/Makefile.in data/Ships/Conflux/C-2/Makefile.am data/Ships/Conflux/C-2/Makefile.in data/Ships/Conflux/C-3/Makefile.am data/Ships/Conflux/C-3/Makefile.in data/Ships/Conflux/Makefile.am data/Ships/Conflux/Makefile.in data/Ships/Makefile.am data/Ships/Makefile.in Property Changed: ---------------- data/Makefile.am data/Makefile.in Modified: data/Makefile.am =================================================================== --- data/Makefile.am 2006-07-16 18:35:45 UTC (rev 84) +++ data/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -1,19 +1,4 @@ -## Process this file with automake to produce Makefile.in +INCLUDES = +METASOURCES = AUTO -## Created by Anjuta - will be overwritten -## If you don't want it to overwrite it, -## Please disable it in the Anjuta project configuration - -opengate_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ - -opengate_data_DATA = \ - Ships/Octavius/Apteryx/octavius_apteryx.mesh\ - Ships/Quantar/Storm/quantar_storm.mesh\ - Materials/octavius_apteryx_auv.material\ - Materials/octavius_apteryx_auv.png\ - Materials/quantar_storm_auv.material\ - Materials/quantar_storm_auv.png\ - Materials/skybox.zip\ - Materials/skybox.material - -EXTRA_DIST = $(opengate_data_DATA) +SUBDIRS = Ships Property changes on: data/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Modified: data/Makefile.in =================================================================== --- data/Makefile.in 2006-07-16 18:35:45 UTC (rev 84) +++ data/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,8 +38,7 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -48,15 +46,15 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(opengate_datadir)" -opengate_dataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(opengate_data_DATA) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -98,24 +96,11 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ -NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ -NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ -NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@ -NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@ -PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@ -PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@ -PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ @@ -172,22 +157,13 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -opengate_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ -opengate_data_DATA = \ - Ships/Octavius/Apteryx/octavius_apteryx.mesh\ - Ships/Quantar/Storm/quantar_storm.mesh\ - Materials/octavius_apteryx_auv.material\ - Materials/octavius_apteryx_auv.png\ - Materials/quantar_storm_auv.material\ - Materials/quantar_storm_auv.png\ - Materials/skybox.zip\ - Materials/skybox.material +INCLUDES = +METASOURCES = AUTO +SUBDIRS = Ships +all: all-recursive -EXTRA_DIST = $(opengate_data_DATA) -all: all-am - .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -212,9 +188,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: @@ -226,32 +202,140 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-opengate_dataDATA: $(opengate_data_DATA) - @$(NORMAL_INSTALL) - test -z "$(opengate_datadir)" || $(mkdir_p) "$(DESTDIR)$(opengate_datadir)" - @list='$(opengate_data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(opengate_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(opengate_datadir)/$$f'"; \ - $(opengate_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(opengate_datadir)/$$f"; \ + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done -uninstall-opengate_dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(opengate_data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(opengate_datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(opengate_datadir)/$$f"; \ - done +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS -CTAGS: +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/Materials $(distdir)/Ships/Octavius/Apteryx $(distdir)/Ships/Quantar/Storm @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -278,22 +362,35 @@ || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(opengate_datadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -309,63 +406,68 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: -install-data-am: install-opengate_dataDATA +install-data-am: install-exec-am: -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-opengate_dataDATA +uninstall-am: uninstall-info-am -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man \ - install-opengate_dataDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-opengate_dataDATA +uninstall-info: uninstall-info-recursive +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am 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: Property changes on: data/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Added: data/Ships/Conflux/C-0/Makefile.am =================================================================== --- data/Ships/Conflux/C-0/Makefile.am (rev 0) +++ data/Ships/Conflux/C-0/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,2 @@ +INCLUDES = +METASOURCES = AUTO Property changes on: data/Ships/Conflux/C-0/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/C-0/Makefile.in =================================================================== --- data/Ships/Conflux/C-0/Makefile.in (rev 0) +++ data/Ships/Conflux/C-0/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,315 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/Ships/Conflux/C-0 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = +METASOURCES = AUTO +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Ships/Conflux/C-0/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Ships/Conflux/C-0/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +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 +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + 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: Property changes on: data/Ships/Conflux/C-0/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/C-1/Makefile.am =================================================================== --- data/Ships/Conflux/C-1/Makefile.am (rev 0) +++ data/Ships/Conflux/C-1/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,2 @@ +INCLUDES = +METASOURCES = AUTO Property changes on: data/Ships/Conflux/C-1/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/C-1/Makefile.in =================================================================== --- data/Ships/Conflux/C-1/Makefile.in (rev 0) +++ data/Ships/Conflux/C-1/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,315 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/Ships/Conflux/C-1 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = +METASOURCES = AUTO +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Ships/Conflux/C-1/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Ships/Conflux/C-1/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +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 +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + 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: Property changes on: data/Ships/Conflux/C-1/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: data/Ships/Conflux/C-1/conflux_c1.xml =================================================================== (Binary files differ) Added: data/Ships/Conflux/C-2/Makefile.am =================================================================== --- data/Ships/Conflux/C-2/Makefile.am (rev 0) +++ data/Ships/Conflux/C-2/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,2 @@ +INCLUDES = +METASOURCES = AUTO Property changes on: data/Ships/Conflux/C-2/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/C-2/Makefile.in =================================================================== --- data/Ships/Conflux/C-2/Makefile.in (rev 0) +++ data/Ships/Conflux/C-2/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,315 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/Ships/Conflux/C-2 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = +METASOURCES = AUTO +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Ships/Conflux/C-2/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Ships/Conflux/C-2/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +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 +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + 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: Property changes on: data/Ships/Conflux/C-2/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: data/Ships/Conflux/C-2/conflux_c2.xml =================================================================== (Binary files differ) Added: data/Ships/Conflux/C-3/Makefile.am =================================================================== --- data/Ships/Conflux/C-3/Makefile.am (rev 0) +++ data/Ships/Conflux/C-3/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,2 @@ +INCLUDES = +METASOURCES = AUTO Property changes on: data/Ships/Conflux/C-3/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/C-3/Makefile.in =================================================================== --- data/Ships/Conflux/C-3/Makefile.in (rev 0) +++ data/Ships/Conflux/C-3/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,315 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/Ships/Conflux/C-3 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = +METASOURCES = AUTO +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Ships/Conflux/C-3/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Ships/Conflux/C-3/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +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 +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + 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: Property changes on: data/Ships/Conflux/C-3/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: data/Ships/Conflux/C-3/conflux_c3.xml =================================================================== (Binary files differ) Added: data/Ships/Conflux/Makefile.am =================================================================== --- data/Ships/Conflux/Makefile.am (rev 0) +++ data/Ships/Conflux/Makefile.am 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,3 @@ +INCLUDES = +METASOURCES = AUTO +SUBDIRS = C-0 C-1 C-2 C-3 Property changes on: data/Ships/Conflux/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Ships/Conflux/Makefile.in =================================================================== --- data/Ships/Conflux/Makefile.in (rev 0) +++ data/Ships/Conflux/Makefile.in 2006-07-16 18:43:52 UTC (rev 85) @@ -0,0 +1,473 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/Ships/Conflux +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedi... [truncated message content] |
From: <eg...@us...> - 2006-07-16 18:38:26
|
Revision: 84 Author: egore Date: 2006-07-16 11:35:45 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=84&view=rev Log Message: ----------- sync with loader-branch Modified Paths: -------------- src/Makefile.am src/Makefile.in Added Paths: ----------- src/application.h src/avatar.h src/camera.h src/client/ src/client/Makefile.am src/client/Makefile.in src/client/network.cpp src/client/network.h src/common/ src/common/Makefile.am src/common/Makefile.in src/common/company.cpp src/common/company.h src/common/company_storage.cpp src/common/company_storage.h src/common/components/ src/common/components/Makefile.am src/common/components/Makefile.in src/common/components/component.cpp src/common/components/component.h src/common/equipment/ src/common/equipment/Makefile.am src/common/equipment/Makefile.in src/common/equipment/ecms/ src/common/equipment/ecms/Makefile.am src/common/equipment/ecms/Makefile.in src/common/equipment/ecms/ecm.cpp src/common/equipment/ecms/ecm.h src/common/equipment/engines/ src/common/equipment/engines/Makefile.am src/common/equipment/engines/Makefile.in src/common/equipment/engines/engine.cpp src/common/equipment/engines/engine.h src/common/equipment/engines/money.cpp src/common/equipment/engines/money.h src/common/equipment/equipment.cpp src/common/equipment/equipment.h src/common/exception.cpp src/common/exception.h src/common/faction.cpp src/common/faction.h src/common/faction_storage.cpp src/common/faction_storage.h src/common/loader.cpp src/common/loader.h src/common/objects/ src/common/objects/Makefile.am src/common/objects/Makefile.in src/common/objects/movable_object.cpp src/common/objects/movable_object.h src/common/objects/object.cpp src/common/objects/object.h src/common/objects/ships/ src/common/objects/ships/Makefile.am src/common/objects/ships/Makefile.in src/common/objects/ships/ship.cpp src/common/objects/ships/ship.h src/constants.h src/framelistener.h src/gamestate.h src/input.h src/keyboard.h src/mouse.h src/movable_object.h src/object.h src/opengate_client.cpp src/opengate_server.cpp src/server/ src/server/Makefile.am src/server/Makefile.in src/server/network.cpp src/server/network.h src/xml_parser.h Property Changed: ---------------- src/Makefile.am src/Makefile.in src/application.cpp src/avatar.cpp src/camera.cpp src/framelistener.cpp src/gamestate.cpp src/input.cpp src/keyboard.cpp src/main.cpp src/mouse.cpp src/movable_object.cpp src/object.cpp src/xml_parser.cpp Modified: src/Makefile.am =================================================================== --- src/Makefile.am 2006-07-16 17:55:56 UTC (rev 83) +++ src/Makefile.am 2006-07-16 18:35:45 UTC (rev 84) @@ -1,36 +1,18 @@ -## Process this file with automake to produce Makefile.in +bin_PROGRAMS = opengate-server opengate-client -## Created by Anjuta - will be overwritten -## If you don't want it to overwrite it, -## Please disable it in the Anjuta project configuration -INCLUDES =\ - -I/usr/include/OGRE -I/usr/include/CEGUI -I../include +# set the include path found by configure +INCLUDES= $(all_includes) -AM_CXXFLAGS =\ - -g -DEXT_HASH\ - -Wall\ - -g +# the library search path. -bin_PROGRAMS = opengate -opengate_SOURCES = \ - main.cpp\ - application.cpp\ - framelistener.cpp\ - avatar.cpp\ - keyboard.cpp\ - mouse.cpp\ - camera.cpp\ - gamestate.cpp\ - movable_object.cpp\ - input.cpp\ - xml_parser.cpp\ - object.cpp +SUBDIRS = common client server +opengate_server_SOURCES = opengate_server.cpp +opengate_server_LDADD = $(top_builddir)/src/server/libopengate-server.la \ + $(top_builddir)/src/common/libopengate-common.la -opengate_LDFLAGS = \ - -L/usr/local/lib +opengate_client_SOURCES = opengate_client.cpp +opengate_client_LDADD = $(top_builddir)/src/client/libopengate-client.la\ + $(top_builddir)/src/common/libopengate-common.la -opengate_LDADD = \ - -lOgreMain -lCEGUIBase -lCEGUIOgreRenderer - Property changes on: src/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Modified: src/Makefile.in =================================================================== --- src/Makefile.in 2006-07-16 17:55:56 UTC (rev 83) +++ src/Makefile.in 2006-07-16 18:35:45 UTC (rev 84) @@ -36,12 +36,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = opengate$(EXEEXT) +bin_PROGRAMS = opengate-server$(EXEEXT) opengate-client$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -50,13 +49,16 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_opengate_OBJECTS = main.$(OBJEXT) application.$(OBJEXT) \ - framelistener.$(OBJEXT) avatar.$(OBJEXT) keyboard.$(OBJEXT) \ - mouse.$(OBJEXT) camera.$(OBJEXT) gamestate.$(OBJEXT) \ - movable_object.$(OBJEXT) input.$(OBJEXT) xml_parser.$(OBJEXT) \ - object.$(OBJEXT) -opengate_OBJECTS = $(am_opengate_OBJECTS) -opengate_DEPENDENCIES = +am_opengate_client_OBJECTS = opengate_client.$(OBJEXT) +opengate_client_OBJECTS = $(am_opengate_client_OBJECTS) +opengate_client_DEPENDENCIES = \ + $(top_builddir)/src/client/libopengate-client.la \ + $(top_builddir)/src/common/libopengate-common.la +am_opengate_server_OBJECTS = opengate_server.$(OBJEXT) +opengate_server_OBJECTS = $(am_opengate_server_OBJECTS) +opengate_server_DEPENDENCIES = \ + $(top_builddir)/src/server/libopengate-server.la \ + $(top_builddir)/src/common/libopengate-common.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -68,10 +70,17 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(opengate_SOURCES) -DIST_SOURCES = $(opengate_SOURCES) +SOURCES = $(opengate_client_SOURCES) $(opengate_server_SOURCES) +DIST_SOURCES = $(opengate_client_SOURCES) $(opengate_server_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -113,24 +122,11 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ -NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ -NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ -NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@ -NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@ -PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@ -PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@ -PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@ PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ @@ -187,39 +183,25 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = \ - -I/usr/include/OGRE -I/usr/include/CEGUI -I../include -AM_CXXFLAGS = \ - -g -DEXT_HASH\ - -Wall\ - -g +# set the include path found by configure +INCLUDES = $(all_includes) -opengate_SOURCES = \ - main.cpp\ - application.cpp\ - framelistener.cpp\ - avatar.cpp\ - keyboard.cpp\ - mouse.cpp\ - camera.cpp\ - gamestate.cpp\ - movable_object.cpp\ - input.cpp\ - xml_parser.cpp\ - object.cpp +# the library search path. +SUBDIRS = common client server +opengate_server_SOURCES = opengate_server.cpp +opengate_server_LDADD = $(top_builddir)/src/server/libopengate-server.la \ + $(top_builddir)/src/common/libopengate-common.la -opengate_LDFLAGS = \ - -L/usr/local/lib +opengate_client_SOURCES = opengate_client.cpp +opengate_client_LDADD = $(top_builddir)/src/client/libopengate-client.la\ + $(top_builddir)/src/common/libopengate-common.la -opengate_LDADD = \ - -lOgreMain -lCEGUIBase -lCEGUIOgreRenderer +all: all-recursive -all: all-am - .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -244,9 +226,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -276,9 +258,12 @@ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -opengate$(EXEEXT): $(opengate_OBJECTS) $(opengate_DEPENDENCIES) - @rm -f opengate$(EXEEXT) - $(CXXLINK) $(opengate_LDFLAGS) $(opengate_OBJECTS) $(opengate_LDADD) $(LIBS) +opengate-client$(EXEEXT): $(opengate_client_OBJECTS) $(opengate_client_DEPENDENCIES) + @rm -f opengate-client$(EXEEXT) + $(CXXLINK) $(opengate_client_LDFLAGS) $(opengate_client_OBJECTS) $(opengate_client_LDADD) $(LIBS) +opengate-server$(EXEEXT): $(opengate_server_OBJECTS) $(opengate_server_DEPENDENCIES) + @rm -f opengate-server$(EXEEXT) + $(CXXLINK) $(opengate_server_LDFLAGS) $(opengate_server_OBJECTS) $(opengate_server_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -286,18 +271,8 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/application.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avatar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framelistener.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamestate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mouse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/movable_object.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_parser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opengate_client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opengate_server.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -330,6 +305,77 @@ -rm -f libtool uninstall-info-am: +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -340,10 +386,23 @@ mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -356,7 +415,7 @@ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -405,22 +464,38 @@ || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am +check: check-recursive all-am: Makefile $(PROGRAMS) -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -436,23 +511,23 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: @@ -460,42 +535,47 @@ install-exec-am: install-binPROGRAMS -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-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 mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-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 installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Property changes on: src/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Property changes on: src/application.cpp ___________________________________________________________________ Name: svn:eolstyle + native Copied: src/application.h (from rev 79, include/application.h) =================================================================== --- src/application.h (rev 0) +++ src/application.h 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,141 @@ +/*************************************************************************** + * application.h + * + * Sat Apr 8 10:26:58 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 _APPLICATION_H +#define _APPLICATION_H + +#include <OgreConfigFile.h> +#include <OgreRoot.h> +#include <OgreCamera.h> +#include <OgreRenderWindow.h> +#include "framelistener.h" +#include "avatar.h" +#include "camera.h" +#include "gamestate.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +/*! + * + */ +class OpengateApp { +public: + + /*! \brief This default constructor instantiates an Application + * + * The default constructor is used to instantiates the Application. The + * Application can be considered as the object, that holds references to + * everything within the game. So here you can find the Scene, the Viewport + * to the scene, the camera(s) and the FrameListener. + */ + OpengateApp(); + + /*! \brief This destructor closes the application + * + * When this destructor is called, the game is done and will quit. + */ + ~OpengateApp(); + + /*! \brief The main "loop" of the game + * + * This method is running while the game is running. When this method is + * done, we are completely done. + */ + void go(); + +protected: + + CEGUI::OgreCEGUIRenderer* mGUIRenderer; + CEGUI::System* mGUISystem; + CEGUI::Window* mEditorGuiSheet; + Gamestate* mGamestate; + + Avatar* mAvatar; + Ogre::SceneNode* mAvatarNode; + + Ogre::Root* mRoot; + Camera* mCamera; + Ogre::SceneManager* mSceneMgr; + + OpengateListener* mFrameListener; + Ogre::RenderWindow* mWindow; + + Ogre::SceneManager* mGuiSceneMgr; + + /** Sets up the application - returns false if the user chooses to abandon configuration. */ + bool setup(void); + + /** Configures the application - returns false if the user chooses to abandon configuration. */ + bool configure(void); + + void chooseSceneManager(void); + + /*! \brief Creates a camera for the scene + * + * This method creates the necessary cameras for the game. Since we have a + * first person camera and a third person camera, we will use 2 cameras to + * do that. It would be possible to do that with one camera, but the concept + * in OGRE3D is to use 2 cameras. + */ + void createCamera(); + + /*! \brief Define what is in the scene + * + * This method created an initial scene. So here some common things will be + * loaded, like the space background, or jumpgates (which can be found in + * every sector) etc. + */ + void createScene(void); + + void destroyScene(void); + + /*! \biref Create the frame listener for the game + * + * This method creates the framelistener necessary to render a scene + */ + void createFrameListener(void); + + /// Method which will define the source of resources (other than current folder) + void setupResources(void); + + /// Optional override method where you can create resource listeners (e.g. for loading screens) + void createResourceListener(void); + + /// Optional override method where you can perform resource group loading + /// Must at least do ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); + void loadResources(void); + + void setupEventHandlers(void); + + bool handleQuit(const CEGUI::EventArgs& e); +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _APPLICATION_H */ Property changes on: src/application.h ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Property changes on: src/avatar.cpp ___________________________________________________________________ Name: svn:eolstyle + native Copied: src/avatar.h (from rev 79, include/avatar.h) =================================================================== --- src/avatar.h (rev 0) +++ src/avatar.h 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,106 @@ +/*************************************************************************** + * avatar.h + * + * Sun Apr 9 14:58:04 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 _AVATAR_H +#define _AVATAR_H + +#include <OgreSceneNode.h> +#include "movable_object.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +/*! \brief Class for the players avatar (the ship flying through space) + * \author Christoph Brill + * + * This class defines the players avatar. It is not only the graphical + * representation but also the technical. So it will contain ship-specific stuff, + * any maybe also weaponspecific, but that will follow later + */ +class Avatar : public MovableObject { +public: + /*! \brief Creates the avatar (not only the graphical representation, the + * real one) + */ + Avatar(Ogre::SceneNode* node); + + /*! \brief Destroys the avatar + */ + ~Avatar(); + + /*! \brief Moves the avatar + * + * This method moves the avatar in a given direction with a given scale. If + * "mMoveEndOfFrame" is true, it will only save the movement operation and + * perform the movement at the end of the frame (when performMove() is + * called). + * + * \param direction The direction the avatar is moving (i.e. Avatar::LEFT) + * \param scale The distance the avatar is moving (based on the time elapsed + * since the last frame + * \return Returns false, if an unkown direction was given + */ + virtual bool move(const int direction, float scale); + + /*! \brief Rotates the avatar + * + * This method rotates the avatar in a given direction with a given scale. + * If "mMoveEndOfFrame" is true, it will only save the rotation operation + * and perform the movement at the end of the frame (when performMove() is + * called). + * + * \param direction The direction the avatar is rotating (i.e. + * Avatar::YAW_LEFT) + * \param scale The degree the avatar is direction (based on the time + * elapsed since the last frame) + * \return Returns false, if an unkown rotation was given + */ + virtual bool rotate(int direction, Ogre::Degree scale); + + /*! \brief Performs movement at the end of the frame + * + * This method is called at the and of the frame to perform stored movement + * from the methods rotate() and move(). This movement is only stored if + * mMoveEndOfFrame is true, so otherwise nothing will happen in this method + */ + virtual void performMove() {}; + +private: + /*! Handle to the node the avatar is attached to */ + Ogre::SceneNode* mNode; + /*! Value that the players avatar can pitch in one frame */ + Ogre::Radian pitch; + /*! Value that the players avatar can yaw in one frame */ + Ogre::Radian yaw; + /*! Value that the players avatar can roll in one frame */ + Ogre::Radian roll; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _AVATAR_H */ Property changes on: src/avatar.h ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Property changes on: src/camera.cpp ___________________________________________________________________ Name: svn:eolstyle + native Copied: src/camera.h (from rev 79, include/camera.h) =================================================================== --- src/camera.h (rev 0) +++ src/camera.h 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,127 @@ +/*************************************************************************** + * camera.h + * + * Sat Apr 15 17:51:35 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 _CAMERA_H +#define _CAMERA_H + +#include <OgreMath.h> +#include <OgreSceneManager.h> +#include <OgreCamera.h> +#include <OgreVector3.h> +#include <OgreRenderWindow.h> +#include "movable_object.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +class Camera : public MovableObject { +public: + /*! \brief creates a new camera + * + * This method creates a new camera by invoking createCamera() and + * createViewports(). + * \param sceneManager The handle to the scenemanager of the game (used in + * createCamera()). + * \param window The handle to the window of the game (used in + * createViewports()). + * \param avatarNode The handle to the scenenode of the players avatar (used + * in createCamera()). + * \param moveEndOfFrame If true, the movement will be done at once at the + * end of the frame. + */ + Camera(Ogre::SceneManager* sceneManager, Ogre::RenderWindow* window, Ogre::SceneNode* avatarNode, bool moveEndOfFrame); + + /*! \brief Moves the camera + * + * This method moves the camera in a given direction with a given scale. If + * "mMoveEndOfFrame" is true, it will only save the movement operation and + * perform the movement at the end of the frame (when performMove() is + * called). + * + * \param direction The direction the camera is moving (i.e. Camera::LEFT). + * \param scale The distance the camera is moving (based on the time elapsed + * since the last frame. + * \return Returns false, if an unkown direction was given. + */ + virtual bool move(const int direction, float scale); + + /*! \brief Rotates the camera + * + * This method rotates the camera in a given direction with a given scale. + * + * \param direction The direction the camera is rotating (i.e. + * Camera::YAW_LEFT). + * \param scale The degree the camera is direction (based on the time + * elapsed since the last frame). + * \return Returns false, if an unkown rotation was given. + */ + virtual bool rotate(int direction, Ogre::Degree scale); + + /*! \brief Performs movement at the end of the frame + * + * This method is called at the and of the frame to perform stored movement + * from the methods rotate() and move(). This movement is only stored if + * mMoveEndOfFrame is true, so otherwise nothing will happen in this method + */ + virtual void performMove(); + +private: + /*! Handle to the players camera so we can move it on mouse or keyboard + * input + */ + Ogre::Camera* mCamera; + + /*! Value to rotate the camera by X (=yaw) + */ + Ogre::Radian mRotX; + + /*! Value to rotate the camera by Y (=pitch) + */ + Ogre::Radian mRotY; + + /*! \brief Creates a camera for the scene + * + * This method creates the necessary cameras for the game. Since we have a + * first person camera and a third person camera, we will use 2 cameras to + * do that. It would be possible to do that with one camera, but the concept + * in OGRE3D is to use 2 cameras. + */ + void createCamera(Ogre::SceneManager* sceneManager, Ogre::SceneNode* avatarNode); + + /*! \brief Creates a viewport with the given cameras for the scene + * + * This method creates the viewport to the scene. This is what the user will + * actually see when playing the game. The viewport uses the given cameras + * to get its picture. + */ + void createViewports(Ogre::RenderWindow* window); +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _CAMERA_H */ Property changes on: src/camera.h ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: src/client/Makefile.am =================================================================== --- src/client/Makefile.am (rev 0) +++ src/client/Makefile.am 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,5 @@ +INCLUDES = $(all_includes) +METASOURCES = AUTO +noinst_LTLIBRARIES = libopengate-client.la +noinst_HEADERS = network.h +libopengate_client_la_SOURCES = network.cpp Property changes on: src/client/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/client/Makefile.in =================================================================== --- src/client/Makefile.in (rev 0) +++ src/client/Makefile.in 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,429 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/client +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libopengate_client_la_LIBADD = +am_libopengate_client_la_OBJECTS = network.lo +libopengate_client_la_OBJECTS = $(am_libopengate_client_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libopengate_client_la_SOURCES) +DIST_SOURCES = $(libopengate_client_la_SOURCES) +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = $(all_includes) +METASOURCES = AUTO +noinst_LTLIBRARIES = libopengate-client.la +noinst_HEADERS = network.h +libopengate_client_la_SOURCES = network.cpp +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/client/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/client/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libopengate-client.la: $(libopengate_client_la_OBJECTS) $(libopengate_client_la_DEPENDENCIES) + $(CXXLINK) $(libopengate_client_la_LDFLAGS) $(libopengate_client_la_OBJECTS) $(libopengate_client_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +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 +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am 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 mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + 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: Property changes on: src/client/Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/client/network.cpp =================================================================== --- src/client/network.cpp (rev 0) +++ src/client/network.cpp 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,59 @@ +/*************************************************************************** + * network.cpp + * + * Sat Jul 16 10:52:52 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 "network.h" +#include "../common/exception.h" +#include <SDL/SDL.h> +#include <iostream> + +Network::Network() { + if (SDLNet_Init () < 0) { + printf ("ERR Net: %s\n", SDLNet_GetError ()); + exit (-1); + } + client_udp_port = 37601; +} + +void Network::open_connection(char* hostname, Uint16 port) { + if (SDLNet_ResolveHost (server_ip, hostname, port) < 0) { + printf ("SDLNet_ResolveHost: %s\n", SDLNet_GetError ()); + SDLNet_Quit(); + exit (-1); + } + client = SDLNet_TCP_Open (server_ip); + if (client == NULL) { + printf ("ERR TCP_Open: %s\n", SDLNet_GetError ()); + SDLNet_Quit (); + exit (-1); + } + client_udp = SDLNet_UDP_Open (client_udp_port); + if (client_udp == NULL) { + printf ("ERR UDP_Open: %s\n", SDLNet_GetError ()); + SDLNet_Quit (); + exit (-1); + } +} + +Network::~Network() { +} Property changes on: src/client/network.cpp ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Added: src/client/network.h =================================================================== --- src/client/network.h (rev 0) +++ src/client/network.h 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,43 @@ +/*************************************************************************** + * network.h + * + * Sat Jul 16 10:52:52 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 _OPENGATE_NETWORK_ +#define _OPENGATE_NETWORK_ + +#include <SDL/SDL_net.h> + +class Network { +public: + Network(); + ~Network(); + void open_connection(char* hostname, Uint16 port); +private: + IPaddress* server_ip; + TCPsocket client; + UDPsocket client_udp; + Uint16 client_udp_port; + +}; + +#endif Property changes on: src/client/network.h ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: src/common/Makefile.am =================================================================== --- src/common/Makefile.am (rev 0) +++ src/common/Makefile.am 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,11 @@ +INCLUDES = $(all_includes) +METASOURCES = AUTO +noinst_LTLIBRARIES = libopengate-common.la +libopengate_common_la_SOURCES = loader.cpp exception.cpp company.cpp \ + faction.cpp faction_storage.cpp company_storage.cpp +noinst_HEADERS = loader.h exception.h company.h faction.h faction_storage.h \ + company_storage.h +SUBDIRS = objects equipment components +libopengate_common_la_LIBADD = \ + $(top_builddir)/src/common/objects/libopengate-objects.la $(top_builddir)/src/common/equipment/libopengate-equipment.la \ + $(top_builddir)/src/common/components/libopengate-components.la Property changes on: src/common/Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/common/Makefile.in =================================================================== --- src/common/Makefile.in (rev 0) +++ src/common/Makefile.in 2006-07-16 18:35:45 UTC (rev 84) @@ -0,0 +1,558 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/common +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libopengate_common_la_DEPENDENCIES = \ + $(top_builddir)/src/common/objects/libopengate-objects.la \ + $(top_builddir)/src/common/equipment/libopengate-equipment.la \ + $(top_builddir)/src/common/components/libopengate-components.la +am_libopengate_common_la_OBJECTS = loader.lo exception.lo company.lo \ + faction.lo faction_storage.lo company_storage.lo +libopengate_common_la_OBJECTS = $(am_libopengate_common_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libopengate_common_la_SOURCES) +DIST_SOURCES = $(libopengate_common_la_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +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@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = $(all_includes) +METASOURCES = AUTO +noinst_LTLIBRARIES = libopengate-common.la +libopengate_common_la_SOURCES = loader.cpp exception.cpp company.cpp \ + faction.cpp faction_storage.cpp company_storage.cpp + +noinst_HEADERS = loader.h exception.h company.h faction.h faction_storage.h \ + company_storage.h + +SUBDIRS = objects equipment components +libopengate_common_la_LIBADD = \ + $(top_builddir)/src/common/objects/libopengate-objects.la $(top_builddir)/src/common/equipment/libopengate-equipment.la \ + $(top_builddir)/src/common/components/libopengate-components.la + +all: all-recursive + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(... [truncated message content] |
From: <eg...@us...> - 2006-07-16 17:56:34
|
Revision: 83 Author: egore Date: 2006-07-16 10:55:56 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=83&view=rev Log Message: ----------- misc stuff from filesystem Modified Paths: -------------- data/Engines/money.xml Added Paths: ----------- data/Materials/skybox.material include/object.h include/xml_parser.h po/Makefile po/Makefile.in po/POTFILES po/opengate.pot src/object.cpp src/xml_parser.cpp Modified: data/Engines/money.xml =================================================================== (Binary files differ) Added: data/Materials/skybox.material =================================================================== --- data/Materials/skybox.material (rev 0) +++ data/Materials/skybox.material 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,17 @@ +material Examples/SpaceSkyBox +{ + technique + { + pass + { + lighting off + depth_write off + + texture_unit + { + cubic_texture stevecube.jpg separateUV + tex_address_mode clamp + } + } + } +} Property changes on: data/Materials/skybox.material ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: include/object.h =================================================================== --- include/object.h (rev 0) +++ include/object.h 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,45 @@ +/*************************************************************************** + * object.h + * + * Thu May 25 11:42:32 2006 + * Copyright 2006 User + * Email + ****************************************************************************/ + +/* + * 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 _OBJECT_H +#define _OBJECT_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +class Object { +public: + Object(); + virtual ~Object(); +protected: + int energy; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _OBJECT_H */ Property changes on: include/object.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: include/xml_parser.h =================================================================== --- include/xml_parser.h (rev 0) +++ include/xml_parser.h 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,48 @@ +/*************************************************************************** + * xml_parser.h + * + * Sun Apr 23 10:34:26 2006 + * Copyright 2006 User + * Email + ****************************************************************************/ + +/* + * 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 _XML_PARSER_H +#define _XML_PARSER_H + +#include <string.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +class XmlParser { +public: + XmlParser(); + ~XmlParser(); + + int getInt(); + +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _XML_PARSER_H */ Property changes on: include/xml_parser.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: po/Makefile =================================================================== --- po/Makefile (rev 0) +++ po/Makefile 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,279 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...> +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor <ot...@re...> to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman <ja...@xi...> to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + +GETTEXT_PACKAGE = opengate +PACKAGE = opengate +VERSION = 0.1 + +SHELL = /bin/sh + + +srcdir = . +top_srcdir = .. + + +prefix = /usr/local +exec_prefix = ${prefix} +datadir = ${prefix}/share +libdir = ${exec_prefix}/lib +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po +subdir = po + +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs + +CC = gcc +GENCAT = @GENCAT@ +GMSGFMT = /usr/bin/gmsgfmt +MSGFMT = /usr/bin/msgfmt +XGETTEXT = /usr/bin/xgettext +MSGMERGE = msgmerge + +DEFS = -DHAVE_CONFIG_H +CFLAGS = -g -O2 +CPPFLAGS = + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = +POFILES = +GMOFILES = +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ +$(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + ../src/main.cpp \ + ../src/application.cpp \ + ../src/framelistener.cpp \ + ../src/avatar.cpp \ + ../src/keyboard.cpp \ + ../src/mouse.cpp \ + ../src/camera.cpp \ + ../src/gamestate.cpp \ + ../src/movable_object.cpp \ + ../src/input.cpp \ + +CATALOGS = +CATOBJEXT = .gmo +INSTOBJEXT = .mo + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -c -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + +all: all-yes + +all-yes: $(CATALOGS) +all-no: + +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ + --flag=g_error_new:3:c-format \ + --flag=g_set_error:4:c-format \ + --flag=g_markup_printf_escaped:1:c-format \ + --flag=g_log:3:c-format \ + --flag=g_print:1:c-format \ + --flag=g_printerr:1:c-format \ + --flag=g_printf:1:c-format \ + --flag=g_fprintf:2:c-format \ + --flag=g_sprintf:2:c-format \ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) + +install: install-exec install-data +install-exec: +install-data: install-data-yes +install-data-no: all +install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "glib"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + fi + +check: all + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +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 $(GMOFILES) + +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).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; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + +# 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: Property changes on: po/Makefile ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: po/Makefile.in =================================================================== --- po/Makefile.in (rev 0) +++ po/Makefile.in 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,269 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...> +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor <ot...@re...> to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman <ja...@xi...> to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + +GETTEXT_PACKAGE = opengate +PACKAGE = opengate +VERSION = 0.1 + +SHELL = /bin/sh + + +srcdir = . +top_srcdir = .. + + +prefix = /usr/local +exec_prefix = ${prefix} +datadir = ${prefix}/share +libdir = ${exec_prefix}/lib +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po +subdir = po + +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs + +CC = gcc +GENCAT = @GENCAT@ +GMSGFMT = /usr/bin/gmsgfmt +MSGFMT = /usr/bin/msgfmt +XGETTEXT = /usr/bin/xgettext +MSGMERGE = msgmerge + +DEFS = -DHAVE_CONFIG_H +CFLAGS = -g -O2 +CPPFLAGS = + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = +POFILES = +GMOFILES = +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ +$(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + +CATALOGS = +CATOBJEXT = .gmo +INSTOBJEXT = .mo + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -c -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + +all: all-yes + +all-yes: $(CATALOGS) +all-no: + +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ + --flag=g_error_new:3:c-format \ + --flag=g_set_error:4:c-format \ + --flag=g_markup_printf_escaped:1:c-format \ + --flag=g_log:3:c-format \ + --flag=g_print:1:c-format \ + --flag=g_printerr:1:c-format \ + --flag=g_printf:1:c-format \ + --flag=g_fprintf:2:c-format \ + --flag=g_sprintf:2:c-format \ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) + +install: install-exec install-data +install-exec: +install-data: install-data-yes +install-data-no: all +install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "glib"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + fi + +check: all + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +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 $(GMOFILES) + +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).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; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + +# 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: Property changes on: po/Makefile.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: po/POTFILES =================================================================== --- po/POTFILES (rev 0) +++ po/POTFILES 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,10 @@ + ../src/main.cpp \ + ../src/application.cpp \ + ../src/framelistener.cpp \ + ../src/avatar.cpp \ + ../src/keyboard.cpp \ + ../src/mouse.cpp \ + ../src/camera.cpp \ + ../src/gamestate.cpp \ + ../src/movable_object.cpp \ + ../src/input.cpp \ Property changes on: po/POTFILES ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: po/opengate.pot =================================================================== Property changes on: po/opengate.pot ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/object.cpp =================================================================== --- src/object.cpp (rev 0) +++ src/object.cpp 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,33 @@ +/*************************************************************************** + * object.cpp + * + * Thu May 25 11:45:21 2006 + * Copyright 2006 User + * Email + ****************************************************************************/ + +/* + * 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 "object.h" + +Object::Object() { + +} + +Object::~Object() { + +} Property changes on: src/object.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Added: src/xml_parser.cpp =================================================================== --- src/xml_parser.cpp (rev 0) +++ src/xml_parser.cpp 2006-07-16 17:55:56 UTC (rev 83) @@ -0,0 +1,37 @@ +/*************************************************************************** + * xml_parser.cpp + * + * Sun Apr 23 10:38:02 2006 + * Copyright 2006 User + * Email + ****************************************************************************/ + +/* + * 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 "xml_parser.h" + +XmlParser::XmlParser() { + +} + +XmlParser::~XmlParser() { + +} + +int XmlParser::getInt() { + return -1; +} Property changes on: src/xml_parser.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:26:56
|
Revision: 82 Author: egore Date: 2006-07-16 09:26:24 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=82&view=rev Log Message: ----------- misc stuff from filesystem Added Paths: ----------- data/Engines/ data/Engines/money.xml data/ogre_menu.zip data/opengate.dtd Added: data/Engines/money.xml =================================================================== (Binary files differ) Property changes on: data/Engines/money.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/ogre_menu.zip =================================================================== (Binary files differ) Property changes on: data/ogre_menu.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/opengate.dtd =================================================================== (Binary files differ) Property changes on: data/opengate.dtd ___________________________________________________________________ Name: svn:mime-type + application/xml-dtd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:24:20
|
Revision: 81 Author: egore Date: 2006-07-16 09:24:13 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=81&view=rev Log Message: ----------- new dtd schema Modified Paths: -------------- data/ECM/ghost.xml data/Ships/Conflux/C-0/conflux_c0.xml Modified: data/ECM/ghost.xml =================================================================== --- data/ECM/ghost.xml 2006-07-16 16:21:25 UTC (rev 80) +++ data/ECM/ghost.xml 2006-07-16 16:24:13 UTC (rev 81) @@ -1,15 +1,21 @@ <?xml version="1.0"?> +<!DOCTYPE equipment SYSTEM "opengate.dtd"> -<equipment type="ECM> - <production-center>Amananth</production-center> +<equipment type="ECM"> + <!-- Naming --> <name>Ghost</name> <class>Radar Jammer</class> + <faction>Solrain</faction> + <description>TODO</description> + <manufacturer>Amananth</manufacturer> + <production-center>Amananth</production-center> <techlevel>8</techlevel> - <sensorlevel>3</sensorlevel> <size>1</size> <mass>30</mass> + + <sensorlevel>3</sensorlevel> <power>970.0k</power> <required-component>Antimony</required-component> @@ -17,4 +23,4 @@ <required-component>CPU</required-component> <required-component>Magnetics</required-component> -</equiment> \ No newline at end of file +</equipment> Modified: data/Ships/Conflux/C-0/conflux_c0.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:21:35
|
Revision: 80 Author: egore Date: 2006-07-16 09:21:25 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=80&view=rev Log Message: ----------- sync with filesystem Modified Paths: -------------- data/Makefile.am data/Makefile.in Modified: data/Makefile.am =================================================================== --- data/Makefile.am 2006-07-16 16:20:30 UTC (rev 79) +++ data/Makefile.am 2006-07-16 16:21:25 UTC (rev 80) @@ -9,12 +9,11 @@ opengate_data_DATA = \ Ships/Octavius/Apteryx/octavius_apteryx.mesh\ Ships/Quantar/Storm/quantar_storm.mesh\ - Menus/mainmenu.scheme\ - Materials/common.material\ Materials/octavius_apteryx_auv.material\ Materials/octavius_apteryx_auv.png\ Materials/quantar_storm_auv.material\ Materials/quantar_storm_auv.png\ - Materials/skybox.zip + Materials/skybox.zip\ + Materials/skybox.material EXTRA_DIST = $(opengate_data_DATA) Modified: data/Makefile.in =================================================================== --- data/Makefile.in 2006-07-16 16:20:30 UTC (rev 79) +++ data/Makefile.in 2006-07-16 16:21:25 UTC (rev 80) @@ -67,8 +67,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -79,7 +77,6 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -90,15 +87,11 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -109,8 +102,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ @@ -129,23 +120,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,23 +144,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -187,13 +176,12 @@ opengate_data_DATA = \ Ships/Octavius/Apteryx/octavius_apteryx.mesh\ Ships/Quantar/Storm/quantar_storm.mesh\ - Menus/mainmenu.scheme\ - Materials/common.material\ Materials/octavius_apteryx_auv.material\ Materials/octavius_apteryx_auv.png\ Materials/quantar_storm_auv.material\ Materials/quantar_storm_auv.png\ - Materials/skybox.zip + Materials/skybox.zip\ + Materials/skybox.material EXTRA_DIST = $(opengate_data_DATA) all: all-am @@ -263,7 +251,7 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/Materials $(distdir)/Menus $(distdir)/Ships/Octavius/Apteryx $(distdir)/Ships/Quantar/Storm + $(mkdir_p) $(distdir)/Materials $(distdir)/Ships/Octavius/Apteryx $(distdir)/Ships/Quantar/Storm @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:20:48
|
Revision: 79 Author: egore Date: 2006-07-16 09:20:30 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=79&view=rev Log Message: ----------- synchronize headers with sourcefiles Modified Paths: -------------- include/Makefile.am include/Makefile.in include/application.h include/avatar.h include/camera.h include/framelistener.h include/gamestate.h include/keyboard.h include/mouse.h include/movable_object.h Added Paths: ----------- include/input.h Modified: include/Makefile.am =================================================================== --- include/Makefile.am 2006-07-16 16:18:51 UTC (rev 78) +++ include/Makefile.am 2006-07-16 16:20:30 UTC (rev 79) @@ -15,6 +15,9 @@ mouse.h\ camera.h\ gamestate.h\ - movable_object.h + movable_object.h\ + input.h\ + xml_parser.h\ + object.h EXTRA_DIST = $(opengate_include_DATA) Modified: include/Makefile.in =================================================================== --- include/Makefile.in 2006-07-16 16:18:51 UTC (rev 78) +++ include/Makefile.in 2006-07-16 16:20:30 UTC (rev 79) @@ -67,8 +67,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -79,7 +77,6 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -90,15 +87,11 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -109,8 +102,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ @@ -129,23 +120,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,23 +144,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -193,7 +182,10 @@ mouse.h\ camera.h\ gamestate.h\ - movable_object.h + movable_object.h\ + input.h\ + xml_parser.h\ + object.h EXTRA_DIST = $(opengate_include_DATA) all: all-am Modified: include/application.h =================================================================== --- include/application.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/application.h 2006-07-16 16:20:30 UTC (rev 79) @@ -32,6 +32,7 @@ #include "framelistener.h" #include "avatar.h" #include "camera.h" +#include "gamestate.h" #ifdef __cplusplus extern "C" @@ -57,15 +58,21 @@ * * When this destructor is called, the game is done and will quit. */ - virtual ~OpengateApp(); + ~OpengateApp(); - virtual void go(void); + /*! \brief The main "loop" of the game + * + * This method is running while the game is running. When this method is + * done, we are completely done. + */ + void go(); protected: CEGUI::OgreCEGUIRenderer* mGUIRenderer; CEGUI::System* mGUISystem; CEGUI::Window* mEditorGuiSheet; + Gamestate* mGamestate; Avatar* mAvatar; Ogre::SceneNode* mAvatarNode; @@ -102,9 +109,9 @@ * loaded, like the space background, or jumpgates (which can be found in * every sector) etc. */ - virtual void createScene(void); + void createScene(void); - virtual void destroyScene(void); + void destroyScene(void); /*! \biref Create the frame listener for the game * @@ -113,14 +120,14 @@ void createFrameListener(void); /// Method which will define the source of resources (other than current folder) - virtual void setupResources(void); + void setupResources(void); /// Optional override method where you can create resource listeners (e.g. for loading screens) - virtual void createResourceListener(void); + void createResourceListener(void); /// Optional override method where you can perform resource group loading /// Must at least do ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); - virtual void loadResources(void); + void loadResources(void); void setupEventHandlers(void); Modified: include/avatar.h =================================================================== --- include/avatar.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/avatar.h 2006-07-16 16:20:30 UTC (rev 79) @@ -33,10 +33,17 @@ { #endif +/*! \brief Class for the players avatar (the ship flying through space) + * \author Christoph Brill + * + * This class defines the players avatar. It is not only the graphical + * representation but also the technical. So it will contain ship-specific stuff, + * any maybe also weaponspecific, but that will follow later + */ class Avatar : public MovableObject { public: - /*! \brief Creates the avatar (not the graphical representation, the real - * one) + /*! \brief Creates the avatar (not only the graphical representation, the + * real one) */ Avatar(Ogre::SceneNode* node); @@ -46,26 +53,41 @@ /*! \brief Moves the avatar * + * This method moves the avatar in a given direction with a given scale. If + * "mMoveEndOfFrame" is true, it will only save the movement operation and + * perform the movement at the end of the frame (when performMove() is + * called). + * * \param direction The direction the avatar is moving (i.e. Avatar::LEFT) * \param scale The distance the avatar is moving (based on the time elapsed * since the last frame - * - * This method moves the avatar in a given direction with a given scale + * \return Returns false, if an unkown direction was given */ virtual bool move(const int direction, float scale); /*! \brief Rotates the avatar * - * This method rotates the avatar in a given direction with a given scale + * This method rotates the avatar in a given direction with a given scale. + * If "mMoveEndOfFrame" is true, it will only save the rotation operation + * and perform the movement at the end of the frame (when performMove() is + * called). * * \param direction The direction the avatar is rotating (i.e. * Avatar::YAW_LEFT) * \param scale The degree the avatar is direction (based on the time * elapsed since the last frame) + * \return Returns false, if an unkown rotation was given */ virtual bool rotate(int direction, Ogre::Degree scale); + /*! \brief Performs movement at the end of the frame + * + * This method is called at the and of the frame to perform stored movement + * from the methods rotate() and move(). This movement is only stored if + * mMoveEndOfFrame is true, so otherwise nothing will happen in this method + */ virtual void performMove() {}; + private: /*! Handle to the node the avatar is attached to */ Ogre::SceneNode* mNode; Modified: include/camera.h =================================================================== --- include/camera.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/camera.h 2006-07-16 16:20:30 UTC (rev 79) @@ -39,29 +39,53 @@ class Camera : public MovableObject { public: + /*! \brief creates a new camera + * + * This method creates a new camera by invoking createCamera() and + * createViewports(). + * \param sceneManager The handle to the scenemanager of the game (used in + * createCamera()). + * \param window The handle to the window of the game (used in + * createViewports()). + * \param avatarNode The handle to the scenenode of the players avatar (used + * in createCamera()). + * \param moveEndOfFrame If true, the movement will be done at once at the + * end of the frame. + */ Camera(Ogre::SceneManager* sceneManager, Ogre::RenderWindow* window, Ogre::SceneNode* avatarNode, bool moveEndOfFrame); - /*! \brief Moves the avatar + /*! \brief Moves the camera * - * \param direction The direction the avatar is moving (i.e. Avatar::LEFT) - * \param scale The distance the avatar is moving (based on the time elapsed - * since the last frame + * This method moves the camera in a given direction with a given scale. If + * "mMoveEndOfFrame" is true, it will only save the movement operation and + * perform the movement at the end of the frame (when performMove() is + * called). * - * This method moves the avatar in a given direction with a given scale + * \param direction The direction the camera is moving (i.e. Camera::LEFT). + * \param scale The distance the camera is moving (based on the time elapsed + * since the last frame. + * \return Returns false, if an unkown direction was given. */ virtual bool move(const int direction, float scale); - /*! \brief Rotates the avatar + /*! \brief Rotates the camera * - * This method rotates the avatar in a given direction with a given scale + * This method rotates the camera in a given direction with a given scale. * - * \param direction The direction the avatar is rotating (i.e. - * Avatar::YAW_LEFT) - * \param scale The degree the avatar is direction (based on the time - * elapsed since the last frame) + * \param direction The direction the camera is rotating (i.e. + * Camera::YAW_LEFT). + * \param scale The degree the camera is direction (based on the time + * elapsed since the last frame). + * \return Returns false, if an unkown rotation was given. */ virtual bool rotate(int direction, Ogre::Degree scale); + /*! \brief Performs movement at the end of the frame + * + * This method is called at the and of the frame to perform stored movement + * from the methods rotate() and move(). This movement is only stored if + * mMoveEndOfFrame is true, so otherwise nothing will happen in this method + */ virtual void performMove(); private: Modified: include/framelistener.h =================================================================== --- include/framelistener.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/framelistener.h 2006-07-16 16:20:30 UTC (rev 79) @@ -73,7 +73,7 @@ * \param useBufferedInputMouse Flag to set if the mouse input should be * buffered or not */ - OpengateListener(Ogre::RenderWindow* win, Camera* cam, Avatar* avatar, CEGUI::Renderer* renderer); + OpengateListener(Ogre::RenderWindow* win, Camera* cam, Avatar* avatar, CEGUI::Renderer* renderer, Gamestate* gamestate); /*! \brief The destructor to free the input readers * Modified: include/gamestate.h =================================================================== --- include/gamestate.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/gamestate.h 2006-07-16 16:20:30 UTC (rev 79) @@ -30,22 +30,51 @@ { #endif +/*! \brief This class defines the gamestate + * \author Christoph Brill + * + * This class represents the current gamestate. This can be for example the + * player is in the game, the player is in the menu, the player is in the + * console, etc. All these states are defined and used here. + */ class Gamestate { public: + /*! \brief creates a gamestatehandler + * + * This creates a gamestatehandler and will default to "in game" + */ Gamestate(); + /*! \brief set the state + * + * This class sets a given state. It a user switches to menu it will be + * Gamestate::MENU for example. + * \param state the new gamestate. + * \return Returns true if the gamestate was switched, otherwise (if the + * state was unkown) it returns false. + */ bool setGamestate(int state); + /*! \brief get the current state + * + * This return the current state + * \return returns the current state + */ int getGamestate(); - + /*! Gamestate: in game */ static const int GAME = 0; + /*! Gamestate: in menu */ static const int MENU = 1; - static const int MIN = GAME; - static const int MAX = MENU; + /*! Gamestate: quitting */ + static const int QUIT = 2; private: - + /*! smallest known gamestate */ + static const int MIN = GAME; + /*! biggest known gamestate */ + static const int MAX = QUIT; + /*! active gamestate */ int mActivestate; }; Added: include/input.h =================================================================== --- include/input.h (rev 0) +++ include/input.h 2006-07-16 16:20:30 UTC (rev 79) @@ -0,0 +1,109 @@ +/*************************************************************************** + * input.h + * + * Mon Apr 17 11:32:17 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 _INPUT_H +#define _INPUT_H + +#include <OgreInput.h> +#include <OgreFrameListener.h> +#include <CEGUIRenderer.h> +#include "movable_object.h" +#include "gamestate.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +/*! \brief An abstract class for input devices + * \author Christoph Brill + * + * This class is an interface for all types of input devices (keyboard, mouse, + * joystick, gamepad, etc.). Every type of input device has to use this + * and implement its own processInput method. The idea of this class is to + * translate user input into reactions of an object (most likely the players + * avatar) in the game. + */ +class Input { +public: + /*! \brief Constructor to save the input device and the target + * + * This constructor will save the given input device and the given target + * for the input to perform movement based on the input states in the game. + * If (for example) we have a mouse as input device and the players avatar + * as target, we can rotate the players avatar based on mouse movement, or + * fire its weapons on mouseclicks + */ + Input(Ogre::InputReader* inputDevice, MovableObject* object, CEGUI::Renderer* guiRenderer, Gamestate* gamestate); + + /*! \brief Destructor + * + * This is a currently empty destructor, since we don't need to free + * anything + */ + virtual ~Input(); + + /*! \brief perform movement on input states + * + * This is the main method of this class. It will be called once in a frame + * to read the input states and react to them. If a player move the mouse + * the avatar will be moved to represent this change. + * + * \param evt the FrameEvent that happened (i.e. for getting the time since + * the last frame + * \return returns the time to the next "toggle-event" (to remove flickering + * when toggling to often) or a negative value on special states + */ + virtual Ogre::Real processInput(const Ogre::FrameEvent& evt) = 0; + + /*! Returned by processInput if the game should be quit */ + static const int GAME_QUIT = -1; + +protected: + + /*! Handle to the input device, which will give us the keyboard, mouse or + * joysick states + */ + Ogre::InputReader* mInputDevice; + + /*! Handle to the object that can be moved by the input device (i.e. the + * players avatar or a free camera) + */ + MovableObject* mTarget; + + /*! Handle to the GUI renderer when we are in the menu and want to react to + * events + */ + CEGUI::Renderer* mGuiRenderer; + + /*! Handle to the gamestate manager + */ + Gamestate* mGamestate; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _INPUT_H */ Property changes on: include/input.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Modified: include/keyboard.h =================================================================== --- include/keyboard.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/keyboard.h 2006-07-16 16:20:30 UTC (rev 79) @@ -27,30 +27,28 @@ #include <OgreInput.h> #include <OgreFrameListener.h> +#include <OgreMath.h> #include "avatar.h" -#include "camera.h" +#include "input.h" #ifdef __cplusplus extern "C" { #endif -class Keyboard { +class Keyboard : public Input { public: - Keyboard(Ogre::InputReader* mInputDevice, Avatar* avatar, Camera* camera); - bool processKeyInput(const Ogre::FrameEvent& evt); + Keyboard(Ogre::InputReader* mInputDevice, Avatar* avatar, CEGUI::Renderer* guiRenderer, Gamestate* gamestate); + virtual ~Keyboard(); + virtual Ogre::Real processInput(const Ogre::FrameEvent& evt); void setScale(float moveScale); private: - /*! Handle to the input device, which will give us keyboard states */ - Ogre::InputReader* mInputDevice; - /*! Handle to the players avatar */ - Avatar* mAvatar; + /*! Value to move the camera */ float mMoveScale; - /*! Handle to the camera chasing the avatar (will be removed once the movement - * is completed) - */ - Camera* mCamera; + + /*! */ + Ogre::Real mTimeUntilNextToggle; }; #ifdef __cplusplus Modified: include/mouse.h =================================================================== --- include/mouse.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/mouse.h 2006-07-16 16:20:30 UTC (rev 79) @@ -29,14 +29,14 @@ #include <OgreFrameListener.h> #include <OgreMath.h> #include "avatar.h" -#include "camera.h" +#include "input.h" #ifdef __cplusplus extern "C" { #endif -class Mouse { +class Mouse : public Input { public: /*! \brief Creates a new camera to chase the players avatar * @@ -46,7 +46,7 @@ * \param mInputDevice an inputdevice to get the current mousestates from * \param avatar the players avatar */ - Mouse(Ogre::InputReader* mInputDevice, Avatar* avatar); + Mouse(Ogre::InputReader* mInputDevice, Avatar* avatar, CEGUI::Renderer* guiRenderer, Gamestate* gamestate); /*! \brief This method performs actions depending on the mousestate * @@ -56,7 +56,7 @@ * \param evt the FrameEvent that happened (i.e. for getting the time since * the last frame */ - bool processMouseInput(const Ogre::FrameEvent& evt); + virtual Ogre::Real processInput(const Ogre::FrameEvent& evt); /*! \brief Sets the amount the players avatar can rotate in this frame * @@ -68,18 +68,11 @@ void setScale(Ogre::Degree rotScale); private: - - /*! Handle to the players avatar so we can perform rotation actions to it */ - Avatar* mAvatar; - /*! Handle to the input device, which will give us mouse states */ - Ogre::InputReader* mInputDevice; /*! Value to rotate the camera */ Ogre::Degree mRotScale; - Camera* mCamera; - Ogre::Vector3 mTranslateVector; - Ogre::Degree mRotX; - Ogre::Degree mRotY; + /*! */ + bool mPressed; }; #ifdef __cplusplus Modified: include/movable_object.h =================================================================== --- include/movable_object.h 2006-07-16 16:18:51 UTC (rev 78) +++ include/movable_object.h 2006-07-16 16:20:30 UTC (rev 79) @@ -26,6 +26,7 @@ #define _MOVABLE_OBJECT_H #include <OgreVector3.h> +#include "object.h" #ifdef __cplusplus extern "C" @@ -35,35 +36,56 @@ /*! \brief interface for objects that can be moved by player input * \author Christoph Brill */ -class MovableObject { +class MovableObject : public Object { public: - + /*! \brief empty destructor + */ virtual ~MovableObject() {}; /*! \brief Moves the object * - * This method moves the object in a given direction with a given scale + * This method moves the object in a given direction with a given scale. If + * "mMoveEndOfFrame" is true, it will only save the movement operation and + * perform the movement at the end of the frame (when performMove() is + * called). * - * \param direction The direction the object is moving (i.e. - * MovableObject::LEFT) + * \param direction The direction the camera is moving (i.e. + * MovableObject::LEFT). * \param scale The distance the object is moving (based on the time elapsed - * since the last frame) + * since the last frame. + * \return Returns false, if an unkown direction was given. */ virtual bool move(const int direction, float scale) = 0; /*! \brief Rotates the object * - * This method rotates the object in a given direction with a given scale + * This method rotates the object in a given direction with a given scale. + * If "mMoveEndOfFrame" is true, it will only save the rotation operation + * and perform the movement at the end of the frame (when performMove() is + * called). * * \param direction The direction the object is rotating (i.e. - * MovableObject::YAW_LEFT) + * MovableObject::YAW_LEFT). * \param scale The degree the object is direction (based on the time - * elapsed since the last frame) + * elapsed since the last frame). + * \return Returns false, if an unkown rotation was given. */ virtual bool rotate(int direction, Ogre::Degree scale) = 0; + /*! \brief resets the movement and rotation stored in the last frame. + * + * This method is called at the begin of a frame to clear stored movement + * and rotation from the last frame. This is only necessary if + * mMoveEndOfFrame is true. + */ void reset(); + /*! \brief Performs movement at the end of the frame. + * + * This method is called at the and of the frame to perform stored movement + * from the methods rotate() and move(). This movement is only stored if + * mMoveEndOfFrame is true, so otherwise nothing will happen in this method. + */ virtual void performMove() = 0; /*! Direction: left */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:18:57
|
Revision: 78 Author: egore Date: 2006-07-16 09:18:51 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=78&view=rev Log Message: ----------- update autogenerated files Modified Paths: -------------- po/POTFILES.in Modified: po/POTFILES.in =================================================================== --- po/POTFILES.in 2006-07-16 16:17:13 UTC (rev 77) +++ po/POTFILES.in 2006-07-16 16:18:51 UTC (rev 78) @@ -14,5 +14,6 @@ src/camera.cpp src/gamestate.cpp src/movable_object.cpp +src/input.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:17:20
|
Revision: 77 Author: egore Date: 2006-07-16 09:17:13 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=77&view=rev Log Message: ----------- update changelog Modified Paths: -------------- ChangeLog Modified: ChangeLog =================================================================== --- ChangeLog 2006-07-16 16:16:22 UTC (rev 76) +++ ChangeLog 2006-07-16 16:17:13 UTC (rev 77) @@ -1,3 +1,10 @@ +2006-04-17 Christoph Brill <eg...@us...> + + * src/input.cpp, include/input.h, src/keyboard.cpp, + include/keyboard.h, src/mouse.cpp, include/mouse.h, framelistener.cpp: + add generic interface for input devices (can be used in the planed + input manager) + 2006-04-16 Christoph Brill <eg...@us...> * src/movable_object.cpp, include/movable_object.h: introduce an This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:16:42
|
Revision: 76 Author: egore Date: 2006-07-16 09:16:22 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=76&view=rev Log Message: ----------- add generic interface for input devices (can be used in the planed input manager) Modified Paths: -------------- src/Makefile.am src/Makefile.in src/application.cpp src/avatar.cpp src/camera.cpp src/framelistener.cpp src/keyboard.cpp src/main.cpp src/mouse.cpp src/resources.cfg Added Paths: ----------- src/input.cpp Modified: src/Makefile.am =================================================================== --- src/Makefile.am 2006-07-16 16:12:36 UTC (rev 75) +++ src/Makefile.am 2006-07-16 16:16:22 UTC (rev 76) @@ -23,7 +23,10 @@ mouse.cpp\ camera.cpp\ gamestate.cpp\ - movable_object.cpp + movable_object.cpp\ + input.cpp\ + xml_parser.cpp\ + object.cpp opengate_LDFLAGS = \ -L/usr/local/lib Modified: src/Makefile.in =================================================================== --- src/Makefile.in 2006-07-16 16:12:36 UTC (rev 75) +++ src/Makefile.in 2006-07-16 16:16:22 UTC (rev 76) @@ -53,7 +53,8 @@ am_opengate_OBJECTS = main.$(OBJEXT) application.$(OBJEXT) \ framelistener.$(OBJEXT) avatar.$(OBJEXT) keyboard.$(OBJEXT) \ mouse.$(OBJEXT) camera.$(OBJEXT) gamestate.$(OBJEXT) \ - movable_object.$(OBJEXT) + movable_object.$(OBJEXT) input.$(OBJEXT) xml_parser.$(OBJEXT) \ + object.$(OBJEXT) opengate_OBJECTS = $(am_opengate_OBJECTS) opengate_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -81,8 +82,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -93,7 +92,6 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -104,15 +102,11 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -123,8 +117,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ @@ -143,23 +135,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -176,23 +159,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -214,7 +204,10 @@ mouse.cpp\ camera.cpp\ gamestate.cpp\ - movable_object.cpp + movable_object.cpp\ + input.cpp\ + xml_parser.cpp\ + object.cpp opengate_LDFLAGS = \ -L/usr/local/lib @@ -298,10 +291,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framelistener.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamestate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mouse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/movable_object.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_parser.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ Modified: src/application.cpp =================================================================== --- src/application.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/application.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -38,16 +38,17 @@ } OpengateApp::~OpengateApp() { - if(mEditorGuiSheet) { + if (mGamestate) { + delete mGamestate; + } + if (mEditorGuiSheet) { CEGUI::WindowManager::getSingleton().destroyWindow(mEditorGuiSheet); } - if(mGUISystem) { + if (mGUISystem) { delete mGUISystem; - mGUISystem = 0; } - if(mGUIRenderer) { + if (mGUIRenderer) { delete mGUIRenderer; - mGUIRenderer = 0; } if (mFrameListener) { delete mFrameListener; @@ -92,10 +93,11 @@ createScene(); mCamera = new Camera(mSceneMgr, mWindow, mAvatarNode, true); - + mGamestate = new Gamestate(); setupEventHandlers(); createFrameListener(); + setupEventHandlers(); return true; @@ -117,7 +119,7 @@ void OpengateApp::chooseSceneManager(void) { // Get the SceneManager, in this case a generic one - mSceneMgr = mRoot->getSceneManager(Ogre::ST_GENERIC); + mSceneMgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "ExampleSMInstance"); } void OpengateApp::createScene() { @@ -137,7 +139,7 @@ CEGUI::PushButton* quitButton = (CEGUI::PushButton*)CEGUI::WindowManager::getSingleton().createWindow("TaharezLook/Button", (CEGUI::utf8*)"Quit"); mEditorGuiSheet->addChildWindow(quitButton); - quitButton->setPosition(CEGUI::Point(1.0f, 1.0f)); + quitButton->setPosition(CEGUI::Point(0.35f, 0.45f)); quitButton->setSize(CEGUI::Size(0.3f, 0.1f)); quitButton->setText("Quit"); @@ -159,7 +161,7 @@ } void OpengateApp::createFrameListener(void) { - mFrameListener = new OpengateListener(mWindow, mCamera, mAvatar, mGUIRenderer); + mFrameListener = new OpengateListener(mWindow, mCamera, mAvatar, mGUIRenderer, mGamestate); mFrameListener->showDebugOverlay(true); mRoot->addFrameListener(mFrameListener); } Modified: src/avatar.cpp =================================================================== --- src/avatar.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/avatar.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -58,6 +58,7 @@ mTranslateVector += mNode->getOrientation () * Ogre::Vector3 (.5 * scale, 0, 0 ); break; default: + return false; break; } if (!mMoveEndOfFrame) { Modified: src/camera.cpp =================================================================== --- src/camera.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/camera.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -95,7 +95,7 @@ mTranslateVector += Ogre::Vector3 (.5 * scale, 0, 0 ); break; default: - break; + return false; } if (!mMoveEndOfFrame) { mCamera->moveRelative(mTranslateVector); Modified: src/framelistener.cpp =================================================================== --- src/framelistener.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/framelistener.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -44,7 +44,7 @@ } OpengateListener::OpengateListener( - Ogre::RenderWindow* win, Camera* cam, Avatar* avatar, CEGUI::Renderer* renderer) : mGUIRenderer(renderer){ + Ogre::RenderWindow* win, Camera* cam, Avatar* avatar, CEGUI::Renderer* renderer, Gamestate* gamestate) : mGUIRenderer(renderer){ mDebugOverlay = Ogre::OverlayManager::getSingleton().getByName("Core/DebugOverlay"); mInputTypeSwitchingOn = false; mRotateSpeed = 36; @@ -53,8 +53,8 @@ mInputDevice = Ogre::PlatformManager::getSingleton().createInputReader(); mInputDevice->initialise(win, true, true); - mKeyboard = new Keyboard(mInputDevice, avatar, cam); - mMouse = new Mouse(mInputDevice, avatar); + mKeyboard = new Keyboard(mInputDevice, avatar, renderer, gamestate); + mMouse = new Mouse(mInputDevice, avatar, renderer, gamestate); mCamera = cam; mWindow = win; @@ -146,12 +146,12 @@ } mCamera->reset(); - if (mKeyboard->processKeyInput(evt) == false) { + if (mKeyboard->processInput(evt) < 0) { // Game quit return false; } - if (mMouse->processMouseInput(evt) == false) { + if (mMouse->processInput(evt) < 0) { // Game quit return false; } Added: src/input.cpp =================================================================== --- src/input.cpp (rev 0) +++ src/input.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -0,0 +1,35 @@ +/*************************************************************************** + * input.cpp + * + * Mon Apr 17 11:36:04 2006 + * Copyright 2006 Christoph Brill + * Email <eg...@us...> + ****************************************************************************/ + +/* + * 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 "input.h" + +Input::Input(Ogre::InputReader* inputDevice, MovableObject* object, CEGUI::Renderer* guiRenderer, Gamestate* gamestate) { + this->mInputDevice = inputDevice; + this->mTarget = object; + this->mGuiRenderer = guiRenderer; + this->mGamestate = gamestate; +} + +Input::~Input() { +} Property changes on: src/input.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Modified: src/keyboard.cpp =================================================================== --- src/keyboard.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/keyboard.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -24,174 +24,138 @@ #include "keyboard.h" -Keyboard::Keyboard(Ogre::InputReader* inputDevice, Avatar* avatar, Camera* camera) { - this->mInputDevice = inputDevice; - this->mAvatar = avatar; - this->mCamera = camera; +Keyboard::Keyboard(Ogre::InputReader* inputDevice, Avatar* avatar, CEGUI::Renderer* guiRenderer, Gamestate* gamestate) + : Input (inputDevice, avatar, guiRenderer, gamestate) { + mTimeUntilNextToggle = 0; } -bool Keyboard::processKeyInput(const Ogre::FrameEvent& evt) { - Ogre::Vector3 translateVector = Ogre::Vector3::ZERO; - //Ogre::Radian rotX = 0; - //Ogre::Radian rotY = 0; - - // Move avatar forwards - if (mInputDevice->isKeyDown(Ogre::KC_U)) { - mAvatar->move(Avatar::FRONT, mMoveScale); - } +Keyboard::~Keyboard() { +} - // Move avatar backwards - if (mInputDevice->isKeyDown(Ogre::KC_N)) { - mAvatar->move(Avatar::BACK, mMoveScale); - } +Ogre::Real Keyboard::processInput(const Ogre::FrameEvent& evt) { - // Move avatar forwards - if (mInputDevice->isKeyDown(Ogre::KC_I)) { - mAvatar->move(Avatar::PITCH_DOWN, mMoveScale); - } + switch (mGamestate->getGamestate()) { + case Gamestate::GAME: + mTimeUntilNextToggle = 0; - // Move avatar backwards - if (mInputDevice->isKeyDown(Ogre::KC_K)) { - mAvatar->move(Avatar::PITCH_UP, mMoveScale); - } - - // Move avatar left - if (mInputDevice->isKeyDown(Ogre::KC_J)) { - mAvatar->move(Avatar::YAW_LEFT, mMoveScale); - } - - // Move avatar right - if (mInputDevice->isKeyDown(Ogre::KC_L)) { - mAvatar->move(Avatar::YAW_RIGHT, mMoveScale); - } - - // Move avatar up - if (mInputDevice->isKeyDown(Ogre::KC_PERIOD)) { - mAvatar->move(Avatar::ROLL_RIGHT, mMoveScale); - } - - // Move avatar down - if (mInputDevice->isKeyDown(Ogre::KC_COMMA)) { - mAvatar->move(Avatar::ROLL_LEFT, mMoveScale); - } - - // Move camera left - if (mInputDevice->isKeyDown(Ogre::KC_A)) { - mCamera->move(Camera::YAW_LEFT, mMoveScale); - } - - // Move camera right - if (mInputDevice->isKeyDown(Ogre::KC_D)) { - mCamera->move(Camera::YAW_RIGHT, mMoveScale); - } - - // Move camera forward - if (mInputDevice->isKeyDown(Ogre::KC_UP) || mInputDevice->isKeyDown(Ogre::KC_W) ) { - mCamera->move(Camera::FRONT, mMoveScale); - } - - // Move camera backwards - if (mInputDevice->isKeyDown(Ogre::KC_DOWN) || mInputDevice->isKeyDown(Ogre::KC_S) ) { - mCamera->move(Camera::BACK, mMoveScale); - } - - // Move camera up - if (mInputDevice->isKeyDown(Ogre::KC_PGUP)) { - mCamera->move(Camera::UP, mMoveScale); - } - - // Move camera down - if (mInputDevice->isKeyDown(Ogre::KC_PGDOWN)) { - mCamera->move(Camera::DOWN, mMoveScale); - } - - // Rotate kamera right - if (mInputDevice->isKeyDown(Ogre::KC_RIGHT)) { - //rotX = -mRotScale; - } + // Move avatar forwards + if (mInputDevice->isKeyDown(Ogre::KC_U)) { + mTarget->move(Avatar::FRONT, mMoveScale); + } - // Rotate kamera left - if (mInputDevice->isKeyDown(Ogre::KC_LEFT)) { - //rotX = mRotScale; - } - - // quit game - if( mInputDevice->isKeyDown(Ogre::KC_ESCAPE)) { - return false; - } - - /*// enable/disable statistics display - if (mInputDevice->isKeyDown(Ogre::KC_F) && mTimeUntilNextToggle <= 0) { - mStatsOn = !mStatsOn; - showDebugOverlay(mStatsOn); - - mTimeUntilNextToggle = 1; - }TODO*/ - - /*// switch filtering - if (mInputDevice->isKeyDown(Ogre::KC_T) && mTimeUntilNextToggle <= 0) { - switch(mFiltering) { - case TFO_BILINEAR: - mFiltering = TFO_TRILINEAR; - mAniso = 1; - break; - case TFO_TRILINEAR: - mFiltering = TFO_ANISOTROPIC; - mAniso = 8; - break; - case TFO_ANISOTROPIC: - mFiltering = TFO_BILINEAR; - mAniso = 1; - break; - default: - break; + // Move avatar backwards + if (mInputDevice->isKeyDown(Ogre::KC_N)) { + mTarget->move(Avatar::BACK, mMoveScale); } - MaterialManager::getSingleton().setDefaultTextureFiltering(mFiltering); - MaterialManager::getSingleton().setDefaultAnisotropy(mAniso); - - showDebugOverlay(mStatsOn); - - mTimeUntilNextToggle = 1; - }TODO*/ - - // create screenshot - /*if (mInputDevice->isKeyDown(Ogre::KC_SYSRQ) && mTimeUntilNextToggle <= 0) { - char tmp[20]; - sprintf(tmp, "screenshot_%d.png", ++mNumScreenShots); - mWindow->writeContentsToFile(tmp); - mTimeUntilNextToggle = 0.5; - mWindow->setDebugText(String("Wrote ") + tmp); - }*/ - - // switch rendermode - /*if (mInputDevice->isKeyDown(Ogre::KC_R) && mTimeUntilNextToggle <=0) { - mSceneDetailIndex = (mSceneDetailIndex+1)%3; - switch(mSceneDetailIndex) { - case 0 : mCamera->setDetailLevel(Ogre::SDL_SOLID) ; break ; - case 1 : mCamera->setDetailLevel(Ogre::SDL_WIREFRAME) ; break ; - case 2 : mCamera->setDetailLevel(Ogre::SDL_POINTS) ; break ; + + // Move avatar forwards + if (mInputDevice->isKeyDown(Ogre::KC_I)) { + mTarget->move(Avatar::PITCH_DOWN, mMoveScale); } - mTimeUntilNextToggle = 1; - }*/ - - /*static bool displayCameraDetails = false; - if (mInputDevice->isKeyDown(KC_P) && mTimeUntilNextToggle <= 0) - { - - displayCameraDetails = !displayCameraDetails; - mTimeUntilNextToggle = 1; - if (!displayCameraDetails) - mWindow->setDebugText(""); + + // Move avatar backwards + if (mInputDevice->isKeyDown(Ogre::KC_K)) { + mTarget->move(Avatar::PITCH_UP, mMoveScale); + } + + // Move avatar left + if (mInputDevice->isKeyDown(Ogre::KC_J)) { + mTarget->move(Avatar::YAW_LEFT, mMoveScale); + } + + // Move avatar right + if (mInputDevice->isKeyDown(Ogre::KC_L)) { + mTarget->move(Avatar::YAW_RIGHT, mMoveScale); + } + + // Move avatar up + if (mInputDevice->isKeyDown(Ogre::KC_PERIOD)) { + mTarget->move(Avatar::ROLL_RIGHT, mMoveScale); + } + + // Move avatar down + if (mInputDevice->isKeyDown(Ogre::KC_COMMA)) { + mTarget->move(Avatar::ROLL_LEFT, mMoveScale); + } + + // switch to menu + if( mInputDevice->isKeyDown(Ogre::KC_ESCAPE)) { + mGamestate->setGamestate(Gamestate::MENU); + } + + /*// switch filtering + if (mInputDevice->isKeyDown(Ogre::KC_T) && mTimeUntilNextToggle <= 0) { + switch(mFiltering) { + case TFO_BILINEAR: + mFiltering = TFO_TRILINEAR; + mAniso = 1; + break; + case TFO_TRILINEAR: + mFiltering = TFO_ANISOTROPIC; + mAniso = 8; + break; + case TFO_ANISOTROPIC: + mFiltering = TFO_BILINEAR; + mAniso = 1; + break; + default: + break; + } + MaterialManager::getSingleton().setDefaultTextureFiltering(mFiltering); + MaterialManager::getSingleton().setDefaultAnisotropy(mAniso); + + showDebugOverlay(mStatsOn); + + mTimeUntilNextToggle = 1; + } + + // create screenshot + if (mInputDevice->isKeyDown(Ogre::KC_SYSRQ) && mTimeUntilNextToggle <= 0) { + char tmp[20]; + sprintf(tmp, "screenshot_%d.png", ++mNumScreenShots); + mWindow->writeContentsToFile(tmp); + mTimeUntilNextToggle = 0.5; + mWindow->setDebugText(String("Wrote ") + tmp); + } + + // switch rendermode + if (mInputDevice->isKeyDown(Ogre::KC_R) && mTimeUntilNextToggle <=0) { + mSceneDetailIndex = (mSceneDetailIndex+1)%3; + switch(mSceneDetailIndex) { + case 0 : mCamera->setDetailLevel(Ogre::SDL_SOLID) ; break ; + case 1 : mCamera->setDetailLevel(Ogre::SDL_WIREFRAME) ; break ; + case 2 : mCamera->setDetailLevel(Ogre::SDL_POINTS) ; break ; + } + mTimeUntilNextToggle = 1; + } + + static bool displayCameraDetails = false; + if (mInputDevice->isKeyDown(KC_P) && mTimeUntilNextToggle <= 0) + { + + displayCameraDetails = !displayCameraDetails; + mTimeUntilNextToggle = 1; + if (!displayCameraDetails) + mWindow->setDebugText(""); + } + if (displayCameraDetails) + { + // Print camera details + mWindow->setDebugText("P: " + StringConverter::toString(mCamera->getDerivedPosition()) + " " + + "O: " + StringConverter::toString(mCamera->getDerivedOrientation())); + }*/ + + // Return true to continue rendering + return mTimeUntilNextToggle; + case Gamestate::MENU: + // quit game + if( mInputDevice->isKeyDown(Ogre::KC_ESCAPE)) { + return Input::GAME_QUIT; + } + return 0; + default: + return 0; } - if (displayCameraDetails) - { - // Print camera details - mWindow->setDebugText("P: " + StringConverter::toString(mCamera->getDerivedPosition()) + " " + - "O: " + StringConverter::toString(mCamera->getDerivedOrientation())); - }*/ - - // Return true to continue rendering - return true; } void Keyboard::setScale(float moveScale) { Modified: src/main.cpp =================================================================== --- src/main.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/main.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -23,6 +23,7 @@ */ #include "application.h" +#include "xml_parser.h" #ifdef __cplusplus extern "C" { @@ -36,6 +37,14 @@ int main(int argc, char **argv) #endif { + + //XmlParser(); + + //exit(1); + + + + // Instantiate our subclass OpengateApp myApp; Modified: src/mouse.cpp =================================================================== --- src/mouse.cpp 2006-07-16 16:12:36 UTC (rev 75) +++ src/mouse.cpp 2006-07-16 16:16:22 UTC (rev 76) @@ -22,27 +22,43 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <CEGUISystem.h> #include "mouse.h" -Mouse::Mouse(Ogre::InputReader* inputDevice, Avatar* avatar) { - this->mInputDevice = inputDevice; - this->mAvatar = avatar; - this->mTranslateVector = Ogre::Vector3::ZERO; +Mouse::Mouse(Ogre::InputReader* inputDevice, Avatar* avatar, CEGUI::Renderer* guiRenderer, Gamestate* gamestate) + : Input (inputDevice, avatar, guiRenderer, gamestate) { + mPressed = false; } -bool Mouse::processMouseInput(const Ogre::FrameEvent& evt) { - /* Rotation factors, may not be used if the second mouse button is pressed. */ - - /* If the second mouse button is pressed, then the mouse movement results in - sliding the camera, otherwise we rotate. */ - if (mInputDevice->getMouseButton(1)) { - mAvatar->move(Avatar::LEFT, (mInputDevice->getMouseRelativeX() * 0.13)); - mAvatar->move(Avatar::DOWN, (mInputDevice->getMouseRelativeY() * 0.13)); - } else { - mAvatar->rotate(Avatar::YAW_RIGHT, Ogre::Degree(mInputDevice->getMouseRelativeX() * 0.13)); - mAvatar->rotate(Avatar::PITCH_DOWN, Ogre::Degree(mInputDevice->getMouseRelativeY() * 0.13)); +Ogre::Real Mouse::processInput(const Ogre::FrameEvent& evt) { + + switch (mGamestate->getGamestate()) { + case Gamestate::GAME: + /* If the second mouse button is pressed, then the mouse movement results in + sliding the camera, otherwise we rotate. */ + if (mInputDevice->getMouseButton(1)) { + mTarget->move(Avatar::LEFT, (mInputDevice->getMouseRelativeX() * 0.13)); + mTarget->move(Avatar::DOWN, (mInputDevice->getMouseRelativeY() * 0.13)); + } else { + mTarget->rotate(Avatar::YAW_RIGHT, Ogre::Degree(mInputDevice->getMouseRelativeX() * 0.13)); + mTarget->rotate(Avatar::PITCH_DOWN, Ogre::Degree(mInputDevice->getMouseRelativeY() * 0.13)); + } + return 0; + case Gamestate::MENU: + CEGUI::System::getSingleton().injectMouseMove( + (mInputDevice->getMouseRelativeX() * 0.13) * mGuiRenderer->getWidth(), + (mInputDevice->getMouseRelativeY() * 0.13) * mGuiRenderer->getHeight()); + if (mInputDevice->getMouseButton(0)) { + CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::LeftButton); + mPressed = true; + } else if (mPressed && !mInputDevice->getMouseButton(0)) { + CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::LeftButton); + } + return 0; + default: + break; } - return true; + return 0; } void Mouse::setScale(Ogre::Degree rotScale) { Modified: src/resources.cfg =================================================================== --- src/resources.cfg 2006-07-16 16:12:36 UTC (rev 75) +++ src/resources.cfg 2006-07-16 16:16:22 UTC (rev 76) @@ -7,5 +7,5 @@ [General] FileSystem=../data FileSystem=../data/Materials -FileSystem=../data/Menus +Zip=../data/Menus/ogre_menu.zip Zip=../data/Materials/skybox.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:13:16
|
Revision: 75 Author: egore Date: 2006-07-16 09:12:36 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=75&view=rev Log Message: ----------- update autogenerated files Modified Paths: -------------- Makefile.am Makefile.in aclocal.m4 config.h.in configure configure.in Modified: Makefile.am =================================================================== --- Makefile.am 2006-07-16 16:11:49 UTC (rev 74) +++ Makefile.am 2006-07-16 16:12:36 UTC (rev 75) @@ -3,7 +3,7 @@ ## If you don't want it to overwrite it, ## Please disable it in the Anjuta project configuration -SUBDIRS = po include src data +SUBDIRS = include src data opengatedocdir = ${prefix}/doc/opengate opengatedoc_DATA = \ Modified: Makefile.in =================================================================== --- Makefile.in 2006-07-16 16:11:49 UTC (rev 74) +++ Makefile.in 2006-07-16 16:12:36 UTC (rev 75) @@ -92,8 +92,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -104,7 +102,6 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -115,15 +112,11 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -134,8 +127,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@ NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@ NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@ @@ -154,23 +145,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -187,28 +169,35 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = po include src data +SUBDIRS = include src data opengatedocdir = ${prefix}/doc/opengate opengatedoc_DATA = \ README\ @@ -437,7 +426,6 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ Modified: aclocal.m4 =================================================================== --- aclocal.m4 2006-07-16 16:11:49 UTC (rev 74) +++ aclocal.m4 2006-07-16 16:12:36 UTC (rev 75) @@ -11,405 +11,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper <dr...@cy...>, 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor <ot...@re...>, 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor <ot...@re...>, 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen <mc...@re...> 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - 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 - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include <libintl.h> -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include <libintl.h> -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; 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 - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - 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 is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # serial 48 AC_PROG_LIBTOOL Modified: config.h.in =================================================================== --- config.h.in 2006-07-16 16:11:49 UTC (rev 74) +++ config.h.in 2006-07-16 16:12:36 UTC (rev 75) @@ -14,33 +14,12 @@ #undef PACKAGE_SOURCE_DIR #undef GETTEXT_PACKAGE -/* always defined to indicate that i18n is enabled */ -#undef ENABLE_NLS - -/* Package name for gettext */ -#undef GETTEXT_PACKAGE - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define to 1 if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT - /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define if your <locale.h> file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if you have the <locale.h> header file. */ -#undef HAVE_LOCALE_H - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -71,9 +50,6 @@ /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT -/* Package local directory */ -#undef PACKAGE_LOCALE_DIR - /* Define to the full name of this package. */ #undef PACKAGE_NAME Modified: configure =================================================================== --- configure 2006-07-16 16:11:49 UTC (rev 74) +++ configure 2006-07-16 16:12:36 UTC (rev 75) @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.60. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -16,11 +17,35 @@ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# 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 + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -29,8 +54,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +104,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +124,386 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# 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 +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell aut...@gn... about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +512,19 @@ as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,17 +533,8 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH - - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -395,29 +688,26 @@ tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 </dev/null 6>&1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -454,18 +744,146 @@ #endif #if HAVE_INTTYPES_H # include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif #endif +#if HAVE_STDINT_H +# include <stdint.h> +#endif #if HAVE_UNISTD_H # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL NO_PREFIX_PACKAGE_DATA_DIR PACKAGE_DATA_DIR NO_PREFIX_PACKAGE_DOC_DIR PACKAGE_DOC_DIR NO_PREFIX_PACKAGE_PIXMAPS_DIR PACKAGE_PIXMAPS_DIR NO_PREFIX_PACKAGE_HELP_DIR PACKAGE_HELP_DIR NO_PREFIX_PACKAGE_MENU_DIR PACKAGE_MENU_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +GREP +EGREP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +LN_S +ECHO +AR +RANLIB +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +NO_PREFIX_PACKAGE_DATA_DIR +PACKAGE_DATA_DIR +NO_PREFIX_PACKAGE_DOC_DIR +PACKAGE_DOC_DIR +NO_PREFIX_PACKAGE_PIXMAPS_DIR +PACKAGE_PIXMAPS_DIR +NO_PREFIX_PACKAGE_HELP_DIR +PACKAGE_HELP_DIR +NO_PREFIX_PACKAGE_MENU_DIR +PACKAGE_MENU_DIR +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS' + # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -491,34 +909,48 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -540,12 +972,18 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -553,8 +991,18 @@ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + eval enable_$ac_feature=no ;; + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. @@ -562,11 +1010,7 @@ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -593,6 +1037,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -617,13 +1067,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -688,6 +1141,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -744,11 +1207,7 @@ { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -757,7 +1216,7 @@ { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -788,8 +1247,7 @@ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -809,29 +1267,21 @@ { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. @@ -856,22 +1306,43 @@ test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. @@ -880,70 +1351,31 @@ ac_srcdir_defaulted=no fi if test ! -r "$srcdir/$ac_unique_file"; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -972,9 +1404,6 @@ -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -992,15 +1421,22 @@ --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1027,10 +1463,8 @@ (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1041,16 +1475,15 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags @@ -1062,118 +1495,86 @@ it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.60 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.60. Inv... [truncated message content] |
From: <eg...@us...> - 2006-07-16 16:11:58
|
Revision: 74 Author: egore Date: 2006-07-16 09:11:49 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=74&view=rev Log Message: ----------- update project files Modified Paths: -------------- opengate.prj opengate.pws Modified: opengate.prj =================================================================== --- opengate.prj 2006-07-16 16:11:15 UTC (rev 73) +++ opengate.prj 2006-07-16 16:11:49 UTC (rev 74) @@ -31,7 +31,7 @@ project.version=0.1 project.author=Christoph Brill project.source.target=opengate -project.has.gettext=1 +project.has.gettext=0 project.gui.command= project.programming.language=C++ project.excluded.modules=intl @@ -75,7 +75,10 @@ mouse.h\ camera.h\ gamestate.h\ - movable_object.h + movable_object.h\ + input.h\ + xml_parser.h\ + object.h module.source.name=src module.source.type= @@ -88,7 +91,10 @@ mouse.cpp\ camera.cpp\ gamestate.cpp\ - movable_object.cpp + movable_object.cpp\ + input.cpp\ + xml_parser.cpp\ + object.cpp module.pixmap.name=pixmaps module.pixmap.type= @@ -99,13 +105,12 @@ module.data.files=\ Ships/Octavius/Apteryx/octavius_apteryx.mesh\ Ships/Quantar/Storm/quantar_storm.mesh\ - Menus/mainmenu.scheme\ - Materials/common.material\ Materials/octavius_apteryx_auv.material\ Materials/octavius_apteryx_auv.png\ Materials/quantar_storm_auv.material\ Materials/quantar_storm_auv.png\ - Materials/skybox.zip + Materials/skybox.zip\ + Materials/skybox.material module.help.name=help module.help.type= Modified: opengate.pws =================================================================== --- opengate.pws 2006-07-16 16:11:15 UTC (rev 73) +++ opengate.pws 2006-07-16 16:11:49 UTC (rev 74) @@ -1,10 +1,10 @@ [filenumbers] -0=37 -1=76 -2=1 -3=79 -4=41 +0=35 +1=41 +2=40 +3=191 +4=1 5=40 6=163 7=38 @@ -40,6 +40,8 @@ [Project Tree] 0=0 +1=0:0 +2=0:1 [File Tree] 0=0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-07-16 16:11:26
|
Revision: 73 Author: egore Date: 2006-07-16 09:11:15 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=73&view=rev Log Message: ----------- Add TODO-list Modified Paths: -------------- TODO Modified: TODO =================================================================== --- TODO 2006-05-14 13:32:47 UTC (rev 72) +++ TODO 2006-07-16 16:11:15 UTC (rev 73) @@ -1 +1,11 @@ +Input: +- add input manager instead of hardcoding it +- add joystick/gamepad input +- evaluate if SDL is more suitable for input handling +Avatar: +- add "physical" movement (using an acceleration vector) + +GUI: +- create a real GUI +- polish GUI input system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-14 13:34:06
|
Revision: 72 Author: egore Date: 2006-05-14 06:32:47 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=72&view=rev Log Message: ----------- add all ranking images add conversion script using librsvg and pngcrush Modified Paths: -------------- data/Rankings/00.png data/Rankings/01.png data/Rankings/02.png data/Rankings/03.png data/Rankings/04.png data/Rankings/05.png data/Rankings/06.png data/Rankings/07.png data/Rankings/08.png data/Rankings/09.png data/Rankings/10.png data/Rankings/11.png data/Rankings/12.png data/Rankings/13.png data/Rankings/14.png data/Rankings/15.png data/Rankings/16.png data/Rankings/17.png data/Rankings/18.png data/Rankings/19.png data/Rankings/20.png data/Rankings/21.png data/Rankings/22.png data/Rankings/23.png data/Rankings/24.png data/Rankings/25.png data/Rankings/26.png data/Rankings/27.png data/Rankings/28.png data/Rankings/29.png data/Rankings/30.png data/Rankings/31.png data/Rankings/32.png data/Rankings/33.png data/Rankings/34.png data/Rankings/35.png data/Rankings/36.png data/Rankings/37.png data/Rankings/38.png data/Rankings/39.png Added Paths: ----------- data/Rankings/40.png data/Rankings/40.svg data/Rankings/41.png data/Rankings/41.svg data/Rankings/42.png data/Rankings/42.svg data/Rankings/43.png data/Rankings/43.svg data/Rankings/44.png data/Rankings/44.svg data/Rankings/45.png data/Rankings/45.svg data/Rankings/46.png data/Rankings/46.svg data/Rankings/47.png data/Rankings/47.svg data/Rankings/48.png data/Rankings/48.svg data/Rankings/49.png data/Rankings/49.svg data/Rankings/50.png data/Rankings/50.svg data/Rankings/convert.sh Modified: data/Rankings/00.png =================================================================== (Binary files differ) Modified: data/Rankings/01.png =================================================================== (Binary files differ) Modified: data/Rankings/02.png =================================================================== (Binary files differ) Modified: data/Rankings/03.png =================================================================== (Binary files differ) Modified: data/Rankings/04.png =================================================================== (Binary files differ) Modified: data/Rankings/05.png =================================================================== (Binary files differ) Modified: data/Rankings/06.png =================================================================== (Binary files differ) Modified: data/Rankings/07.png =================================================================== (Binary files differ) Modified: data/Rankings/08.png =================================================================== (Binary files differ) Modified: data/Rankings/09.png =================================================================== (Binary files differ) Modified: data/Rankings/10.png =================================================================== (Binary files differ) Modified: data/Rankings/11.png =================================================================== (Binary files differ) Modified: data/Rankings/12.png =================================================================== (Binary files differ) Modified: data/Rankings/13.png =================================================================== (Binary files differ) Modified: data/Rankings/14.png =================================================================== (Binary files differ) Modified: data/Rankings/15.png =================================================================== (Binary files differ) Modified: data/Rankings/16.png =================================================================== (Binary files differ) Modified: data/Rankings/17.png =================================================================== (Binary files differ) Modified: data/Rankings/18.png =================================================================== (Binary files differ) Modified: data/Rankings/19.png =================================================================== (Binary files differ) Modified: data/Rankings/20.png =================================================================== (Binary files differ) Modified: data/Rankings/21.png =================================================================== (Binary files differ) Modified: data/Rankings/22.png =================================================================== (Binary files differ) Modified: data/Rankings/23.png =================================================================== (Binary files differ) Modified: data/Rankings/24.png =================================================================== (Binary files differ) Modified: data/Rankings/25.png =================================================================== (Binary files differ) Modified: data/Rankings/26.png =================================================================== (Binary files differ) Modified: data/Rankings/27.png =================================================================== (Binary files differ) Modified: data/Rankings/28.png =================================================================== (Binary files differ) Modified: data/Rankings/29.png =================================================================== (Binary files differ) Modified: data/Rankings/30.png =================================================================== (Binary files differ) Modified: data/Rankings/31.png =================================================================== (Binary files differ) Modified: data/Rankings/32.png =================================================================== (Binary files differ) Modified: data/Rankings/33.png =================================================================== (Binary files differ) Modified: data/Rankings/34.png =================================================================== (Binary files differ) Modified: data/Rankings/35.png =================================================================== (Binary files differ) Modified: data/Rankings/36.png =================================================================== (Binary files differ) Modified: data/Rankings/37.png =================================================================== (Binary files differ) Modified: data/Rankings/38.png =================================================================== (Binary files differ) Modified: data/Rankings/39.png =================================================================== (Binary files differ) Added: data/Rankings/40.png =================================================================== (Binary files differ) Property changes on: data/Rankings/40.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/40.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/40.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/41.png =================================================================== (Binary files differ) Property changes on: data/Rankings/41.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/41.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/41.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/42.png =================================================================== (Binary files differ) Property changes on: data/Rankings/42.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/42.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/42.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/43.png =================================================================== (Binary files differ) Property changes on: data/Rankings/43.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/43.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/43.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/44.png =================================================================== (Binary files differ) Property changes on: data/Rankings/44.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/44.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/44.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/45.png =================================================================== (Binary files differ) Property changes on: data/Rankings/45.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/45.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/45.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/46.png =================================================================== (Binary files differ) Property changes on: data/Rankings/46.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/46.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/46.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/47.png =================================================================== (Binary files differ) Property changes on: data/Rankings/47.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/47.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/47.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/48.png =================================================================== (Binary files differ) Property changes on: data/Rankings/48.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/48.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/48.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/49.png =================================================================== (Binary files differ) Property changes on: data/Rankings/49.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/49.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/49.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/50.png =================================================================== (Binary files differ) Property changes on: data/Rankings/50.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/50.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/50.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/convert.sh =================================================================== --- data/Rankings/convert.sh (rev 0) +++ data/Rankings/convert.sh 2006-05-14 13:32:47 UTC (rev 72) @@ -0,0 +1,14 @@ +#!/bin/sh + +# Author: Christoph Brill (eg...@us...) +# Little script to convert all svg images to png ones (depends on librsvg and pngcrush) + +for inname in *.svg; do + outname=`echo $inname | sed -e 's:\.svg:\.png:g'` + if [ -f $outname ]; then + mv $outname $outname.old + fi + rsvg-convert --format=png --width=32 --height=32 $inname > $outname; + pngcrush -q $outname $outname.new + mv $outname.new $outname +done Property changes on: data/Rankings/convert.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/x-sh Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-13 22:13:29
|
Revision: 71 Author: egore Date: 2006-05-13 15:13:22 -0700 (Sat, 13 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=71&view=rev Log Message: ----------- add missing escapes Modified Paths: -------------- website/screenshots.php Modified: website/screenshots.php =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-09 01:14:30
|
Revision: 70 Author: egore Date: 2006-05-07 12:47:45 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=70&view=rev Log Message: ----------- add more ranking images Added Paths: ----------- data/Rankings/10.png data/Rankings/10.svg data/Rankings/11.png data/Rankings/11.svg data/Rankings/12.png data/Rankings/12.svg data/Rankings/13.png data/Rankings/13.svg data/Rankings/14.png data/Rankings/14.svg data/Rankings/15.png data/Rankings/15.svg data/Rankings/16.png data/Rankings/16.svg data/Rankings/17.png data/Rankings/17.svg data/Rankings/18.png data/Rankings/18.svg data/Rankings/19.png data/Rankings/19.svg data/Rankings/30.png data/Rankings/30.svg data/Rankings/31.png data/Rankings/31.svg data/Rankings/32.png data/Rankings/32.svg data/Rankings/33.png data/Rankings/33.svg data/Rankings/34.png data/Rankings/34.svg data/Rankings/35.png data/Rankings/35.svg data/Rankings/36.png data/Rankings/36.svg data/Rankings/37.png data/Rankings/37.svg data/Rankings/38.png data/Rankings/38.svg data/Rankings/39.png data/Rankings/39.svg Added: data/Rankings/10.png =================================================================== (Binary files differ) Property changes on: data/Rankings/10.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/10.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/10.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/11.png =================================================================== (Binary files differ) Property changes on: data/Rankings/11.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/11.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/11.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/12.png =================================================================== (Binary files differ) Property changes on: data/Rankings/12.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/12.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/12.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/13.png =================================================================== (Binary files differ) Property changes on: data/Rankings/13.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/13.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/13.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/14.png =================================================================== (Binary files differ) Property changes on: data/Rankings/14.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/14.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/14.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/15.png =================================================================== (Binary files differ) Property changes on: data/Rankings/15.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/15.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/15.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/16.png =================================================================== (Binary files differ) Property changes on: data/Rankings/16.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/16.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/16.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/17.png =================================================================== (Binary files differ) Property changes on: data/Rankings/17.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/17.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/17.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/18.png =================================================================== (Binary files differ) Property changes on: data/Rankings/18.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/18.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/18.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/19.png =================================================================== (Binary files differ) Property changes on: data/Rankings/19.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/19.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/19.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/30.png =================================================================== (Binary files differ) Property changes on: data/Rankings/30.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/30.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/30.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/31.png =================================================================== (Binary files differ) Property changes on: data/Rankings/31.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/31.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/31.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/32.png =================================================================== (Binary files differ) Property changes on: data/Rankings/32.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/32.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/32.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/33.png =================================================================== (Binary files differ) Property changes on: data/Rankings/33.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/33.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/33.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/34.png =================================================================== (Binary files differ) Property changes on: data/Rankings/34.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/34.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/34.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/35.png =================================================================== (Binary files differ) Property changes on: data/Rankings/35.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/35.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/35.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/36.png =================================================================== (Binary files differ) Property changes on: data/Rankings/36.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/36.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/36.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/37.png =================================================================== (Binary files differ) Property changes on: data/Rankings/37.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/37.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/37.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/38.png =================================================================== (Binary files differ) Property changes on: data/Rankings/38.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/38.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/38.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/39.png =================================================================== (Binary files differ) Property changes on: data/Rankings/39.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/39.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/39.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 20:44:52
|
Revision: 69 Author: egore Date: 2006-05-04 13:43:44 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=69&view=rev Log Message: ----------- add ranking images Added Paths: ----------- data/Rankings/ data/Rankings/00.png data/Rankings/00.svg data/Rankings/01.png data/Rankings/01.svg data/Rankings/02.png data/Rankings/02.svg data/Rankings/03.png data/Rankings/03.svg data/Rankings/04.png data/Rankings/04.svg data/Rankings/05.png data/Rankings/05.svg data/Rankings/06.png data/Rankings/06.svg data/Rankings/07.png data/Rankings/07.svg data/Rankings/08.png data/Rankings/08.svg data/Rankings/09.png data/Rankings/09.svg data/Rankings/20.png data/Rankings/20.svg data/Rankings/21.png data/Rankings/21.svg data/Rankings/22.png data/Rankings/22.svg data/Rankings/23.png data/Rankings/23.svg data/Rankings/24.png data/Rankings/24.svg data/Rankings/25.png data/Rankings/25.svg data/Rankings/26.png data/Rankings/26.svg data/Rankings/27.png data/Rankings/27.svg data/Rankings/28.png data/Rankings/28.svg data/Rankings/29.png data/Rankings/29.svg Added: data/Rankings/00.png =================================================================== (Binary files differ) Property changes on: data/Rankings/00.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/00.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/00.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/01.png =================================================================== (Binary files differ) Property changes on: data/Rankings/01.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/01.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/01.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/02.png =================================================================== (Binary files differ) Property changes on: data/Rankings/02.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/02.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/02.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/03.png =================================================================== (Binary files differ) Property changes on: data/Rankings/03.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/03.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/03.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/04.png =================================================================== (Binary files differ) Property changes on: data/Rankings/04.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/04.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/04.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/05.png =================================================================== (Binary files differ) Property changes on: data/Rankings/05.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/05.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/05.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/06.png =================================================================== (Binary files differ) Property changes on: data/Rankings/06.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/06.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/06.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/07.png =================================================================== (Binary files differ) Property changes on: data/Rankings/07.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/07.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/07.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/08.png =================================================================== (Binary files differ) Property changes on: data/Rankings/08.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/08.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/08.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/09.png =================================================================== (Binary files differ) Property changes on: data/Rankings/09.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/09.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/09.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/20.png =================================================================== (Binary files differ) Property changes on: data/Rankings/20.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/20.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/20.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/21.png =================================================================== (Binary files differ) Property changes on: data/Rankings/21.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/21.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/21.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/22.png =================================================================== (Binary files differ) Property changes on: data/Rankings/22.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/22.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/22.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/23.png =================================================================== (Binary files differ) Property changes on: data/Rankings/23.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/23.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/23.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/24.png =================================================================== (Binary files differ) Property changes on: data/Rankings/24.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/24.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/24.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/25.png =================================================================== (Binary files differ) Property changes on: data/Rankings/25.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/25.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/25.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/26.png =================================================================== (Binary files differ) Property changes on: data/Rankings/26.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/26.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/26.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/27.png =================================================================== (Binary files differ) Property changes on: data/Rankings/27.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/27.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/27.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/28.png =================================================================== (Binary files differ) Property changes on: data/Rankings/28.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/28.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/28.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Rankings/29.png =================================================================== (Binary files differ) Property changes on: data/Rankings/29.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Rankings/29.svg =================================================================== (Binary files differ) Property changes on: data/Rankings/29.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 15:01:00
|
Revision: 68 Author: egore Date: 2006-05-04 08:00:45 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=68&view=rev Log Message: ----------- fix xml structure Modified Paths: -------------- data/Ships/Octavius/octavius_rankings.xml Modified: data/Ships/Octavius/octavius_rankings.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 14:16:54
|
Revision: 67 Author: egore Date: 2006-05-04 07:16:45 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=67&view=rev Log Message: ----------- add information about Ghost Added Paths: ----------- data/ECM/ghost.xml Added: data/ECM/ghost.xml =================================================================== --- data/ECM/ghost.xml (rev 0) +++ data/ECM/ghost.xml 2006-05-04 14:16:45 UTC (rev 67) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> + +<equipment type="ECM> + <production-center>Amananth</production-center> + <name>Ghost</name> + <class>Radar Jammer</class> + <manufacturer>Amananth</manufacturer> + + <techlevel>8</techlevel> + <sensorlevel>3</sensorlevel> + <size>1</size> + <mass>30</mass> + <power>970.0k</power> + + <required-component>Antimony</required-component> + <required-component>RAM</required-component> + <required-component>CPU</required-component> + <required-component>Magnetics</required-component> + +</equiment> \ No newline at end of file Property changes on: data/ECM/ghost.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 14:03:12
|
Revision: 66 Author: egore Date: 2006-05-04 07:02:56 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=66&view=rev Log Message: ----------- Add the first ECM (a Ghost) Added Paths: ----------- data/ECM/ data/ECM/ghost.wings Added: data/ECM/ghost.wings =================================================================== (Binary files differ) Property changes on: data/ECM/ghost.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 13:18:42
|
Revision: 65 Author: egore Date: 2006-05-04 06:18:06 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=65&view=rev Log Message: ----------- Hyperial Logo (thanks to Gary Luck for the raw files) fix mime types Added Paths: ----------- data/Logo/hyperial.png data/Logo/hyperial.svg Property Changed: ---------------- data/Logo/amanath.png data/Logo/octavius.png data/Logo/quantar.png data/Logo/solrain.png Property changes on: data/Logo/amanath.png ___________________________________________________________________ Name: svn:mime-type - application/octet-stream + image/png Added: data/Logo/hyperial.png =================================================================== (Binary files differ) Property changes on: data/Logo/hyperial.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/Logo/hyperial.svg =================================================================== (Binary files differ) Property changes on: data/Logo/hyperial.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Property changes on: data/Logo/octavius.png ___________________________________________________________________ Name: svn:mime-type - application/octet-stream + image/png Property changes on: data/Logo/quantar.png ___________________________________________________________________ Name: svn:mime-type - application/octet-stream + image/png Property changes on: data/Logo/solrain.png ___________________________________________________________________ Name: svn:mime-type - application/octet-stream + image/png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-04 07:00:35
|
Revision: 64 Author: egore Date: 2006-05-04 00:00:19 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=64&view=rev Log Message: ----------- Logos for all factions Added Paths: ----------- data/Logo/ data/Logo/amanath.png data/Logo/amanath.svg data/Logo/octavius.png data/Logo/octavius.svg data/Logo/quantar.png data/Logo/quantar.svg data/Logo/solrain.png data/Logo/solrain.svg Added: data/Logo/amanath.png =================================================================== (Binary files differ) Property changes on: data/Logo/amanath.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Logo/amanath.svg =================================================================== (Binary files differ) Property changes on: data/Logo/amanath.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Logo/octavius.png =================================================================== (Binary files differ) Property changes on: data/Logo/octavius.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Logo/octavius.svg =================================================================== (Binary files differ) Property changes on: data/Logo/octavius.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Logo/quantar.png =================================================================== (Binary files differ) Property changes on: data/Logo/quantar.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Logo/quantar.svg =================================================================== (Binary files differ) Property changes on: data/Logo/quantar.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/Logo/solrain.png =================================================================== (Binary files differ) Property changes on: data/Logo/solrain.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Logo/solrain.svg =================================================================== (Binary files differ) Property changes on: data/Logo/solrain.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-03 22:32:21
|
Revision: 63 Author: egore Date: 2006-05-03 15:25:50 -0700 (Wed, 03 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=63&view=rev Log Message: ----------- add screenshot to the website add qunatar thunder as a heavyly work in progress Modified Paths: -------------- data/BaseInterior/Solrain/floor_auv.svg data/BaseInterior/Solrain/solrain.wings website/screenshots.php Added Paths: ----------- data/Ships/Quantar/Thunder/ data/Ships/Quantar/Thunder/quantar_thunder.wings website/images/models/base_solrain.jpg website/images/models/thumbs/base_solrain.jpg Modified: data/BaseInterior/Solrain/floor_auv.svg =================================================================== (Binary files differ) Modified: data/BaseInterior/Solrain/solrain.wings =================================================================== (Binary files differ) Added: data/Ships/Quantar/Thunder/quantar_thunder.wings =================================================================== (Binary files differ) Property changes on: data/Ships/Quantar/Thunder/quantar_thunder.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: website/images/models/base_solrain.jpg =================================================================== (Binary files differ) Property changes on: website/images/models/base_solrain.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: website/images/models/thumbs/base_solrain.jpg =================================================================== (Binary files differ) Property changes on: website/images/models/thumbs/base_solrain.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: website/screenshots.php =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-03 21:52:54
|
Revision: 62 Author: egore Date: 2006-05-03 14:49:56 -0700 (Wed, 03 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=62&view=rev Log Message: ----------- more work on the bases Added Paths: ----------- data/BaseInterior/Solrain/ data/BaseInterior/Solrain/1st_floor_bottom_auv.png data/BaseInterior/Solrain/1st_floor_bottom_auv.svg data/BaseInterior/Solrain/floor_auv.png data/BaseInterior/Solrain/floor_auv.svg data/BaseInterior/Solrain/solrain.wings data/BaseInterior/Utils/ data/BaseInterior/Utils/Barrel/ data/BaseInterior/Utils/Barrel/utils_barrel.wings data/BaseInterior/Utils/Barrel/utils_barrel_auv.png data/BaseInterior/Utils/Barrel/utils_barrel_auv.svg data/BaseInterior/Utils/Box/ data/BaseInterior/Utils/Box/utils_box.wings data/BaseInterior/Utils/Box/utils_box_box_auv.png data/BaseInterior/Utils/Box/utils_box_box_auv.svg Removed Paths: ------------- data/BaseInterior/solrain.wings data/BaseInterior/utils_barrel.wings data/BaseInterior/utils_barrel_auv.png data/BaseInterior/utils_barrel_auv.svg data/BaseInterior/utils_box.wings data/BaseInterior/utils_box_box_auv.png data/BaseInterior/utils_box_box_auv.svg Added: data/BaseInterior/Solrain/1st_floor_bottom_auv.png =================================================================== (Binary files differ) Property changes on: data/BaseInterior/Solrain/1st_floor_bottom_auv.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/BaseInterior/Solrain/1st_floor_bottom_auv.svg =================================================================== (Binary files differ) Property changes on: data/BaseInterior/Solrain/1st_floor_bottom_auv.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Added: data/BaseInterior/Solrain/floor_auv.png =================================================================== (Binary files differ) Property changes on: data/BaseInterior/Solrain/floor_auv.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: data/BaseInterior/Solrain/floor_auv.svg =================================================================== (Binary files differ) Property changes on: data/BaseInterior/Solrain/floor_auv.svg ___________________________________________________________________ Name: svn:mime-type + image/svg+xml Copied: data/BaseInterior/Solrain/solrain.wings (from rev 61, data/BaseInterior/solrain.wings) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Barrel/utils_barrel.wings (from rev 61, data/BaseInterior/utils_barrel.wings) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Barrel/utils_barrel_auv.png (from rev 61, data/BaseInterior/utils_barrel_auv.png) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Barrel/utils_barrel_auv.svg (from rev 61, data/BaseInterior/utils_barrel_auv.svg) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Box/utils_box.wings (from rev 61, data/BaseInterior/utils_box.wings) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Box/utils_box_box_auv.png (from rev 61, data/BaseInterior/utils_box_box_auv.png) =================================================================== (Binary files differ) Copied: data/BaseInterior/Utils/Box/utils_box_box_auv.svg (from rev 61, data/BaseInterior/utils_box_box_auv.svg) =================================================================== (Binary files differ) Deleted: data/BaseInterior/solrain.wings =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_barrel.wings =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_barrel_auv.png =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_barrel_auv.svg =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_box.wings =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_box_box_auv.png =================================================================== (Binary files differ) Deleted: data/BaseInterior/utils_box_box_auv.svg =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2006-05-03 09:59:20
|
Revision: 61 Author: egore Date: 2006-05-03 02:58:18 -0700 (Wed, 03 May 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=61&view=rev Log Message: ----------- information about basic conflux Added Paths: ----------- data/Ships/Conflux/ data/Ships/Conflux/C-0/ data/Ships/Conflux/C-0/conflux_c0.xml data/Ships/Conflux/C-1/ data/Ships/Conflux/C-1/conflux_c1.xml data/Ships/Conflux/C-2/ data/Ships/Conflux/C-2/conflux_c2.xml data/Ships/Conflux/C-3/ data/Ships/Conflux/C-3/conflux_c3.xml Added: data/Ships/Conflux/C-0/conflux_c0.xml =================================================================== (Binary files differ) Property changes on: data/Ships/Conflux/C-0/conflux_c0.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:mime + application/xml Added: data/Ships/Conflux/C-1/conflux_c1.xml =================================================================== (Binary files differ) Property changes on: data/Ships/Conflux/C-1/conflux_c1.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:mime + application/xml Added: data/Ships/Conflux/C-2/conflux_c2.xml =================================================================== (Binary files differ) Property changes on: data/Ships/Conflux/C-2/conflux_c2.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:mime + application/xml Added: data/Ships/Conflux/C-3/conflux_c3.xml =================================================================== (Binary files differ) Property changes on: data/Ships/Conflux/C-3/conflux_c3.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:mime + application/xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |