Menu
▾
▴
opengate-svn
|
From: <eg...@us...> - 2006-03-23 19:32:09
|
Revision: 1 Author: egore Date: 2006-03-23 11:31:10 -0800 (Thu, 23 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=1&view=rev Log Message: ----------- add already existing data into repository Added Paths: ----------- data/ data/Octavius/ data/Octavius/Apteryx/ data/Octavius/Apteryx/octavius_apteryx.jpg data/Octavius/Apteryx/octavius_apteryx.wings data/Octavius/Apteryx/octavius_apteryx.xml data/Octavius/Phoenix/ data/Octavius/Phoenix/octavius_phoenix.jpg data/Octavius/Phoenix/octavius_phoenix.wings data/Octavius/Phoenix/octavius_phoenix.xml data/Octavius/octavius_rankings.xml data/Qunatar/ data/Qunatar/Storm/ data/Qunatar/Storm/quantar_storm.jpg data/Qunatar/Storm/quantar_storm.wings data/Qunatar/Storm/quantar_storm.xml data/Qunatar/Typhoon/ data/Qunatar/Typhoon/quantar_typhoon.jpg data/Qunatar/Typhoon/quantar_typhoon.wings data/Qunatar/Typhoon/quantar_typhoon.xml data/Solrain/ data/Solrain/Intensity/ data/Solrain/Intensity/solrain_intensity.jpg data/Solrain/Intensity/solrain_intensity.wings data/Solrain/Intensity/solrain_intensity.xml data/Solrain/Pioneer/ data/Solrain/Pioneer/solrain_pioneer.jpg data/Solrain/Pioneer/solrain_pioneer.wings data/Solrain/Pioneer/solrain_pioneer.xml data/Solrain/Premia/ data/Solrain/Premia/solrain_premia.jpg data/Solrain/Premia/solrain_premia.wings data/Solrain/Premia/solrain_premia.xml Added: data/Octavius/Apteryx/octavius_apteryx.jpg =================================================================== (Binary files differ) Property changes on: data/Octavius/Apteryx/octavius_apteryx.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Octavius/Apteryx/octavius_apteryx.wings =================================================================== (Binary files differ) Property changes on: data/Octavius/Apteryx/octavius_apteryx.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Octavius/Apteryx/octavius_apteryx.xml =================================================================== (Binary files differ) Property changes on: data/Octavius/Apteryx/octavius_apteryx.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Octavius/Phoenix/octavius_phoenix.jpg =================================================================== (Binary files differ) Property changes on: data/Octavius/Phoenix/octavius_phoenix.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Octavius/Phoenix/octavius_phoenix.wings =================================================================== (Binary files differ) Property changes on: data/Octavius/Phoenix/octavius_phoenix.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Octavius/Phoenix/octavius_phoenix.xml =================================================================== (Binary files differ) Property changes on: data/Octavius/Phoenix/octavius_phoenix.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Octavius/octavius_rankings.xml =================================================================== (Binary files differ) Property changes on: data/Octavius/octavius_rankings.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Qunatar/Storm/quantar_storm.jpg =================================================================== (Binary files differ) Property changes on: data/Qunatar/Storm/quantar_storm.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Qunatar/Storm/quantar_storm.wings =================================================================== (Binary files differ) Property changes on: data/Qunatar/Storm/quantar_storm.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Qunatar/Storm/quantar_storm.xml =================================================================== (Binary files differ) Property changes on: data/Qunatar/Storm/quantar_storm.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Qunatar/Typhoon/quantar_typhoon.jpg =================================================================== (Binary files differ) Property changes on: data/Qunatar/Typhoon/quantar_typhoon.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Qunatar/Typhoon/quantar_typhoon.wings =================================================================== (Binary files differ) Property changes on: data/Qunatar/Typhoon/quantar_typhoon.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Qunatar/Typhoon/quantar_typhoon.xml =================================================================== (Binary files differ) Property changes on: data/Qunatar/Typhoon/quantar_typhoon.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Solrain/Intensity/solrain_intensity.jpg =================================================================== (Binary files differ) Property changes on: data/Solrain/Intensity/solrain_intensity.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Intensity/solrain_intensity.wings =================================================================== (Binary files differ) Property changes on: data/Solrain/Intensity/solrain_intensity.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Intensity/solrain_intensity.xml =================================================================== (Binary files differ) Property changes on: data/Solrain/Intensity/solrain_intensity.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Solrain/Pioneer/solrain_pioneer.jpg =================================================================== (Binary files differ) Property changes on: data/Solrain/Pioneer/solrain_pioneer.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Pioneer/solrain_pioneer.wings =================================================================== (Binary files differ) Property changes on: data/Solrain/Pioneer/solrain_pioneer.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Pioneer/solrain_pioneer.xml =================================================================== (Binary files differ) Property changes on: data/Solrain/Pioneer/solrain_pioneer.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Solrain/Premia/solrain_premia.jpg =================================================================== (Binary files differ) Property changes on: data/Solrain/Premia/solrain_premia.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Premia/solrain_premia.wings =================================================================== (Binary files differ) Property changes on: data/Solrain/Premia/solrain_premia.wings ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Solrain/Premia/solrain_premia.xml =================================================================== (Binary files differ) Property changes on: data/Solrain/Premia/solrain_premia.xml ___________________________________________________________________ Name: svn:mime-type + application/xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-03-31 22:45:55
|
Revision: 6 Author: egore Date: 2006-03-31 14:45:37 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=6&view=rev Log Message: ----------- initial checking of slightly modified OGRE3D example application Added Paths: ----------- src/ src/Makefile.am src/Makefile.in src/main.cpp src/media.cfg src/ogre.cfg src/plugins.cfg src/quake3settings.cfg src/resources.cfg src/terrain.cfg src/world.cfg Added: src/Makefile.am =================================================================== --- src/Makefile.am (rev 0) +++ src/Makefile.am 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,25 @@ +## Process this file with automake to produce Makefile.in + +## 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/usr/share/doc/ogre-1.0.7/Samples/Common/include + +AM_CXXFLAGS =\ + -g -DEXT_HASH\ + -Wall\ + -g + +bin_PROGRAMS = osjg + +osjg_SOURCES = \ + main.cc + +osjg_LDFLAGS = \ + -L/usr/local/lib + +osjg_LDADD = \ + -lOgreMain -lCEGUIBase -lCEGUIOgreRenderer + Property changes on: src/Makefile.am ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/Makefile.in =================================================================== --- src/Makefile.in (rev 0) +++ src/Makefile.in 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,488 @@ +# 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@ +bin_PROGRAMS = osjg$(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__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_osjg_OBJECTS = main.$(OBJEXT) +osjg_OBJECTS = $(am_osjg_OBJECTS) +osjg_DEPENDENCIES = +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 = $(osjg_SOURCES) +DIST_SOURCES = $(osjg_SOURCES) +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@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +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@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +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@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +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@ +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@ +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@ +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@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +INCLUDES = \ + -I/usr/include/OGRE -I/usr/include/CEGUI -I/usr/share/doc/ogre-1.0.7/Samples/Common/include + +AM_CXXFLAGS = \ + -g -DEXT_HASH\ + -Wall\ + -g + +osjg_SOURCES = \ + main.cc + +osjg_LDFLAGS = \ + -L/usr/local/lib + +osjg_LDADD = \ + -lOgreMain -lCEGUIBase -lCEGUIOgreRenderer + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +osjg$(EXEEXT): $(osjg_OBJECTS) $(osjg_DEPENDENCIES) + @rm -f osjg$(EXEEXT) + $(CXXLINK) $(osjg_LDFLAGS) $(osjg_OBJECTS) $(osjg_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ + +.cc.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 $@ $< + +.cc.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) '$<'` + +.cc.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 $(PROGRAMS) +installdirs: + 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-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-binPROGRAMS clean-generic clean-libtool 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-binPROGRAMS + +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-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-binPROGRAMS uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Property changes on: src/Makefile.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/main.cpp =================================================================== --- src/main.cpp (rev 0) +++ src/main.cpp 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,106 @@ +#include "ExampleApplication.h" + +// Declare a subclass of the ExampleFrameListener class +class MyListener : public ExampleFrameListener { +public: + MyListener(RenderWindow* win, Camera* cam) : ExampleFrameListener(win, cam) { + } + + bool frameStarted(const FrameEvent& evt) { + return ExampleFrameListener::frameStarted(evt); + } + + bool frameEnded(const FrameEvent& evt) { + return ExampleFrameListener::frameEnded(evt); + } +}; + +// Declare a subclass of the ExampleApplication class +class SampleApp : public ExampleApplication { +public: + SampleApp() { + } + + ~SampleApp() { + } + +protected: + /** + * Creates a camera for the scene + */ + virtual void createCamera() { + // create the camera + mCamera = mSceneMgr->createCamera("PlayerCam"); + + // set its position, direction + mCamera->setPosition(Vector3(0,10,50)); + mCamera->lookAt(Vector3(0,0,0)); + + mCamera->setNearClipDistance(5); + } + + virtual void createViewports(void) { + // Create one viewport, entire window + Viewport* vp = mWindow->addViewport(mCamera); + vp->setBackgroundColour(ColourValue(0,0,0)); + + // Alter the camera aspect ratio to match the viewport + mCamera->setAspectRatio(Real(vp->getActualWidth()) / Real(vp->getActualHeight())); + } + + // Define what is in the scene + virtual void createScene(void) { + + Entity* ent; + + // create an ambient light for the scene + mSceneMgr->setAmbientLight( ColourValue( 1, 1, 1 ) ); + mSceneMgr->setShadowTechnique( SHADOWTYPE_STENCIL_ADDITIVE ); + + // Create an entity + ent = mSceneMgr->createEntity( "Octavius Apteryx", "octavius_apteryx.mesh" ); + mSceneMgr->getRootSceneNode()->createChildSceneNode( )->attachObject(ent); + } + + // Create new frame listener + void createFrameListener(void) { + mFrameListener = new MyListener(mWindow, mCamera); + mRoot->addFrameListener(mFrameListener); + } +}; + +#ifdef __cplusplus +extern "C" { +#endif + +#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 +#define WIN32_LEAN_AND_MEAN +#include "windows.h" +INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT) +#else +int main(int argc, char **argv) +#endif +{ + // Instantiate our subclass + SampleApp myApp; + + try { + // ExampleApplication provides a go method, which starts the rendering. + myApp.go(); + } + catch (Ogre::Exception& e) { +#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 + MessageBox(NULL, e.getFullDescription().c_str(), "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL); +#else + std::cerr << "Exception:\n"; + std::cerr << e.getFullDescription().c_str() << "\n"; +#endif + return 1; + } + + return 0; +} + +#ifdef __cplusplus +} +#endif Property changes on: src/main.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Added: src/media.cfg =================================================================== --- src/media.cfg (rev 0) +++ src/media.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,16 @@ +Mesh=ogrehead.mesh +Mesh=geosphere4500.mesh +Mesh=razor.mesh +Mesh=knot.mesh +Mesh=RZR-002.mesh +Mesh=geosphere8000.mesh +Mesh=sphere.mesh + +CubeMap=cubescene.jpg +CubeMap=early_morning.jpg +CubeMap=cubemap.jpg +CubeMap=morning.jpg +CubeMap=cloudy_noon.jpg +CubeMap=evening.jpg +CubeMap=stormy.jpg +CubeMap=stevecube.jpg Property changes on: src/media.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/ogre.cfg =================================================================== --- src/ogre.cfg (rev 0) +++ src/ogre.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,4 @@ +Render System OpenGL Rendering Subsystem +FSAA 0 +Full Screen No +Video Mode 800 x 600 Property changes on: src/ogre.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/plugins.cfg =================================================================== --- src/plugins.cfg (rev 0) +++ src/plugins.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,12 @@ +# Defines plugins to load + +# Define plugin folder +PluginFolder=/usr/lib/OGRE + +# Define D3D rendering implementation plugin +Plugin=RenderSystem_GL.so +Plugin=Plugin_ParticleFX.so +Plugin=Plugin_BSPSceneManager.so +Plugin=Plugin_OctreeSceneManager.so +Plugin=Plugin_CgProgramManager.so + Property changes on: src/plugins.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/quake3settings.cfg =================================================================== --- src/quake3settings.cfg (rev 0) +++ src/quake3settings.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,2 @@ +Pak0Location: /usr/local/games/quake3/baseq3/pak0.pk3 +Map: maps/q3dm3.bsp Property changes on: src/quake3settings.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/resources.cfg =================================================================== --- src/resources.cfg (rev 0) +++ src/resources.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,23 @@ +# Resource locations to be added to the 'boostrap' path +# This also contains the minimum you need to use the Ogre example framework +[Bootstrap] +Zip=../media/packs/OgreCore.zip + +# Resource locations to be added to the default path +[General] +FileSystem=../data/ships +FileSystem=../media +FileSystem=../media/fonts +FileSystem=../media/materials/programs +FileSystem=../media/materials/scripts +FileSystem=../media/materials/textures +FileSystem=../media/models +FileSystem=../media/overlays +FileSystem=../media/particle +FileSystem=../media/gui +Zip=../media/packs/cubemap.zip +Zip=../media/packs/cubemapsJS.zip +Zip=../media/packs/dragon.zip +Zip=../media/packs/fresneldemo.zip +Zip=../media/packs/ogretestmap.zip +Zip=../media/packs/skybox.zip Property changes on: src/resources.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/terrain.cfg =================================================================== --- src/terrain.cfg (rev 0) +++ src/terrain.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,71 @@ +# The main world texture (if you wish the terrain manager to create a material for you) +WorldTexture=terrain_texture.jpg + +# The detail texture (if you wish the terrain manager to create a material for you) +DetailTexture=terrain_detail.jpg + +#number of times the detail texture will tile in a terrain tile +DetailTile=3 + +# Heightmap source +PageSource=Heightmap + +# Heightmap-source specific settings +Heightmap.image=terrain.png + +# If you use RAW, fill in the below too +# RAW-specific setting - size (horizontal/vertical) +#Heightmap.raw.size=513 +# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit) +#Heightmap.raw.bpp=2 + +# How large is a page of tiles (in vertices)? Must be (2^n)+1 +PageSize=513 + +# How large is each tile? Must be (2^n)+1 and be smaller than PageSize +TileSize=65 + +# The maximum error allowed when determining which LOD to use +MaxPixelError=3 + +# The size of a terrain page, in world units +PageWorldX=1500 +PageWorldZ=1500 +# Maximum height of the terrain +MaxHeight=100 + +# Upper LOD limit +MaxMipMapLevel=5 + +#VertexNormals=yes +#VertexColors=yes +#UseTriStrips=yes + +# Use vertex program to morph LODs, if available +VertexProgramMorph=yes + +# The proportional distance range at which the LOD morph starts to take effect +# This is as a proportion of the distance between the current LODs effective range, +# and the effective range of the next lower LOD +LODMorphStart=0.2 + +# This following section is for if you want to provide your own terrain shading routine +# Note that since you define your textures within the material this makes the +# WorldTexture and DetailTexture settings redundant + +# The name of the vertex program parameter you wish to bind the morph LOD factor to +# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely +# to the same position as the next lower LOD +# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING +#MorphLODFactorParamName=morphFactor + +# The index of the vertex program parameter you wish to bind the morph LOD factor to +# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely +# to the same position as the next lower LOD +# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING +#MorphLODFactorParamIndex=4 + +# The name of the material you will define to shade the terrain +#CustomMaterialName=TestTerrainMaterial + + Property changes on: src/terrain.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: src/world.cfg =================================================================== --- src/world.cfg (rev 0) +++ src/world.cfg 2006-03-31 22:45:37 UTC (rev 6) @@ -0,0 +1,6 @@ +HeightMap=2049x2049_map.png +Scale.x=2.0 +Scale.y=0.6 +Scale.z=2.0 +WorldTexture=terrain_texture.jpg +DetailTexture=terrain_detail.jpg Property changes on: src/world.cfg ___________________________________________________________________ Name: svn:mime-type + text/plain 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-03-31 22:47:07
|
Revision: 7 Author: egore Date: 2006-03-31 14:46:55 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=7&view=rev Log Message: ----------- initial checkin of gettext stuff Added Paths: ----------- po/ po/ChangeLog po/Makefile.in.in po/POTFILES.in Added: po/ChangeLog =================================================================== Property changes on: po/ChangeLog ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: po/Makefile.in.in =================================================================== --- po/Makefile.in.in (rev 0) +++ po/Makefile.in.in 2006-03-31 22:46:55 UTC (rev 7) @@ -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 = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +libdir = @libdir@ +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ + +CC = @CC@ +GENCAT = @GENCAT@ +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ +$(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ + +.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-@USE_NLS@ + +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-@USE_NLS@ +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.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: po/POTFILES.in =================================================================== --- po/POTFILES.in (rev 0) +++ po/POTFILES.in 2006-03-31 22:46:55 UTC (rev 7) @@ -0,0 +1,10 @@ +# List of source files containing translatable strings. + +## Created by Anjuta - will be overwritten +## If you don't want it to overwrite it, +## Please disable it in the Anjuta project configuration + +# Source files +src/main.cc + + Property changes on: po/POTFILES.in ___________________________________________________________________ Name: svn:mime-type + text/plain 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-03-31 23:07:46
|
Revision: 10 Author: egore Date: 2006-03-31 15:07:33 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=10&view=rev Log Message: ----------- some "news" Modified Paths: -------------- NEWS README Modified: NEWS =================================================================== --- NEWS 2006-03-31 23:00:36 UTC (rev 9) +++ NEWS 2006-03-31 23:07:33 UTC (rev 10) @@ -0,0 +1,2 @@ +2006-04-01 +- add code tests Modified: README =================================================================== --- README 2006-03-31 23:00:36 UTC (rev 9) +++ README 2006-03-31 23:07:33 UTC (rev 10) @@ -0,0 +1,10 @@ +Opengate - pre-alpha +==================== + +Currently everything is broken. Don't expect anything to work. Opengate may not +run on your system, may crash, may crash your system or whatever. Beware that +this code is currently only used for testing! + +You need a copy of the ORGESDK/Samples/Media/ in your folder /media, otherwise +you cannot start the game. I will not add this folder since we will not need +it once the game is done. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-03-31 22:23:54
|
Revision: 3 Author: egore Date: 2006-03-31 14:22:58 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=3&view=rev Log Message: ----------- add initial version of the website Added Paths: ----------- website/ website/about.php website/downloads.php website/extlib/ website/extlib/Snoopy.class.inc website/frame.php website/images/ website/images/menu.png website/images/menu.svg website/images/menu_background.png website/images/menu_left.png website/images/menu_right.png website/images/screenshots/ website/images/screenshots/octavius_apteryx.jpg website/images/screenshots/octavius_phoenix.jpg website/images/screenshots/quantar_storm.jpg website/images/screenshots/quantar_typhoon.jpg website/images/screenshots/solrain_intensity.jpg website/images/screenshots/solrain_pioneer.jpg website/images/screenshots/solrain_premia.jpg website/index.html website/layout.inc website/news.php website/rss_cache.inc website/rss_fetch.inc website/rss_parse.inc website/rss_utils.inc website/screenshots.php Added: website/about.php =================================================================== --- website/about.php (rev 0) +++ website/about.php 2006-03-31 22:22:58 UTC (rev 3) @@ -0,0 +1,11 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + +<body> + <?php + require_once('layout.inc'); + + echo "<h1>About</h1><br>"; + + echo "<p>TODO</p>"; + ?> +</body> \ No newline at end of file Property changes on: website/about.php ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: website/downloads.php =================================================================== --- website/downloads.php (rev 0) +++ website/downloads.php 2006-03-31 22:22:58 UTC (rev 3) @@ -0,0 +1,11 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + +<body> + <?php + require_once('layout.inc'); + + echo "<h1>Downloads</h1><br>"; + + echo "<p>TODO</p>"; + ?> +</body> \ No newline at end of file Property changes on: website/downloads.php ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: website/extlib/Snoopy.class.inc =================================================================== --- website/extlib/Snoopy.class.inc (rev 0) +++ website/extlib/Snoopy.class.inc 2006-03-31 22:22:58 UTC (rev 3) @@ -0,0 +1,900 @@ +<?php + +/************************************************* + +Snoopy - the PHP net client +Author: Monte Ohrt <mo...@is...> +Copyright (c): 1999-2000 ispi, all rights reserved +Version: 1.0 + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +You may contact the author of Snoopy by e-mail at: +mo...@is... + +Or, write to: +Monte Ohrt +CTO, ispi +237 S. 70th suite 220 +Lincoln, NE 68510 + +The latest version of Snoopy can be obtained from: +http://snoopy.sourceforge.com + +*************************************************/ + +class Snoopy +{ + /**** Public variables ****/ + + /* user definable vars */ + + var $host = "www.php.net"; // host name we are connecting to + var $port = 80; // port we are connecting to + var $proxy_host = ""; // proxy host to use + var $proxy_port = ""; // proxy port to use + var $agent = "Snoopy v1.0"; // agent we masquerade as + var $referer = ""; // referer info to pass + var $cookies = array(); // array of cookies to pass + // $cookies["username"]="joe"; + var $rawheaders = array(); // array of raw headers to send + // $rawheaders["Content-type"]="text/html"; + + var $maxredirs = 5; // http redirection depth maximum. 0 = disallow + var $lastredirectaddr = ""; // contains address of last redirected address + var $offsiteok = true; // allows redirection off-site + var $maxframes = 0; // frame content depth maximum. 0 = disallow + var $expandlinks = true; // expand links to fully qualified URLs. + // this only applies to fetchlinks() + // or submitlinks() + var $passcookies = true; // pass set cookies back through redirects + // NOTE: this currently does not respect + // dates, domains or paths. + + var $user = ""; // user for http authentication + var $pass = ""; // password for http authentication + + // http accept types + var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; + + var $results = ""; // where the content is put + + var $error = ""; // error messages sent here + var $response_code = ""; // response code returned from server + var $headers = array(); // headers returned from server sent here + var $maxlength = 500000; // max return data length (body) + var $read_timeout = 0; // timeout on read operations, in seconds + // supported only since PHP 4 Beta 4 + // set to 0 to disallow timeouts + var $timed_out = false; // if a read operation timed out + var $status = 0; // http request status + + var $curl_path = "/usr/bin/curl"; + // Snoopy will use cURL for fetching + // SSL content if a full system path to + // the cURL binary is supplied here. + // set to false if you do not have + // cURL installed. See http://curl.haxx.se + // for details on installing cURL. + // Snoopy does *not* use the cURL + // library functions built into php, + // as these functions are not stable + // as of this Snoopy release. + + // send Accept-encoding: gzip? + var $use_gzip = true; + + /**** Private variables ****/ + + var $_maxlinelen = 4096; // max line length (headers) + + var $_httpmethod = "GET"; // default http request method + var $_httpversion = "HTTP/1.0"; // default http request version + var $_submit_method = "POST"; // default submit method + var $_submit_type = "application/x-www-form-urlencoded"; // default submit type + var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type + var $_redirectaddr = false; // will be set if page fetched is a redirect + var $_redirectdepth = 0; // increments on an http redirect + var $_frameurls = array(); // frame src urls + var $_framedepth = 0; // increments on frame depth + + var $_isproxy = false; // set if using a proxy server + var $_fp_timeout = 30; // timeout for socket connection + +/*======================================================================*\ + Function: fetch + Purpose: fetch the contents of a web page + (and possibly other protocols in the + future like ftp, nntp, gopher, etc.) + Input: $URI the location of the page to fetch + Output: $this->results the output text from the fetch +\*======================================================================*/ + + function fetch($URI) + { + + //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS); + $URI_PARTS = parse_url($URI); + if (!empty($URI_PARTS["user"])) + $this->user = $URI_PARTS["user"]; + if (!empty($URI_PARTS["pass"])) + $this->pass = $URI_PARTS["pass"]; + + switch($URI_PARTS["scheme"]) + { + case "http": + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_connect($fp)) + { + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httprequest($URI,$fp,$URI,$this->_httpmethod); + } + else + { + $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httprequest($path, $fp, $URI, $this->_httpmethod); + } + + $this->_disconnect($fp); + + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + $this->fetch($this->_redirectaddr); + } + } + } + + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); + + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } + } + else + { + return false; + } + return true; + break; + case "https": + if(!$this->curl_path || (!is_executable($this->curl_path))) { + $this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n"; + return false; + } + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httpsrequest($URI,$URI,$this->_httpmethod); + } + else + { + $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httpsrequest($path, $URI, $this->_httpmethod); + } + + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + $this->fetch($this->_redirectaddr); + } + } + } + + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); + + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } + return true; + break; + default: + // not a valid protocol + $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; + return false; + break; + } + return true; + } + + + +/*======================================================================*\ + Private functions +\*======================================================================*/ + + +/*======================================================================*\ + Function: _striplinks + Purpose: strip the hyperlinks from an html document + Input: $document document to strip. + Output: $match an array of the links +\*======================================================================*/ + + function _striplinks($document) + { + preg_match_all("'<\s*a\s+.*href\s*=\s* # find <a href= + ([\"\'])? # find single or double quote + (?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching + # quote, otherwise match up to next space + 'isx",$document,$links); + + + // catenate the non-empty matches from the conditional subpattern + + while(list($key,$val) = each($links[2])) + { + if(!empty($val)) + $match[] = $val; + } + + while(list($key,$val) = each($links[3])) + { + if(!empty($val)) + $match[] = $val; + } + + // return the links + return $match; + } + +/*======================================================================*\ + Function: _stripform + Purpose: strip the form elements from an html document + Input: $document document to strip. + Output: $match an array of the links +\*======================================================================*/ + + function _stripform($document) + { + preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements); + + // catenate the matches + $match = implode("\r\n",$elements[0]); + + // return the links + return $match; + } + + + +/*======================================================================*\ + Function: _striptext + Purpose: strip the text from an html document + Input: $document document to strip. + Output: $text the resulting text +\*======================================================================*/ + + function _striptext($document) + { + + // I didn't use preg eval (//e) since that is only available in PHP 4.0. + // so, list your entities one by one here. I included some of the + // more common ones. + + $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript + "'<[\/\!]*?[^<>]*?>'si", // strip out html tags + "'([\r\n])[\s]+'", // strip out white space + "'&(quote|#34);'i", // replace html entities + "'&(amp|#38);'i", + "'&(lt|#60);'i", + "'&(gt|#62);'i", + "'&(nbsp|#160);'i", + "'&(iexcl|#161);'i", + "'&(cent|#162);'i", + "'&(pound|#163);'i", + "'&(copy|#169);'i" + ); + $replace = array( "", + "", + "\\1", + "\"", + "&", + "<", + ">", + " ", + chr(161), + chr(162), + chr(163), + chr(169)); + + $text = preg_replace($search,$replace,$document); + + return $text; + } + +/*======================================================================*\ + Function: _expandlinks + Purpose: expand each link into a fully qualified URL + Input: $links the links to qualify + $URI the full URI to get the base from + Output: $expandedLinks the expanded links +\*======================================================================*/ + + function _expandlinks($links,$URI) + { + + preg_match("/^[^\?]+/",$URI,$match); + + $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]); + + $search = array( "|^http://".preg_quote($this->host)."|i", + "|^(?!http://)(\/)?(?!mailto:)|i", + "|/\./|", + "|/[^\/]+/\.\./|" + ); + + $replace = array( "", + $match."/", + "/", + "/" + ); + + $expandedLinks = preg_replace($search,$replace,$links); + + return $expandedLinks; + } + +/*======================================================================*\ + Function: _httprequest + Purpose: go get the http data from the server + Input: $url the url to fetch + $fp the current open file pointer + $URI the full URI + $body body contents to send if any (POST) + Output: +\*======================================================================*/ + + function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="") + { + if($this->passcookies && $this->_redirectaddr) + $this->setcookies(); + + $URI_PARTS = parse_url($URI); + if(empty($url)) + $url = "/"; + $headers = $http_method." ".$url." ".$this->_httpversion."\r\n"; + if(!empty($this->agent)) + $headers .= "User-Agent: ".$this->agent."\r\n"; + if(!empty($this->host) && !isset($this->rawheaders['Host'])) + $headers .= "Host: ".$this->host."\r\n"; + if(!empty($this->accept)) + $headers .= "Accept: ".$this->accept."\r\n"; + + if($this->use_gzip) { + // make sure PHP was built with --with-zlib + // and we can handle gzipp'ed data + if ( function_exists(gzinflate) ) { + $headers .= "Accept-encoding: gzip\r\n"; + } + else { + trigger_error( + "use_gzip is on, but PHP was built without zlib support.". + " Requesting file(s) without gzip encoding.", + E_USER_NOTICE); + } + } + + if(!empty($this->referer)) + $headers .= "Referer: ".$this->referer."\r\n"; + if(!empty($this->cookies)) + { + if(!is_array($this->cookies)) + $this->cookies = (array)$this->cookies; + + reset($this->cookies); + if ( count($this->cookies) > 0 ) { + $cookie_headers .= 'Cookie: '; + foreach ( $this->cookies as $cookieKey => $cookieVal ) { + $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; "; + } + $headers .= substr($cookie_headers,0,-2) . "\r\n"; + } + } + if(!empty($this->rawheaders)) + { + if(!is_array($this->rawheaders)) + $this->rawheaders = (array)$this->rawheaders; + while(list($headerKey,$headerVal) = each($this->rawheaders)) + $headers .= $headerKey.": ".$headerVal."\r\n"; + } + if(!empty($content_type)) { + $headers .= "Content-type: $content_type"; + if ($content_type == "multipart/form-data") + $headers .= "; boundary=".$this->_mime_boundary; + $headers .= "\r\n"; + } + if(!empty($body)) + $headers .= "Content-length: ".strlen($body)."\r\n"; + if(!empty($this->user) || !empty($this->pass)) + $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n"; + + $headers .= "\r\n"; + + // set the read timeout if needed + if ($this->read_timeout > 0) + socket_set_timeout($fp, $this->read_timeout); + $this->timed_out = false; + + fwrite($fp,$headers.$body,strlen($headers.$body)); + + $this->_redirectaddr = false; + unset($this->headers); + + // content was returned gzip encoded? + $is_gzipped = false; + + while($currentHeader = fgets($fp,$this->_maxlinelen)) + { + if ($this->read_timeout > 0 && $this->_check_timeout($fp)) + { + $this->status=-100; + return false; + } + + // if($currentHeader == "\r\n") + if(preg_match("/^\r?\n$/", $currentHeader) ) + break; + + // if a header begins with Location: or URI:, set the redirect + if(preg_match("/^(Location:|URI:)/i",$currentHeader)) + { + // get URL portion of the redirect + preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches); + // look for :// in the Location header to see if hostname is included + if(!preg_match("|\:\/\/|",$matches[2])) + { + // no host in the path, so prepend + $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port; + // eliminate double slash + if(!preg_match("|^/|",$matches[2])) + $this->_redirectaddr .= "/".$matches[2]; + else + $this->_redirectaddr .= $matches[2]; + } + else + $this->_redirectaddr = $matches[2]; + } + + if(preg_match("|^HTTP/|",$currentHeader)) + { + if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status)) + { + $this->status= $status[1]; + } + $this->response_code = $currentHeader; + } + + if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) { + $is_gzipped = true; + } + + $this->headers[] = $currentHeader; + } + + # $results = fread($fp, $this->maxlength); + $results = ""; + while ( $data = fread($fp, $this->maxlength) ) { + $results .= $data; + if ( + strlen($results) > $this->maxlength ) { + break; + } + } + + // gunzip + if ( $is_gzipped ) { + // per http://www.php.net/manual/en/function.gzencode.php + $results = substr($results, 10); + $results = gzinflate($results); + } + + if ($this->read_timeout > 0 && $this->_check_timeout($fp)) + { + $this->status=-100; + return false; + } + + // check if there is a a redirect meta tag + + if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) + { + $this->_redirectaddr = $this->_expandlinks($match[1],$URI); + } + + // have we hit our frame depth and is there frame src to fetch? + if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) + { + $this->results[] = $results; + for($x=0; $x<count($match[1]); $x++) + $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); + } + // have we already fetched framed content? + elseif(is_array($this->results)) + $this->results[] = $results; + // no framed content + else + $this->results = $results; + + return true; + } + +/*======================================================================*\ + Function: _httpsrequest + Purpose: go get the https data from the server using curl + Input: $url the url to fetch + $URI the full URI + $body body contents to send if any (POST) + Output: +\*======================================================================*/ + + function _httpsrequest($url,$URI,$http_method,$content_type="",$body="") + { + if($this->passcookies && $this->_redirectaddr) + $this->setcookies(); + + $headers = array(); + + $URI_PARTS = parse_url($URI); + if(empty($url)) + $url = "/"; + // GET ... header not needed for curl + //$headers[] = $http_method." ".$url." ".$this->_httpversion; + if(!empty($this->agent)) + $headers[] = "User-Agent: ".$this->agent; + if(!empty($this->host)) + $headers[] = "Host: ".$this->host; + if(!empty($this->accept)) + $headers[] = "Accept: ".$this->accept; + if(!empty($this->referer)) + $headers[] = "Referer: ".$this->referer; + if(!empty($this->cookies)) + { + if(!is_array($this->cookies)) + $this->cookies = (array)$this->cookies; + + reset($this->cookies); + if ( count($this->cookies) > 0 ) { + $cookie_str = 'Cookie: '; + foreach ( $this->cookies as $cookieKey => $cookieVal ) { + $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; "; + } + $headers[] = substr($cookie_str,0,-2); + } + } + if(!empty($this->rawheaders)) + { + if(!is_array($this->rawheaders)) + $this->rawheaders = (array)$this->rawheaders; + while(list($headerKey,$headerVal) = each($this->rawheaders)) + $headers[] = $headerKey.": ".$headerVal; + } + if(!empty($content_type)) { + if ($content_type == "multipart/form-data") + $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary; + else + $headers[] = "Content-type: $content_type"; + } + if(!empty($body)) + $headers[] = "Content-length: ".strlen($body); + if(!empty($this->user) || !empty($this->pass)) + $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); + + for($curr_header = 0; $curr_header < count($headers); $curr_header++) { + $cmdline_params .= " -H \"".$headers[$curr_header]."\""; + } + + if(!empty($body)) + $cmdline_params .= " -d \"$body\""; + + if($this->read_timeout > 0) + $cmdline_params .= " -m ".$this->read_timeout; + + $headerfile = uniqid(time()); + + # accept self-signed certs + $cmdline_params .= " -k"; + exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return); + + if($return) + { + $this->error = "Error: cURL could not retrieve the document, error $return."; + return false; + } + + + $results = implode("\r\n",$results); + + $result_headers = file("/tmp/$headerfile"); + + $this->_redirectaddr = false; + unset($this->headers); + + for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++) + { + + // if a header begins with Location: or URI:, set the redirect + if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader])) + { + // get URL portion of the redirect + preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches); + // look for :// in the Location header to see if hostname is included + if(!preg_match("|\:\/\/|",$matches[2])) + { + // no host in the path, so prepend + $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port; + // eliminate double slash + if(!preg_match("|^/|",$matches[2])) + $this->_redirectaddr .= "/".$matches[2]; + else + $this->_redirectaddr .= $matches[2]; + } + else + $this->_redirectaddr = $matches[2]; + } + + if(preg_match("|^HTTP/|",$result_headers[$currentHeader])) + { + $this->response_code = $result_headers[$currentHeader]; + if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match)) + { + $this->status= $match[1]; + } + } + $this->headers[] = $result_headers[$currentHeader]; + } + + // check if there is a a redirect meta tag + + if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) + { + $this->_redirectaddr = $this->_expandlinks($match[1],$URI); + } + + // have we hit our frame depth and is there frame src to fetch? + if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) + { + $this->results[] = $results; + for($x=0; $x<count($match[1]); $x++) + $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); + } + // have we already fetched framed content? + elseif(is_array($this->results)) + $this->results[] = $results; + // no framed content + else + $this->results = $results; + + unlink("/tmp/$headerfile"); + + return true; + } + +/*======================================================================*\ + Function: setcookies() + Purpose: set cookies for a redirection +\*======================================================================*/ + + function setcookies() + { + for($x=0; $x<count($this->headers); $x++) + { + if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) + $this->cookies[$match[1]] = $match[2]; + } + } + + +/*======================================================================*\ + Function: _check_timeout + Purpose: checks whether timeout has occurred + Input: $fp file pointer +\*======================================================================*/ + + function _check_timeout($fp) + { + if ($this->read_timeout > 0) { + $fp_status = socket_get_status($fp); + if ($fp_status["timed_out"]) { + $this->timed_out = true; + return true; + } + } + return false; + } + +/*======================================================================*\ + Function: _connect + Purpose: make a socket connection + Input: $fp file pointer +\*======================================================================*/ + + function _connect(&$fp) + { + if(!empty($this->proxy_host) && !empty($this->proxy_port)) + { + $this->_isproxy = true; + $host = $this->proxy_host; + $port = $this->proxy_port; + } + else + { + $host = $this->host; + $port = $this->port; + } + + $this->status = 0; + + if($fp = fsockopen( + $host, + $port, + $errno, + $errstr, + $this->_fp_timeout + )) + { + // socket connection succeeded + + return true; + } + else + { + // socket connection failed + $this->status = $errno; + switch($errno) + { + case -3: + $this->error="socket creation failed (-3)"; + case -4: + $this->error="dns lookup failure (-4)"; + case -5: + $this->error="connection refused or timed out (-5)"; + default: + $this->error="connection failed (".$errno.")"; + } + return false; + } + } +/*======================================================================*\ + Function: _disconnect + Purpose: disconnect a socket connection + Input: $fp file pointer +\*======================================================================*/ + + function _disconnect($fp) + { + return(fclose($fp)); + } + + +/*======================================================================*\ + Function: _prepare_post_body + Purpose: Prepare post body according to encoding type + Input: $formvars - form variables + $formfiles - form upload files + Output: post body +\*======================================================================*/ + + function _prepare_post_body($formvars, $formfiles) + { + settype($formvars, "array"); + settype($formfiles, "array"); + + if (count($formvars) == 0 && count($formfiles) == 0) + return; + + switch ($this->_submit_type) { + case "application/x-www-form-urlencoded": + reset($formvars); + while(list($key,$val) = each($formvars)) { + if (is_array($val) || is_object($val)) { + while (list($cur_key, $cur_val) = each($val)) { + $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&"; + } + } else + $postdata .= urlencode($key)."=".urlencode($val)."&"; + } + break; + + case "multipart/form-data": + $this->_mime_boundary = "Snoopy".md5(uniqid(microtime())); + + reset($formvars); + while(list($key,$val) = each($formvars)) { + if (is_array($val) || is_object($val)) { + while (list($cur_key, $cur_val) = each($val)) { + $postdata .= "--".$this->_mime_boundary."\r\n"; + $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n"; + $postdata .= "$cur_val\r\n"; + } + } else { + $postdata .= "--".$this->_mime_boundary."\r\n"; + $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n"; + $postdata .= "$val\r\n"; + } + } + + reset($formfiles); + while (list($field_nam... [truncated message content] |
|
From: <eg...@us...> - 2006-03-31 22:55:24
|
Revision: 8 Author: egore Date: 2006-03-31 14:54:42 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=8&view=rev Log Message: ----------- initia checking of GNU autotools stuff Added Paths: ----------- Makefile.am Makefile.in acconfig.h acinclude.m4 aclocal.m4 autogen.sh config.guess config.h.in config.sub configure.in ltmain.sh opengate.prj opengate.pws stamp-h.in Added: Makefile.am =================================================================== --- Makefile.am (rev 0) +++ Makefile.am 2006-03-31 22:54:42 UTC (rev 8) @@ -0,0 +1,27 @@ +## Process this file with automake to produce Makefile.in +## Created by Anjuta - will be overwritten +## If you don't want it to overwrite it, +## Please disable it in the Anjuta project configuration + +SUBDIRS = po src data + +osjgdocdir = ${prefix}/doc/osjg +osjgdoc_DATA = \ + README\ + COPYING\ + AUTHORS\ + ChangeLog\ + INSTALL\ + NEWS\ + TODO + +EXTRA_DIST = $(osjgdoc_DATA) + +# Copy all the spec files. Of cource, only one is actually used. +dist-hook: + for specfile in *.spec; do \ + if test -f $$specfile; then \ + cp -p $$specfile $(distdir); \ + fi \ + done + Property changes on: Makefile.am ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: Makefile.in =================================================================== --- Makefile.in (rev 0) +++ Makefile.in 2006-03-31 22:54:42 UTC (rev 8) @@ -0,0 +1,692 @@ +# 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@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO acconfig.h config.guess config.sub depcomp install-sh \ + ltmain.sh missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = 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 +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)$(osjgdocdir)" +osjgdocDATA_INSTALL = $(INSTALL_DATA) +DATA = $(osjgdoc_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +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@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +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@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +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@ +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@ +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@ +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@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +SUBDIRS = po src +osjgdocdir = ${prefix}/doc/osjg +osjgdoc_DATA = \ + README\ + COPYING\ + AUTHORS\ + ChangeLog\ + INSTALL\ + NEWS\ + TODO + +EXTRA_DIST = $(osjgdoc_DATA) +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-osjgdocDATA: $(osjgdoc_DATA) + @$(NORMAL_INSTALL) + test -z "$(osjgdocdir)" || $(mkdir_p) "$(DESTDIR)$(osjgdocdir)" + @list='$(osjgdoc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(osjgdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(osjgdocdir)/$$f'"; \ + $(osjgdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(osjgdocdir)/$$f"; \ + done + +uninstall-osjgdocDATA: + @$(NORMAL_UNINSTALL) + @list='$(osjgdoc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(osjgdocdir)/$$f'"; \ + rm -f "$(DESTDIR)$(osjgdocdir)/$$f"; \ + done + +# 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 \ + 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-recursive $(HEADERS) $(SOURCES) config.h.in $(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) config.h.in $(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-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(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) + $(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 \ + 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 + 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 + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(osjgdocdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-recursive +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-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-osjgdocDATA + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am uninstall-osjgdocDATA + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck 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-osjgdocDATA 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 uninstall-osjgdocDATA + + +# Copy all the spec files. Of cource, only one is actually used. +dist-hook: + for specfile in *.spec; do \ + if test -f $$specfile; then \ + cp -p $$specfile $(distdir); \ + fi \ + done +# 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: Makefile.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: acconfig.h =================================================================== --- acconfig.h (rev 0) +++ acconfig.h 2006-03-31 22:54:42 UTC (rev 8) @@ -0,0 +1,14 @@ +#undef ENABLE_NLS +#undef HAVE_CATGETS +#undef HAVE_GETTEXT +#undef HAVE_LC_MESSAGES +#undef HAVE_STPCPY +#undef HAVE_LIBSM +#undef PACKAGE_LOCALE_DIR +#undef PACKAGE_DOC_DIR +#undef PACKAGE_DATA_DIR +#undef PACKAGE_PIXMAPS_DIR +#undef PACKAGE_HELP_DIR +#undef PACKAGE_MENU_DIR +#undef PACKAGE_SOURCE_DIR +#undef GETTEXT_PACKAGE Property changes on: acconfig.h ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: acinclude.m4 =================================================================== --- acinclude.m4 (rev 0) +++ acinclude.m4 2006-03-31 22:54:42 UTC (rev 8) @@ -0,0 +1 @@ +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) Property changes on: acinclude.m4 ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: aclocal.m4 =================================================================== --- aclocal.m4 (rev 0) +++ aclocal.m4 2006-03-31 22:54:42 UTC (rev 8) @@ -0,0 +1,7771 @@ +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file 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. + +# 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_dgettex... [truncated message content] |
|
From: <eg...@us...> - 2006-04-10 18:37:57
|
Revision: 43 Author: egore Date: 2006-04-10 11:36:48 -0700 (Mon, 10 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=43&view=rev Log Message: ----------- implement player avatar plus movement Modified Paths: -------------- ChangeLog Makefile.am NEWS TODO include/Makefile.am include/application.h include/constants.h include/framelistener.h opengate.prj opengate.pws po/POTFILES.in src/Makefile.am src/Makefile.in src/application.cpp src/framelistener.cpp src/main.cpp src/ogre.cfg src/resources.cfg Added Paths: ----------- data/Materials/ data/Materials/octavius_apteryx_auv.material data/Materials/octavius_apteryx_auv.png include/avatar.h src/avatar.cpp Modified: ChangeLog =================================================================== --- ChangeLog 2006-04-10 15:04:49 UTC (rev 42) +++ ChangeLog 2006-04-10 18:36:48 UTC (rev 43) @@ -1,3 +1,31 @@ +2006-04-10 Christoph Brill <eg...@us...> + + * src/framelistener.cpp: add keybindings to movement + + * src/avatar.cpp, src/avatar.h: implement movement based on orientation of + the ship + + * src/avatar.cpp, src/avatar.h: implement rotation based on quaternions + + * src/avatar.cpp, src/avatar.h: implement movement to system axis + +2006-04-09 Christoph Brill <eg...@us...> + + * src/framelistener.cpp: add initial tries to move the avatar + + * src/avatar.cpp, include/avatar.h: add object to represent + interaction with the player, a so called "player avatar" + + * src/framelistener.cpp: comment the source and format it + + * include/framelistener.h: create proper doxygen comments for the class + + * include/application.h, src/application.cpp: No longer derive from the + ExampleFrameapplication + + * include/framelistener.h, src/framelistener.cpp: No longer derive from the + ExampleFramelistener + 2006-04-08 Christoph Brill <eg...@us...> * data/Ships/Octavius/Apteryx/octavius_aptery.mesh.xml, Modified: Makefile.am =================================================================== --- Makefile.am 2006-04-10 15:04:49 UTC (rev 42) +++ Makefile.am 2006-04-10 18:36:48 UTC (rev 43) @@ -17,8 +17,6 @@ EXTRA_DIST = $(opengatedoc_DATA) - - # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ Modified: NEWS =================================================================== --- NEWS 2006-04-10 15:04:49 UTC (rev 42) +++ NEWS 2006-04-10 18:36:48 UTC (rev 43) @@ -1,2 +1,5 @@ +2006-04-10 +- implement basic movement and rotation + 2006-04-01 - add code tests Modified: TODO =================================================================== --- TODO 2006-04-10 15:04:49 UTC (rev 42) +++ TODO 2006-04-10 18:36:48 UTC (rev 43) @@ -0,0 +1,2432 @@ +Index: src/framelistener.cpp +=================================================================== +--- src/framelistener.cpp (Revision 40) ++++ src/framelistener.cpp (Arbeitskopie) +@@ -2,8 +2,8 @@ + * framelistener.cpp + * + * Sat Apr 8 10:51:05 2006 +- * Copyright 2006 User +- * Email ++ * Copyright 2006 Christoph Brill ++ * Email <eg...@us...> + ****************************************************************************/ + + /* +@@ -24,13 +24,382 @@ + + #include "framelistener.h" + +-MyListener::MyListener(RenderWindow* win, Camera* cam) : ExampleFrameListener(win, cam) { ++MyListener::MyListener(RenderWindow* win, Camera* cam, Avatar* avatar, ++ bool useBufferedInputKeys = false, ++ bool useBufferedInputMouse = false) { ++ mDebugOverlay = OverlayManager::getSingleton().getByName("Core/DebugOverlay"); ++ mUseBufferedInputKeys = useBufferedInputKeys; ++ mUseBufferedInputMouse = useBufferedInputMouse; ++ mInputTypeSwitchingOn = mUseBufferedInputKeys || mUseBufferedInputMouse; ++ mRotateSpeed = 36; ++ mMoveSpeed = 100; ++ ++ if (mInputTypeSwitchingOn) { ++ mEventProcessor = new EventProcessor(); ++ mEventProcessor->initialise(win); ++ mEventProcessor->startProcessingEvents(); ++ mEventProcessor->addKeyListener(this); ++ mInputDevice = mEventProcessor->getInputReader(); ++ } else { ++ mInputDevice = PlatformManager::getSingleton().createInputReader(); ++ mInputDevice->initialise(win, true, true); ++ } ++ ++ mCamera = cam; ++ mWindow = win; ++ mAvatar = avatar; ++ mStatsOn = true; ++ mNumScreenShots = 0; ++ mTimeUntilNextToggle = 0; ++ mSceneDetailIndex = 0; ++ mMoveScale = 0.0f; ++ mRotScale = 0.0f; ++ mTranslateVector = Vector3::ZERO; ++ mAniso = 1; ++ mFiltering = TFO_BILINEAR; ++ ++ showDebugOverlay(true); + } + ++MyListener::~MyListener() { ++ if (mInputTypeSwitchingOn) { ++ delete mEventProcessor; ++ } else { ++ PlatformManager::getSingleton().destroyInputReader( mInputDevice ); ++ } ++} ++ ++void MyListener::updateStats() { ++ static String currFps = "Current FPS: "; ++ static String avgFps = "Average FPS: "; ++ static String bestFps = "Best FPS: "; ++ static String worstFps = "Worst FPS: "; ++ static String tris = "Triangle Count: "; ++ ++ // update stats when necessary ++ try { ++ ++ // get the statistics from the window ++ const RenderTarget::FrameStats& stats = mWindow->getStatistics(); ++ ++ // get overlay elements for the statistics ++ OverlayElement* guiAvg = OverlayManager::getSingleton().getOverlayElement("Core/AverageFps"); ++ OverlayElement* guiCurr = OverlayManager::getSingleton().getOverlayElement("Core/CurrFps"); ++ OverlayElement* guiBest = OverlayManager::getSingleton().getOverlayElement("Core/BestFps"); ++ OverlayElement* guiWorst = OverlayManager::getSingleton().getOverlayElement("Core/WorstFps"); ++ OverlayElement* guiTris = OverlayManager::getSingleton().getOverlayElement("Core/NumTris"); ++ OverlayElement* guiDbg = OverlayManager::getSingleton().getOverlayElement("Core/DebugText"); ++ ++ // add textual context to the overlay elements ++ guiAvg->setCaption(avgFps + StringConverter::toString(stats.avgFPS)); ++ guiCurr->setCaption(currFps + StringConverter::toString(stats.lastFPS)); ++ guiBest->setCaption(bestFps + StringConverter::toString(stats.bestFPS) ++ +" "+StringConverter::toString(stats.bestFrameTime)+" ms"); ++ guiWorst->setCaption(worstFps + StringConverter::toString(stats.worstFPS) ++ +" "+StringConverter::toString(stats.worstFrameTime)+" ms"); ++ guiTris->setCaption(tris + StringConverter::toString(stats.triangleCount)); ++ guiDbg->setCaption(mWindow->getDebugText()); ++ ++ } catch(...) { ++ // ignore all errors, because in worst case the statistics are not shown ++ } ++} ++ ++bool MyListener::processUnbufferedKeyInput(const FrameEvent& evt) { ++ ++ // Move avatar forwards ++ if (mInputDevice->isKeyDown(KC_U)) { ++ mAvatar->move(Avatar::FRONT, mMoveScale); ++ } ++ ++ // Move avatar backwards ++ if (mInputDevice->isKeyDown(KC_N)) { ++ mAvatar->move(Avatar::BACK, mMoveScale); ++ } ++ ++ // Move avatar forwards ++ if (mInputDevice->isKeyDown(KC_I)) { ++ mAvatar->move(Avatar::PITCH_DOWN, mMoveScale); ++ } ++ ++ // Move avatar backwards ++ if (mInputDevice->isKeyDown(KC_K)) { ++ mAvatar->move(Avatar::PITCH_UP, mMoveScale); ++ } ++ ++ // Move avatar left ++ if (mInputDevice->isKeyDown(KC_J)) { ++ mAvatar->move(Avatar::YAW_LEFT, mMoveScale); ++ } ++ ++ // Move avatar right ++ if (mInputDevice->isKeyDown(KC_L)) { ++ mAvatar->move(Avatar::YAW_RIGHT, mMoveScale); ++ } ++ ++ // Move avatar up ++ if (mInputDevice->isKeyDown(KC_PERIOD)) { ++ mAvatar->move(Avatar::ROLL_RIGHT, mMoveScale); ++ } ++ ++ // Move avatar down ++ if (mInputDevice->isKeyDown(KC_COMMA)) { ++ mAvatar->move(Avatar::ROLL_LEFT, mMoveScale); ++ } ++ ++ // Move camera left ++ if (mInputDevice->isKeyDown(KC_A)) { ++ mTranslateVector.x = -mMoveScale; ++ } ++ ++ // Move camera right ++ if (mInputDevice->isKeyDown(KC_D)) { ++ mTranslateVector.x = mMoveScale; ++ } ++ ++ // Move camera forward ++ if (mInputDevice->isKeyDown(KC_UP) || mInputDevice->isKeyDown(KC_W) ) { ++ printf("Now\n"); ++ mTranslateVector.z = -mMoveScale; ++ } ++ ++ // Move camera backwards ++ if (mInputDevice->isKeyDown(KC_DOWN) || mInputDevice->isKeyDown(KC_S) ) { ++ mTranslateVector.z = mMoveScale; ++ } ++ ++ // Move camera up ++ if (mInputDevice->isKeyDown(KC_PGUP)) { ++ mTranslateVector.y = mMoveScale; ++ } ++ ++ // Move camera down ++ if (mInputDevice->isKeyDown(KC_PGDOWN)) { ++ mTranslateVector.y = -mMoveScale; ++ } ++ ++ // Rotate kamera right ++ if (mInputDevice->isKeyDown(KC_RIGHT)) { ++ mCamera->yaw(-mRotScale); ++ } ++ ++ // Rotate kamera left ++ if (mInputDevice->isKeyDown(KC_LEFT)) { ++ mCamera->yaw(mRotScale); ++ } ++ ++ // quit game ++ if( mInputDevice->isKeyDown(KC_ESCAPE)) { ++ return false; ++ } ++ ++ // enable immediate or buffered mouse input ++ if (mInputTypeSwitchingOn && mInputDevice->isKeyDown(KC_M) && mTimeUntilNextToggle <= 0) { ++ switchMouseMode(); ++ mTimeUntilNextToggle = 1; ++ } ++ ++ // enable immediate or buffered keyboard input ++ if (mInputTypeSwitchingOn && mInputDevice->isKeyDown(KC_K) && mTimeUntilNextToggle <= 0) { ++ switchKeyMode(); ++ mTimeUntilNextToggle = 1; ++ } ++ ++ // enable/disable statistics display ++ if (mInputDevice->isKeyDown(KC_F) && mTimeUntilNextToggle <= 0) { ++ mStatsOn = !mStatsOn; ++ showDebugOverlay(mStatsOn); ++ ++ mTimeUntilNextToggle = 1; ++ } ++ ++ // switch filtering ++ if (mInputDevice->isKeyDown(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(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(KC_R) && mTimeUntilNextToggle <=0) { ++ mSceneDetailIndex = (mSceneDetailIndex+1)%3; ++ switch(mSceneDetailIndex) { ++ case 0 : mCamera->setDetailLevel(SDL_SOLID) ; break ; ++ case 1 : mCamera->setDetailLevel(SDL_WIREFRAME) ; break ; ++ case 2 : mCamera->setDetailLevel(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 true; ++} ++ ++bool MyListener::processUnbufferedMouseInput(const 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)) { ++ mTranslateVector.x += mInputDevice->getMouseRelativeX() * 0.13; ++ mTranslateVector.y -= mInputDevice->getMouseRelativeY() * 0.13; ++ } ++ else { ++ mRotX = Degree(-mInputDevice->getMouseRelativeX() * 0.13); ++ mRotY = Degree(-mInputDevice->getMouseRelativeY() * 0.13); ++ } ++ ++ return true; ++} ++ ++void MyListener::moveCamera() { ++ if (mTranslateVector != Vector3::ZERO) ++ printf("Then\n"); ++ // Make all the changes to the camera ++ // Note that YAW direction is around a fixed axis (freelook style) rather ++ // than a natural YAW (e.g. airplane) ++ mCamera->yaw(mRotX); ++ mCamera->pitch(mRotY); ++ //TODO:mCamera->roll ++ mCamera->moveRelative(mTranslateVector); ++} ++ ++void MyListener::showDebugOverlay(bool show) { ++ if (mDebugOverlay) { ++ if (show) { ++ mDebugOverlay->show(); ++ } else { ++ mDebugOverlay->hide(); ++ } ++ } ++} ++ + bool MyListener::frameStarted(const FrameEvent& evt) { +- return ExampleFrameListener::frameStarted(evt); ++ if(mWindow->isClosed()) ++ return false; ++ ++ if (!mInputTypeSwitchingOn) { ++ mInputDevice->capture(); ++ } ++ ++ if ( !mUseBufferedInputMouse || !mUseBufferedInputKeys) { ++ // one of the input modes is immediate, so setup what is needed for ++ // immediate mouse/key movement ++ if (mTimeUntilNextToggle >= 0) { ++ mTimeUntilNextToggle -= evt.timeSinceLastFrame; ++ } ++ ++ // If this is the first frame, pick a speed ++ if (evt.timeSinceLastFrame == 0) { ++ mMoveScale = 1; ++ mRotScale = 0.1; ++ ++ // Otherwise scale movement units by time passed since last frame ++ } else { ++ // Move about 100 units per second, ++ mMoveScale = mMoveSpeed * evt.timeSinceLastFrame; ++ // Take about 10 seconds for full rotation ++ mRotScale = mRotateSpeed * evt.timeSinceLastFrame; ++ } ++ mRotX = 0; ++ mRotY = 0; ++ mTranslateVector = Vector3::ZERO; ++ } ++ ++ if (mUseBufferedInputKeys) { ++ // no need to do any processing here, it is handled by event ++ // processor and you get the results as KeyEvents ++ } else { ++ if (processUnbufferedKeyInput(evt) == false) { ++ // Game quit ++ return false; ++ } ++ } ++ ++ if (mUseBufferedInputMouse) { ++ // no need to do any processing here, it is handled by event ++ // processor and you get the results as KeyEvents ++ } else { ++ if (processUnbufferedMouseInput(evt) == false) { ++ // Game quit ++ return false; ++ } ++ } ++ ++ // one of the input modes is immediate, so update the movement vector ++ if ( !mUseBufferedInputMouse || !mUseBufferedInputKeys) { ++ moveCamera(); ++ } ++ ++ return true; + } + + bool MyListener::frameEnded(const FrameEvent& evt) { +- return ExampleFrameListener::frameEnded(evt); ++ updateStats(); ++ return true; + } ++ ++void MyListener::switchMouseMode() { ++ mUseBufferedInputMouse = !mUseBufferedInputMouse; ++ mInputDevice->setBufferedInput(mUseBufferedInputKeys, mUseBufferedInputMouse); ++} ++ ++void MyListener::switchKeyMode() { ++ mUseBufferedInputKeys = !mUseBufferedInputKeys; ++ mInputDevice->setBufferedInput(mUseBufferedInputKeys, mUseBufferedInputMouse); ++} ++ ++void MyListener::keyClicked(KeyEvent* e) { ++ if (e->getKeyChar() == 'm') { ++ switchMouseMode(); ++ } else if (e->getKeyChar() == 'k') { ++ switchKeyMode(); ++ } ++} ++ ++void MyListener::keyPressed(KeyEvent* e) {} ++void MyListener::keyReleased(KeyEvent* e) {} +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in (Revision 40) ++++ src/Makefile.in (Arbeitskopie) +@@ -51,7 +51,7 @@ + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am_opengate_OBJECTS = main.$(OBJEXT) application.$(OBJEXT) \ +- framelistener.$(OBJEXT) ++ framelistener.$(OBJEXT) avatar.$(OBJEXT) + opengate_OBJECTS = $(am_opengate_OBJECTS) + opengate_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -196,7 +196,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + INCLUDES = \ +- -I/usr/include/OGRE -I/usr/include/CEGUI -I/usr/share/doc/ogre-1.0.7/Samples/Common/include -I../include ++ -I/usr/include/OGRE -I/usr/include/CEGUI -I../include + + AM_CXXFLAGS = \ + -g -DEXT_HASH\ +@@ -206,7 +206,8 @@ + opengate_SOURCES = \ + main.cpp\ + application.cpp\ +- framelistener.cpp ++ framelistener.cpp\ ++ avatar.cpp + + opengate_LDFLAGS = \ + -L/usr/local/lib +@@ -286,6 +287,7 @@ + -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)/framelistener.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ + +Index: src/application.cpp +=================================================================== +--- src/application.cpp (Revision 40) ++++ src/application.cpp (Arbeitskopie) +@@ -26,13 +26,79 @@ + #include "constants.h" + + OpengateApp::OpengateApp() { +- ++ mFrameListener = 0; ++ mRoot = 0; + } + + OpengateApp::~OpengateApp() { ++ if (mFrameListener) ++ delete mFrameListener; ++ if (mRoot) ++ delete mRoot; ++} + ++void OpengateApp::go(void) { ++ if (!setup()) ++ return; ++ ++ mRoot->startRendering(); ++ ++ // clean up ++ destroyScene(); + } + ++bool OpengateApp::setup(void) { ++ mRoot = new Root(); ++ ++ setupResources(); ++ ++ bool carryOn = configure(); ++ if (!carryOn) return false; ++ ++ chooseSceneManager(); ++ ++ // Set default mipmap level (NB some APIs ignore this) ++ TextureManager::getSingleton().setDefaultNumMipmaps(5); ++ ++ // Create any resource listeners (for loading screens) ++ createResourceListener(); ++ // Load resources ++ loadResources(); ++ ++ // Create the scene ++ createScene(); ++ ++ createCamera(); ++ createViewports(); ++ ++ createFrameListener(); ++ ++ return true; ++ ++} ++ ++bool OpengateApp::configure(void) { ++ // Show the configuration dialog and initialise the system ++ // You can skip this and use root.restoreConfig() to load configuration ++ // settings if you were sure there are valid ones saved in ogre.cfg ++ if(mRoot->showConfigDialog()) ++ { ++ // If returned true, user clicked OK so initialise ++ // Here we choose to let the system create a default rendering window by passing 'true' ++ mWindow = mRoot->initialise(true); ++ return true; ++ } ++ else ++ { ++ return false; ++ } ++} ++ ++void OpengateApp::chooseSceneManager(void) { ++ // Get the SceneManager, in this case a generic one ++ mSceneMgr = mRoot->getSceneManager(ST_GENERIC); ++} ++ + void OpengateApp::createCamera() { + // create the camera + mCamera = mSceneMgr->createCamera("PlayerCam"); +@@ -40,11 +106,13 @@ + // set its position, direction + mCamera->setPosition(Vector3(0,10,50)); + mCamera->lookAt(Vector3(0,0,0)); ++ //mCamera->setAutoTracking (true, mAvatarNode); // The camera will always look at the camera target ++ //mCamera->setFixedYawAxis (true); // Needed because of auto tracking + + mCamera->setNearClipDistance(5); + } + +-void OpengateApp::createViewports(void) { ++void OpengateApp::createViewports() { + // Create one viewport, entire window + Viewport* vp = mWindow->addViewport(mCamera); + vp->setBackgroundColour(ColourValue(0,0,0)); +@@ -53,21 +121,66 @@ + mCamera->setAspectRatio(Real(vp->getActualWidth()) / Real(vp->getActualHeight())); + } + +-void OpengateApp::createScene(void) { +- Entity* ent; +- ++void OpengateApp::createScene() { + // create an ambient light for the scene + mSceneMgr->setAmbientLight( ColourValue( 1, 1, 1 ) ); + mSceneMgr->setShadowTechnique( SHADOWTYPE_STENCIL_ADDITIVE ); + + // Create an entity +- ent = mSceneMgr->createEntity( "Octavius Apteryx", "Ships/Octavius/Apteryx/octavius_apteryx.mesh" ); +- mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(ent); ++ Entity* ent = mSceneMgr->createEntity( "Octavius Apteryx", "Ships/Octavius/Apteryx/octavius_apteryx.mesh" ); ++ mAvatarNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(); ++ mAvatarNode->attachObject(ent); ++ mAvatarNode->setPosition(Vector3(0,0,30)); ++ mAvatarNode->rotate(Vector3(0.,1.,0.),Degree(-90)); ++ //mSightNode = node->createChildSceneNode ("Octavius Apteryx" + "_sight", Vector3 (0, 0, 100)); ++ mAvatar = new Avatar(mAvatarNode); ++ + ent = mSceneMgr->createEntity( "Quantar Storm", "Ships/Quantar/Storm/quantar_storm.mesh" ); +- mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(ent); ++ SceneNode* node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode(); ++ node2->attachObject(ent); + } ++ ++void OpengateApp::destroyScene(void) { ++ ++} + + void OpengateApp::createFrameListener(void) { +- mFrameListener = new MyListener(mWindow, mCamera); ++ mFrameListener = new MyListener(mWindow, mCamera, mAvatar, false, false); ++ mFrameListener->showDebugOverlay(true); + mRoot->addFrameListener(mFrameListener); + } ++ ++void OpengateApp::setupResources(void) { ++ // Load resource paths from config file ++ ConfigFile cf; ++ cf.load("resources.cfg"); ++ ++ // Go through all sections & settings in the file ++ ConfigFile::SectionIterator seci = cf.getSectionIterator(); ++ ++ String secName, typeName, archName; ++ while (seci.hasMoreElements()) ++ { ++ secName = seci.peekNextKey(); ++ ConfigFile::SettingsMultiMap *settings = seci.getNext(); ++ ConfigFile::SettingsMultiMap::iterator i; ++ for (i = settings->begin(); i != settings->end(); ++i) ++ { ++ typeName = i->first; ++ archName = i->second; ++ ResourceGroupManager::getSingleton().addResourceLocation( ++ archName, typeName, secName); ++ } ++ } ++} ++ ++void OpengateApp::createResourceListener(void) ++{ ++ ++} ++ ++void OpengateApp::loadResources(void) { ++ // Initialise, parse scripts etc ++ ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); ++ ++} +Index: src/main.cpp +=================================================================== +--- src/main.cpp (Revision 40) ++++ src/main.cpp (Arbeitskopie) +@@ -1,3 +1,27 @@ ++/*************************************************************************** ++ * main.cpp ++ * ++ * Sat Apr 8 10:51:05 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 "application.h" + + #ifdef __cplusplus +Index: src/resources.cfg +=================================================================== +--- src/resources.cfg (Revision 40) ++++ src/resources.cfg (Arbeitskopie) +@@ -6,6 +6,7 @@ + # Resource locations to be added to the default path + [General] + FileSystem=../data ++FileSystem=../data/Materials + FileSystem=../media + FileSystem=../media/fonts + FileSystem=../media/materials/programs +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (Revision 40) ++++ src/Makefile.am (Arbeitskopie) +@@ -5,7 +5,7 @@ + ## Please disable it in the Anjuta project configuration + + INCLUDES =\ +- -I/usr/include/OGRE -I/usr/include/CEGUI -I/usr/share/doc/ogre-1.0.7/Samples/Common/include -I../include ++ -I/usr/include/OGRE -I/usr/include/CEGUI -I../include + + AM_CXXFLAGS =\ + -g -DEXT_HASH\ +@@ -17,7 +17,8 @@ + opengate_SOURCES = \ + main.cpp\ + application.cpp\ +- framelistener.cpp ++ framelistener.cpp\ ++ avatar.cpp + + opengate_LDFLAGS = \ + -L/usr/local/lib +Index: src/ogre.cfg +=================================================================== +--- src/ogre.cfg (Revision 32) ++++ src/ogre.cfg (Arbeitskopie) +@@ -1,4 +1,4 @@ + Render System OpenGL Rendering Subsystem + FSAA 0 + Full Screen No +-Video Mode 800 x 600 ++Video Mode 640 x 480 +Index: data/Materials/octavius_apteryx_auv.material +=================================================================== +--- data/Materials/octavius_apteryx_auv.material (Revision 0) ++++ data/Materials/octavius_apteryx_auv.material (Revision 0) +@@ -0,0 +1,13 @@ ++material octavius_apteryx_auv ++{ ++ technique ++ { ++ pass ++ { ++ texture_unit ++ { ++ octavius_apteryx_auv.png ++ } ++ } ++ } ++} +Index: data/Materials/octavius_apteryx_auv.png +=================================================================== +Kann nicht anzeigen: Dateityp ist als bin\xE4r angegeben. +svn:mime-type = application/octet-stream + +Eigenschafts\xE4nderungen: data/Materials/octavius_apteryx_auv.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Index: opengate.pws +=================================================================== +--- opengate.pws (Revision 41) ++++ opengate.pws (Arbeitskopie) +@@ -1,11 +1,11 @@ + + [filenumbers] +-0=28 +-1=8 +-2=25 +-3=25 +-4=41 +-5=66 ++0=589 ++1=209 ++2=134 ++3=173 ++4=28 ++5=58 + 6=1 + + [filemarkers] +@@ -29,13 +29,12 @@ + clean before build=false + + [filelist] +-0=/home/egore/source/opengate/include/constants.h +-1=/home/egore/source/opengate/src/resources.cfg +-2=/home/egore/source/opengate/include/application.h ++0=/home/egore/ogrekram/src/c_PhysicalObject.cpp ++1=/home/egore/ogrekram/src/c_SimpleBody.cpp ++2=/home/egore/source/opengate/src/application.cpp + 3=/home/egore/source/opengate/src/framelistener.cpp +-4=/home/egore/source/opengate/include/framelistener.h +-5=/home/egore/source/opengate/src/application.cpp +-6=/home/egore/source/opengate/src/main.cpp ++4=/home/egore/source/opengate/include/avatar.h ++5=/home/egore/source/opengate/src/avatar.cpp + + [Project Tree] + 0=0 +Index: NEWS +=================================================================== +--- NEWS (Revision 32) ++++ NEWS (Arbeitskopie) +@@ -1,2 +1,5 @@ ++2006-04-10 ++- implement basic movement and rotation ++ + 2006-04-01 + - add code tests +Index: po/POTFILES.in +=================================================================== +--- po/POTFILES.in (Revision 41) ++++ po/POTFILES.in (Arbeitskopie) +@@ -8,5 +8,6 @@ + src/main.cpp + src/application.cpp + src/framelistener.cpp ++src/avatar.cpp + + +Index: include/constants.h +=================================================================== +--- include/constants.h (Revision 39) ++++ include/constants.h (Arbeitskopie) +@@ -2,8 +2,8 @@ + * constants.h + * + * Sat Apr 8 13:13:56 2006 +- * Copyright 2006 User +- * Email ++ * Copyright 2006 Christoph Brill ++ * Email <eg...@us...> + ****************************************************************************/ + + /* +Index: include/framelistener.h +=================================================================== +--- include/framelistener.h (Revision 39) ++++ include/framelistener.h (Arbeitskopie) +@@ -2,8 +2,8 @@ + * framelistener.h + * + * Sat Apr 8 10:50:05 2006 +- * Copyright 2006 User +- * Email ++ * Copyright 2006 Christoph Brill ++ * Email <eg...@us...> + ****************************************************************************/ + + /* +@@ -25,22 +25,207 @@ + #ifndef _FRAMELISTENER_H + #define _FRAMELISTENER_H + +-#include <ExampleFrameListener.h> ++#include <Ogre.h> ++#include <OgreKeyEvent.h> ++#include <OgreEventListeners.h> ++#include <OgreStringConverter.h> ++#include <OgreException.h> ++#include "avatar.h" + + #ifdef __cplusplus + extern "C" + { + #endif + ++using namespace Ogre; ++ + // Declare a subclass of the ExampleFrameListener class +-class MyListener : public ExampleFrameListener { ++class MyListener : public FrameListener, public KeyListener { + public: +- MyListener(RenderWindow* win, Camera* cam); + ++ /*! \brief The constructor that creates the object that reacts to user input ++ * ++ * \param win This constructor takes a RenderWindow because it uses that to ++ * determine input context ++ * \param cam A handle to the camera so we can move it on keyboard or mouse ++ * input ++ * \param useBufferedInputKeys Flag to set if the keyboard input should be ++ * buffered or not ++ * \param useBufferedInputMouse Flag to set if the mouse input should be ++ * buffered or not ++ */ ++ MyListener(RenderWindow* win, Camera* cam, Avatar* avatar, ++ bool useBufferedInputKeys, bool useBufferedInputMouse); ++ ++ /*! \brief The destructor to free the input readers ++ * ++ * It will destroy either the reader for buffered or unbuffered input, ++ * depending on what was chosen in the constructor ++ */ ++ ~MyListener(); ++ ++ /*! \brief This method processes the keyboard events ++ * ++ * This method is called during frameStarted() and only processes unbuffered ++ * keyboard events (if buffered keyboard events are used the are processed ++ * by the InputReader) ++ * ++ * \param evt The frame event from frameStarted() ++ */ ++ bool processUnbufferedKeyInput(const FrameEvent& evt); ++ ++ /*! \brief This method processes the mouse events ++ * ++ * This method is called during frameStarted() and only processes unbuffered ++ * mouse events (if buffered mouse events are used the are processed by the ++ * InputReader calling keyClicked()) ++ * ++ * \param evt The frame event from frameStarted() ++ */ ++ bool processUnbufferedMouseInput(const FrameEvent& evt); ++ ++ /*! \brief Make all the camera movement ++ * ++ * This method is called after the unbuffered input events are processed ++ * and have modified the translation vector, yaw and pitch ++ */ ++ void moveCamera(); ++ ++ /*! \brief Enable or disbale the debug overlay ++ * ++ * This method changes the visibility status of the debug overlay which was ++ * retrieved in the constructor from the overlay manager ++ */ ++ void showDebugOverlay(bool show); ++ ++ /*! \brief Perform user interaction ++ * ++ * This method updates the camera depending on the user interaction (i.e. ++ * keyboard and mouse events). ... [truncated message content] |
|
From: <eg...@us...> - 2006-04-16 17:21:50
|
Revision: 58 Author: egore Date: 2006-04-16 10:20:46 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=58&view=rev Log Message: ----------- add some data copied from ogre Modified Paths: -------------- opengate.pws Added Paths: ----------- data/Makefile.am data/Makefile.in data/Menus/ data/Menus/ogre_menu.zip data/Misc/ Added: data/Makefile.am =================================================================== --- data/Makefile.am (rev 0) +++ data/Makefile.am 2006-04-16 17:20:46 UTC (rev 58) @@ -0,0 +1,20 @@ +## Process this file with automake to produce Makefile.in + +## 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\ + 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 + +EXTRA_DIST = $(opengate_data_DATA) Property changes on: data/Makefile.am ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Makefile.in =================================================================== --- data/Makefile.in (rev 0) +++ data/Makefile.in 2006-04-16 17:20:46 UTC (rev 58) @@ -0,0 +1,383 @@ +# 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 +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__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 = +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) +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@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +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@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +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@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +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@ +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@ +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@ +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@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +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\ + 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 + +EXTRA_DIST = $(opengate_data_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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: +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"; \ + 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 +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/Materials $(distdir)/Menus $(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 \ + 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 $(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 + +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-opengate_dataDATA + +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 uninstall-opengate_dataDATA + +.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 + +# 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:mime-type + text/plain Name: svn:eol-style + native Added: data/Menus/ogre_menu.zip =================================================================== (Binary files differ) Property changes on: data/Menus/ogre_menu.zip ___________________________________________________________________ Name: svn:mime-type + application/zip Modified: opengate.pws =================================================================== --- opengate.pws 2006-04-16 16:46:32 UTC (rev 57) +++ opengate.pws 2006-04-16 17:20:46 UTC (rev 58) @@ -38,25 +38,8 @@ [Project State] clean before build=false -[filelist] -0=/home/egore/source/opengate/src/mouse.cpp -1=/home/egore/source/opengate/src/keyboard.cpp -2=/home/egore/source/opengate/include/avatar.h -3=/home/egore/source/opengate/src/avatar.cpp -4=/home/egore/source/opengate/include/keyboard.h -5=/home/egore/source/opengate/include/mouse.h -6=/home/egore/source/opengate/src/application.cpp -7=/home/egore/source/opengate/include/camera.h -8=/home/egore/source/opengate/src/camera.cpp -9=/home/egore/source/opengate/src/framelistener.cpp -10=/home/egore/source/opengate/include/application.h -11=/home/egore/source/opengate/include/framelistener.h - [Project Tree] 0=0 -1=0:0 -2=0:1 -3=0:2 [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-17 20:16:57
|
Revision: 95 Author: egore Date: 2006-07-17 13:16:48 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=95&view=rev Log Message: ----------- update autogenerated files for support of CEGUI-OGRE Modified Paths: -------------- Makefile.in configure configure.in opengate.kdevelop Modified: Makefile.in =================================================================== --- Makefile.in 2006-07-16 20:54:25 UTC (rev 94) +++ Makefile.in 2006-07-17 20:16:48 UTC (rev 95) @@ -87,6 +87,8 @@ CCDEPMODE = @CCDEPMODE@ CEGUI_CFLAGS = @CEGUI_CFLAGS@ CEGUI_LIBS = @CEGUI_LIBS@ +CEGUI_OGRE_CFLAGS = @CEGUI_OGRE_CFLAGS@ +CEGUI_OGRE_LIBS = @CEGUI_OGRE_LIBS@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ Modified: configure =================================================================== --- configure 2006-07-16 20:54:25 UTC (rev 94) +++ configure 2006-07-17 20:16:48 UTC (rev 95) @@ -859,6 +859,8 @@ AM_LDFLAGS CEGUI_CFLAGS CEGUI_LIBS +CEGUI_OGRE_CFLAGS +CEGUI_OGRE_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -880,7 +882,9 @@ OGRE_CFLAGS OGRE_LIBS CEGUI_CFLAGS -CEGUI_LIBS' +CEGUI_LIBS +CEGUI_OGRE_CFLAGS +CEGUI_OGRE_LIBS' # Initialize some variables set by options. @@ -1493,6 +1497,10 @@ CEGUI_CFLAGS C compiler flags for CEGUI, overriding pkg-config CEGUI_LIBS linker flags for CEGUI, overriding pkg-config + CEGUI_OGRE_CFLAGS + C compiler flags for CEGUI_OGRE, overriding pkg-config + CEGUI_OGRE_LIBS + linker flags for CEGUI_OGRE, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4900,7 +4908,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4903 "configure"' > conftest.$ac_ext + echo '#line 4911 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7379,11 +7387,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7382: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7390: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7386: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7647,11 +7655,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7650: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7654: \$? = $ac_status" >&5 + echo "$as_me:7662: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7751,11 +7759,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7758: \$? = $ac_status" >&5 + echo "$as_me:7766: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10240,7 +10248,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10243 "configure" +#line 10251 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10340,7 +10348,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10343 "configure" +#line 10351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12708,11 +12716,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12719: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12715: \$? = $ac_status" >&5 + echo "$as_me:12723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12812,11 +12820,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12815: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12823: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12819: \$? = $ac_status" >&5 + echo "$as_me:12827: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14419,11 +14427,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14430: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14426: \$? = $ac_status" >&5 + echo "$as_me:14434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14523,11 +14531,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14526: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14534: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14530: \$? = $ac_status" >&5 + echo "$as_me:14538: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16790,11 +16798,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16793: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16801: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16797: \$? = $ac_status" >&5 + echo "$as_me:16805: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17058,11 +17066,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17069: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17065: \$? = $ac_status" >&5 + echo "$as_me:17073: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17162,11 +17170,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17165: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17173: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17169: \$? = $ac_status" >&5 + echo "$as_me:17177: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20024,12 +20032,12 @@ pkg_cv_OGRE_CFLAGS="$OGRE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.1") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OGRE_CFLAGS=`$PKG_CONFIG --cflags "OGRE >= 1.2.0" 2>/dev/null` + pkg_cv_OGRE_CFLAGS=`$PKG_CONFIG --cflags "OGRE >= 1.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -20042,12 +20050,12 @@ pkg_cv_OGRE_LIBS="$OGRE_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.1") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OGRE_LIBS=`$PKG_CONFIG --libs "OGRE >= 1.2.0" 2>/dev/null` + pkg_cv_OGRE_LIBS=`$PKG_CONFIG --libs "OGRE >= 1.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -20066,14 +20074,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "OGRE >= 1.2.0"` + OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "OGRE >= 1.2.1"` else - OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "OGRE >= 1.2.0"` + OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "OGRE >= 1.2.1"` fi # Put the nasty error message in config.log where it belongs echo "$OGRE_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (OGRE >= 1.2.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (OGRE >= 1.2.1) were not met: $OGRE_PKG_ERRORS @@ -20084,7 +20092,7 @@ and OGRE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (OGRE >= 1.2.0) were not met: +echo "$as_me: error: Package requirements (OGRE >= 1.2.1) were not met: $OGRE_PKG_ERRORS @@ -20250,8 +20258,126 @@ AM_LDFLAGS="$AM_LDFLAGS" -ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/common/components/Makefile src/client/input/Makefile src/client/ui/Makefile" +pkg_failed=no +{ echo "$as_me:$LINENO: checking for CEGUI_OGRE" >&5 +echo $ECHO_N "checking for CEGUI_OGRE... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$CEGUI_OGRE_CFLAGS"; then + pkg_cv_CEGUI_OGRE_CFLAGS="$CEGUI_OGRE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 1.2.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CEGUI_OGRE_CFLAGS=`$PKG_CONFIG --cflags "CEGUI-OGRE >= 1.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$CEGUI_OGRE_LIBS"; then + pkg_cv_CEGUI_OGRE_LIBS="$CEGUI_OGRE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 1.2.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CEGUI_OGRE_LIBS=`$PKG_CONFIG --libs "CEGUI-OGRE >= 1.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CEGUI_OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "CEGUI-OGRE >= 1.2.1"` + else + CEGUI_OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "CEGUI-OGRE >= 1.2.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CEGUI_OGRE_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (CEGUI-OGRE >= 1.2.1) were not met: + +$CEGUI_OGRE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (CEGUI-OGRE >= 1.2.1) were not met: + +$CEGUI_OGRE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + CEGUI_OGRE_CFLAGS=$pkg_cv_CEGUI_OGRE_CFLAGS + CEGUI_OGRE_LIBS=$pkg_cv_CEGUI_OGRE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi +AM_CXXFLAGS="$AM_CXXFLAGS $CEGUI_OGRE_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $CEGUI_OGRE_LIBS" +AM_CXXFLAGS="$AM_CXXFLAGS" + +AM_LDFLAGS="$AM_LDFLAGS" + + +ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/client/input/Makefile src/client/ui/Makefile src/common/equipment/capacitors/Makefile src/common/equipment/guns/Makefile src/common/components/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -20842,9 +20968,11 @@ "data/Ships/Conflux/C-1/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-1/Makefile" ;; "data/Ships/Conflux/C-2/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-2/Makefile" ;; "data/Ships/Conflux/C-3/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-3/Makefile" ;; - "src/common/components/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/components/Makefile" ;; "src/client/input/Makefile") CONFIG_FILES="$CONFIG_FILES src/client/input/Makefile" ;; "src/client/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/client/ui/Makefile" ;; + "src/common/equipment/capacitors/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/equipment/capacitors/Makefile" ;; + "src/common/equipment/guns/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/equipment/guns/Makefile" ;; + "src/common/components/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/components/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -21055,11 +21183,13 @@ AM_LDFLAGS!$AM_LDFLAGS$ac_delim CEGUI_CFLAGS!$CEGUI_CFLAGS$ac_delim CEGUI_LIBS!$CEGUI_LIBS$ac_delim +CEGUI_OGRE_CFLAGS!$CEGUI_OGRE_CFLAGS$ac_delim +CEGUI_OGRE_LIBS!$CEGUI_OGRE_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Modified: configure.in =================================================================== --- configure.in 2006-07-16 20:54:25 UTC (rev 94) +++ configure.in 2006-07-17 20:16:48 UTC (rev 95) @@ -7,7 +7,7 @@ AC_PROG_CXX AM_PROG_LIBTOOL -PKG_CHECK_MODULES(OGRE, [OGRE >= 1.2.0]) +PKG_CHECK_MODULES(OGRE, [OGRE >= 1.2.1]) AM_CXXFLAGS="$AM_CXXFLAGS $OGRE_CFLAGS" AM_LDFLAGS="$AM_LDFLAGS $OGRE_LIBS" AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") @@ -19,4 +19,10 @@ AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS") -AC_OUTPUT(Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/common/components/Makefile src/client/input/Makefile src/client/ui/Makefile) +PKG_CHECK_MODULES(CEGUI_OGRE, [CEGUI-OGRE >= 1.2.1]) +AM_CXXFLAGS="$AM_CXXFLAGS $CEGUI_OGRE_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $CEGUI_OGRE_LIBS" +AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") +AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS") + +AC_OUTPUT(Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/client/input/Makefile src/client/ui/Makefile src/common/equipment/capacitors/Makefile src/common/equipment/guns/Makefile src/common/components/Makefile) Modified: opengate.kdevelop =================================================================== --- opengate.kdevelop 2006-07-16 20:54:25 UTC (rev 94) +++ opengate.kdevelop 2006-07-17 20:16:48 UTC (rev 95) @@ -18,7 +18,7 @@ </general> <kdevautoproject> <general> - <activetarget>src/opengate-client</activetarget> + <activetarget>src/common/equipment/libopengate-equipment.la</activetarget> <useconfiguration>debug</useconfiguration> <useactivetarget>true</useactivetarget> </general> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:14:54
|
Revision: 128 Author: egore Date: 2006-07-30 12:14:48 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=128&view=rev Log Message: ----------- OIS support Modified Paths: -------------- configure.in opengate.kdevelop Removed Paths: ------------- Makefile.in configure Deleted: Makefile.in =================================================================== --- Makefile.in 2006-07-30 19:14:10 UTC (rev 127) +++ Makefile.in 2006-07-30 19:14:48 UTC (rev 128) @@ -1,626 +0,0 @@ -# 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@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs -subdir = . -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) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = 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) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AM_CXXFLAGS = @AM_CXXFLAGS@ -AM_LDFLAGS = @AM_LDFLAGS@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CEGUI_CFLAGS = @CEGUI_CFLAGS@ -CEGUI_LIBS = @CEGUI_LIBS@ -CEGUI_OGRE_CFLAGS = @CEGUI_OGRE_CFLAGS@ -CEGUI_OGRE_LIBS = @CEGUI_OGRE_LIBS@ -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@ -OGRE_CFLAGS = @OGRE_CFLAGS@ -OGRE_LIBS = @OGRE_LIBS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -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@ - -# not a GNU package. You can remove this line, if -# have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = src doc data -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -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 \ - 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-recursive $(HEADERS) $(SOURCES) config.h.in $(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) config.h.in $(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-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(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) - $(am__remove_distdir) - mkdir $(distdir) - @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 - 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 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -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-recursive -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-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck 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: Deleted: configure =================================================================== --- configure 2006-07-30 19:14:10 UTC (rev 127) +++ configure 2006-07-30 19:14:48 UTC (rev 128) @@ -1,21795 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for opengate 0.0.1. -# -# Report bugs to <eg...@us...>. -# -# 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. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# 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 - - -# 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 -else - as_unset=false -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. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - 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) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -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 - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -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 -} - -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 - 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 /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - 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 - test "x$as_lineno_1" != "x$as_lineno_2" && - 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 after each line using... [truncated message content] |
|
From: <eg...@us...> - 2006-08-27 12:53:54
|
Revision: 147 Author: egore Date: 2006-08-27 05:53:34 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=147&view=rev Log Message: ----------- update config-files make use of pkgconfig in more places play around with controls and destroy them on the way (will be fixed soon) add networking Modified Paths: -------------- ChangeLog config.guess config.sub configure.in opengate.kdevelop src/client/network.cpp src/client/network.h src/client/ui/ActionConfig.cpp src/client/ui/avatar.h src/opengate_client.cpp src/opengate_server.cpp src/server/network.cpp src/server/network.h Modified: ChangeLog =================================================================== --- ChangeLog 2006-08-05 22:06:37 UTC (rev 146) +++ ChangeLog 2006-08-27 12:53:34 UTC (rev 147) @@ -1,3 +1,15 @@ +2006-08-27 Christoph Brill <eg...@us...> + + * configure.in: add support for libgrapple, add support for libxml2 + + * src/client/network.h, src/client/network.cpp, src/server/network.h, + src/server/network.cpp: drop SDL_net in favour of libgrapple + + * src/opengate-server.cpp: add polling server (1s interval for test + purposes) + + * src/opengate-client.cpp: connect to the server and send a message + 2006-07-30 Christoph Brill <eg...@us...> * src/client/input: drop old handmade inputsystem Modified: config.guess =================================================================== --- config.guess 2006-08-05 22:06:37 UTC (rev 146) +++ config.guess 2006-08-27 12:53:34 UTC (rev 147) @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-02-27' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -228,7 +228,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -788,6 +788,8 @@ case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -798,9 +800,6 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS_NT-*:*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -808,10 +807,10 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -849,6 +848,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; cris:Linux:*:*) echo cris-axis-linux-${LIBC} exit ;; @@ -951,7 +953,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1009,7 +1011,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout Modified: config.sub =================================================================== --- config.sub 2006-08-05 22:06:37 UTC (rev 146) +++ config.sub 2006-08-27 12:53:34 UTC (rev 147) @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-02-27' +timestamp='2006-07-02' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx | dvp \ @@ -249,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -275,11 +276,11 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | strongarm \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ @@ -287,9 +288,6 @@ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -319,7 +317,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -330,7 +328,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -359,7 +357,7 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ @@ -374,8 +372,6 @@ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -1236,7 +1232,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -irx*) + | -skyos* | -haiku* | -rdos* | -toppers* | -irx*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1388,6 +1384,9 @@ # system, and we'll never get to this point. case $basic_machine in + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1397,9 +1396,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 Modified: configure.in =================================================================== --- configure.in 2006-08-05 22:06:37 UTC (rev 146) +++ configure.in 2006-08-27 12:53:34 UTC (rev 147) @@ -26,6 +26,17 @@ AM_CXXFLAGS="$AM_CXXFLAGS $OIS_CFLAGS" AM_LDFLAGS="$AM_LDFLAGS $OIS_LIBS" +#libgrapple - http://grapple.linuxgamepublishing.com/grapple.php +PKG_CHECK_MODULES(GRAPPLE, [grapple >= 0.9]) +AM_CXXFLAGS="$AM_CXXFLAGS $GRAPPLE_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $GRAPPLE_LIBS" + +#libxml2 - http://www.xmlsoft.org/ +PKG_CHECK_MODULES(LIBXML2, [libxml2 >= 2.6]) +AM_CXXFLAGS="$AM_CXXFLAGS $LIBXML2_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $LIBXML2_LIBS" + + AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS") Modified: opengate.kdevelop =================================================================== --- opengate.kdevelop 2006-08-05 22:06:37 UTC (rev 146) +++ opengate.kdevelop 2006-08-27 12:53:34 UTC (rev 147) @@ -13,7 +13,7 @@ <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description/> + <description></description> <versioncontrol>kdevsubversion</versioncontrol> </general> <kdevautoproject> @@ -32,7 +32,7 @@ <opengate-client/> </runarguments> <customdirectory>/</customdirectory> - <programargs/> + <programargs></programargs> <autocompile>true</autocompile> <envvars/> </run> @@ -62,14 +62,14 @@ <f77compiler>kdevg77options</f77compiler> <cxxflags>-O0 -g3</cxxflags> <envvars/> - <topsourcedir/> - <cppflags>`xml2-config --cflags` `sdl-config --cflags`</cppflags> - <ldflags>`xml2-config --libs` `sdl-config --libs` -lSDL_net</ldflags> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> + <topsourcedir></topsourcedir> + <cppflags></cppflags> + <ldflags></ldflags> + <ccompilerbinary></ccompilerbinary> + <cxxcompilerbinary></cxxcompilerbinary> + <f77compilerbinary></f77compilerbinary> + <cflags></cflags> + <f77flags></f77flags> </debug> <default> <envvars/> @@ -224,12 +224,12 @@ </kdevcppsupport> <kdevdebugger> <general> - <programargs/> - <gdbpath/> + <programargs></programargs> + <gdbpath></gdbpath> <dbgshell>libtool</dbgshell> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> + <configGdbScript></configGdbScript> + <runShellScript></runShellScript> + <runGdbScript></runGdbScript> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> Modified: src/client/network.cpp =================================================================== --- src/client/network.cpp 2006-08-05 22:06:37 UTC (rev 146) +++ src/client/network.cpp 2006-08-27 12:53:34 UTC (rev 147) @@ -22,38 +22,29 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "network.h" -#include "../common/exception.h" -#include <SDL/SDL.h> -#include <iostream> +#include <string.h> + Network::Network() { - if (SDLNet_Init () < 0) { - printf ("ERR Net: %s\n", SDLNet_GetError ()); - exit (-1); - } - client_udp_port = 37601; + client = grapple_client_init(PACKAGE_NAME, VERSION); + grapple_client_address_set(client, "localhost"); + grapple_client_port_set(client, 1234); + grapple_client_protocol_set(client, GRAPPLE_PROTOCOL_UDP); + grapple_client_start(client, 0); + //TODO:grapple_client_name_set(client, name); } -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() { + grapple_client_stop(client); + grapple_client_destroy(client); } -Network::~Network() { +void Network::send() { + char* data = "opengate_test_message"; + grapple_confirmid confirm = grapple_client_send(client, GRAPPLE_SERVER, GRAPPLE_RELIABLE, data, strlen(data)); } Modified: src/client/network.h =================================================================== --- src/client/network.h 2006-08-05 22:06:37 UTC (rev 146) +++ src/client/network.h 2006-08-27 12:53:34 UTC (rev 147) @@ -25,19 +25,15 @@ #ifndef _OPENGATE_NETWORK_ #define _OPENGATE_NETWORK_ -#include <SDL/SDL_net.h> +#include <grapple.h> class Network { +private: + grapple_client client; public: Network(); ~Network(); - void open_connection(char* hostname, Uint16 port); -private: - IPaddress* server_ip; - TCPsocket client; - UDPsocket client_udp; - Uint16 client_udp_port; - + void send(); }; #endif Modified: src/client/ui/ActionConfig.cpp =================================================================== --- src/client/ui/ActionConfig.cpp 2006-08-05 22:06:37 UTC (rev 146) +++ src/client/ui/ActionConfig.cpp 2006-08-27 12:53:34 UTC (rev 147) @@ -562,12 +562,10 @@ mRotYScale = 0.0f; } -//--------------------------------------------------------------------------------// -bool ActionConfig::frameStarted(const Ogre::FrameEvent& evt) -{ +bool ActionConfig::frameStarted(const Ogre::FrameEvent& evt) { if (mChar) { - //FIXME:mChar->update (evt.timeSinceLastFrame, mInputDevice); + mChar->update (evt.timeSinceLastFrame, mRotXScale, mRotYScale, 0, mTranslateVector); if (mExCamera) { switch (mMode) { @@ -590,14 +588,14 @@ } } - Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); // Move about 100 units per second, mMoveScale = 100 * evt.timeSinceLastFrame; - cam->yaw(Ogre::Degree(mRotXScale)); - cam->pitch(Ogre::Degree(mRotYScale)); - cam->moveRelative(mTranslateVector); + //Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); + //cam->yaw(Ogre::Degree(mRotXScale)); + //cam->pitch(Ogre::Degree(mRotYScale)); + //cam->moveRelative(mTranslateVector); return true; } @@ -750,10 +748,14 @@ if( axis->absOnly == false ) { //Move using relative Axis - Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); + //Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); - cam->yaw(Ogre::Radian(Ogre::Degree(-axis->relX * 0.13f))); - cam->pitch(Ogre::Radian(Ogre::Degree(-axis->relY * 0.13f))); + /*if (mChar) { + mChar->update (evt.timeSinceLastFrame, mRotXScale, mRotYScale, 0, mTranslateVector); + }*/ + + //cam->yaw(Ogre::Radian(Ogre::Degree(-axis->relX * 0.13f))); + //cam->pitch(Ogre::Radian(Ogre::Degree(-axis->relY * 0.13f))); } else { Modified: src/client/ui/avatar.h =================================================================== --- src/client/ui/avatar.h 2006-08-05 22:06:37 UTC (rev 146) +++ src/client/ui/avatar.h 2006-08-27 12:53:34 UTC (rev 147) @@ -40,7 +40,7 @@ protected: public: // Updates the character (movement...) - virtual void update (Ogre::Real elapsedTime, Ogre::InputReader *input) = 0; + virtual void update (Ogre::Real elapsedTime, float rotXScale, float rotYScale, float rotZScale, Ogre::Vector3 translateVector) = 0; // The three methods below returns the two camera-related nodes, // and the current position of the character (for the 1st person camera) Ogre::SceneNode *getSightNode () { @@ -84,10 +84,14 @@ mSceneMgr->destroySceneNode (mName); } - void update (Ogre::Real elapsedTime, Ogre::InputReader *input) { - // Handle movement - if (input->isKeyDown (Ogre::KC_W)) { - mMainNode->translate (mMainNode->getOrientation () * Ogre::Vector3 (0, 0, 100 * elapsedTime)); + void update (Ogre::Real elapsedTime, float rotXScale, float rotYScale, float rotZScale, Ogre::Vector3 translateVector) { + + mMainNode->yaw(Ogre::Degree(rotXScale)); + mMainNode->pitch(Ogre::Degree(rotYScale)); + mMainNode->roll(Ogre::Degree(rotZScale)); + mMainNode->translate(mMainNode->getOrientation () * translateVector); + + /*mMainNode->translate (mMainNode->getOrientation () * Ogre::Vector3 (0, 0, 100 * elapsedTime)); } if (input->isKeyDown (Ogre::KC_S)) { mMainNode->translate (mMainNode->getOrientation () * Ogre::Vector3 (0, 0, -50 * elapsedTime)); @@ -97,7 +101,7 @@ } if (input->isKeyDown (Ogre::KC_D)) { mMainNode->yaw (Ogre::Radian (-2 * elapsedTime)); - } + }*/ } // Change visibility - Useful for 1st person view ;) Modified: src/opengate_client.cpp =================================================================== --- src/opengate_client.cpp 2006-08-05 22:06:37 UTC (rev 146) +++ src/opengate_client.cpp 2006-08-27 12:53:34 UTC (rev 147) @@ -39,6 +39,8 @@ #include "client/ui/application.h" #include "common/equipment/capacitor.h" +#include "client/network.h" + #include <OISException.h> using namespace std; @@ -66,6 +68,10 @@ cout << "-----------" << std::endl; cout << "Statring up" << std::endl; cout << "-----------" << std::endl; + + Network* nw = new Network(); + nw->send(); + /* Loader* loader = new Loader(); loader->parse_file("money.xml"); cout << loader->get_option("/equipment/name") << std::endl; @@ -146,6 +152,7 @@ delete(f_storage); delete(loader); + delete(nw); cout << "-------------" << std::endl; cout << "Shutting down" << std::endl; Modified: src/opengate_server.cpp =================================================================== --- src/opengate_server.cpp 2006-08-05 22:06:37 UTC (rev 146) +++ src/opengate_server.cpp 2006-08-27 12:53:34 UTC (rev 147) @@ -25,14 +25,40 @@ #include <iostream> #include <cstdlib> +#include <signal.h> -using namespace std; +#include "server/network.h" +bool done; + +/*! @brief a signal handler + * + * This method catches the SIGINT for the server to perform clean shutdown. + * + * @param sig the signal's number (see "man 7 signal") + */ +void shutdown_server(int sig) { + printf("Signal %d caught, starting shutdown.\n", sig); + done = true; +} + int main(int argc, char *argv[]) { - cout << "Statring up" << std::endl; - cout << "-----------" << std::endl; + std::cout << "Statring up" << std::endl; + std::cout << "-----------" << std::endl; - cout << "Shutting down" << std::endl; - cout << "-------------" << std::endl; + signal(SIGINT, shutdown_server); + + done = false; + Network* nw = new Network(2); + while (!done) { + nw->pull(); + sleep(1); + } + + std::cout << "Shutting down" << std::endl; + std::cout << "-------------" << std::endl; + + delete(nw); + return EXIT_SUCCESS; } Modified: src/server/network.cpp =================================================================== --- src/server/network.cpp 2006-08-05 22:06:37 UTC (rev 146) +++ src/server/network.cpp 2006-08-27 12:53:34 UTC (rev 147) @@ -22,39 +22,52 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "network.h" -#include "../common/exception.h" -#include <SDL/SDL.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <iostream> -Network::Network() { - if (SDLNet_Init () < 0) { - printf ("ERR Net: %s\n", SDLNet_GetError ()); - exit (-1); - } - server_udp_port = 37605; - server_tcp_port = 37701; -} +#include "network.h" -void Network::open_connection() { - if (SDLNet_ResolveHost (server_ip, NULL, server_tcp_port) < 0) { - printf ("SDLNet_ResolveHost: %s\n", SDLNet_GetError ()); - SDLNet_Quit(); - exit (-1); - } - server = SDLNet_TCP_Open (server_ip); - if (server == NULL) { - printf ("ERR TCP_Open: %s\n", SDLNet_GetError ()); - SDLNet_Quit (); - exit (-1); - } - server_udp = SDLNet_UDP_Open (server_udp_port); - if (server_udp == NULL) { - printf ("ERR UDP_Open: %s\n", SDLNet_GetError ()); - SDLNet_Quit (); - exit (-1); - } +Network::Network(int max_users) { + server = grapple_server_init(PACKAGE_NAME, VERSION); + grapple_server_port_set(server, 1234); + grapple_server_protocol_set(server, GRAPPLE_PROTOCOL_UDP); + grapple_server_session_set(server, "Opengate Test Server"); + grapple_server_start(server); + grapple_server_maxusers_set(server, max_users); } Network::~Network() { + //TODO: disconnect all clients + grapple_server_stop(server); + grapple_server_destroy(server); } + +void Network::pull() { + std::cout << "pulling" << std::endl; + grapple_message* message = 0; + if (grapple_server_messages_waiting(server)) { + message = grapple_server_message_pull(server); + switch (message->type) { + case GRAPPLE_MSG_NEW_USER: + std::cout << "new user!" << std::endl; + //Your code to handle this message + break; + case GRAPPLE_MSG_USER_NAME: + std::cout << "username!" << std::endl; + //Your code to handle this message + break; + case GRAPPLE_MSG_USER_MSG: + std::cout << "message!" << std::endl; + //Your code to handle this message + break; + case GRAPPLE_MSG_USER_DISCONNECTED: + std::cout << "disconnected!" << std::endl; + //Your code to handle this message + break; + } + grapple_message_dispose(message); + } +} Modified: src/server/network.h =================================================================== --- src/server/network.h 2006-08-05 22:06:37 UTC (rev 146) +++ src/server/network.h 2006-08-27 12:53:34 UTC (rev 147) @@ -25,19 +25,15 @@ #ifndef _OPENGATE_NETWORK_ #define _OPENGATE_NETWORK_ -#include <SDL/SDL_net.h> +#include <grapple.h> class Network { +private: + grapple_server server; public: - Network(); + Network(int max_users); ~Network(); - void open_connection(); -private: - IPaddress* server_ip; - TCPsocket server; - UDPsocket server_udp; - Uint16 server_udp_port; - Uint16 server_tcp_port; + void pull(); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <qr...@us...> - 2006-12-09 17:44:44
|
Revision: 264
http://svn.sourceforge.net/opengate/?rev=264&view=rev
Author: qrstuvw
Date: 2006-12-09 09:44:44 -0800 (Sat, 09 Dec 2006)
Log Message:
-----------
- Moved all the old stuff to the ./branches/old
- Created the allways current ./trunk/docs, ./trunk/data and ./trunk/website
Added Paths:
-----------
tags/OpenGate/
trunk/current/
trunk/data/
Removed Paths:
-------------
AUTHORS
COPYING
ChangeLog
Doxyfile
INSTALL
Makefile.am
Makefile.cvs
Makefile.in
NEWS
README
TODO
aclocal.m4
autogen.sh
autom4te.cache/
config.guess
config.h.in
config.sub
configure
configure.in
configure.in~
data/
debug/
depcomp
doc/
install-sh
ltmain.sh
missing
mkinstalldirs
opengate.kdevelop
opengate.kdevelop.pcs
opengate.kdevses
src/
templates/
website/
Deleted: AUTHORS
===================================================================
--- AUTHORS 2006-12-09 17:17:49 UTC (rev 263)
+++ AUTHORS 2006-12-09 17:44:44 UTC (rev 264)
@@ -1 +0,0 @@
-Christoph Brill <eg...@us...>
Deleted: COPYING
===================================================================
--- COPYING 2006-12-09 17:17:49 UTC (rev 263)
+++ COPYING 2006-12-09 17:44:44 UTC (rev 264)
@@ -1 +0,0 @@
-link /usr/share/automake-1.9/COPYING
\ No newline at end of file
Deleted: ChangeLog
===================================================================
--- ChangeLog 2006-12-09 17:17:49 UTC (rev 263)
+++ ChangeLog 2006-12-09 17:44:44 UTC (rev 264)
@@ -1,197 +0,0 @@
-2006-10-28 Christoph Brill <eg...@us...>
-
- * data/Faction/solrain.xml: add XML for factions, update dtd
- accordingly
-
-2006-10-26 Christoph Brill <eg...@us...>
-
- * doc/coding-style: add information about the coding style of opengate
-
- * src/common/objects/hurtable_object.h,
- src/common/objects/hurtable_object.cpp, src/common/objects/object.h,
- src/common/objects/object.cpp: add hurtable object and document object
-
- * src/server/network_meta.cpp: add method for checking the version
- against the metaserver
-
-2006-10-24 Christoph Brill <eg...@us...>
-
- * src/opengate_client.cpp: add commandline parsing and parameters for
- login
-
-2006-10-23 Christoph Brill <eg...@us...>
-
- * src/common/company.cpp, src/common/company.h,
- src/common/objects/station.cpp, src/common/objects/station.h: more
- XML-loading-work
-
- * src/common/faction.h, src/common/faction_storage.h: doxygen for
- documentation
-
-2006-10-18 Christoph Brill <eg...@us...>
-
- * src/server/network_meta.cpp, src/server/network_meta.h: try porting
- the login mechanism to the new server-infrastructure without success
-
-2006-09-02 Christoph Brill <eg...@us...>
-
- * src/server/network.h, src/server/network.cpp,
- src/server/network_meta.h, src/server/network_meta.cpp: start method
- for checking the servers version against the meta server
-
-2006-09-02 Christoph Brill <eg...@us...>
-
- * src/server/network.h, src/server/network.cpp: handle
- client login and quit request
-
- * src/common/network_protocol.h: add first codes for client and server
- communication
-
- * src/client/network.h, src/client/network.cpp,
- src/opengate_client.cpp: send login to server and quit when client
- quits
-
-2006-08-30 Christoph Brill <eg...@us...>
-
- * src/server/network_meta.h, src/server/network_meta.cpp: add method
- to authenticate against the meta-server
-
- * src/opengate_server.cpp: test method for authentication
-
-2006-08-27 Christoph Brill <eg...@us...>
-
- * configure.in: add support for libgrapple, add support for libxml2
-
- * src/client/network.h, src/client/network.cpp, src/server/network.h,
- src/server/network.cpp: drop SDL_net in favour of libgrapple
-
- * src/opengate-server.cpp: add polling server (1s interval for test
- purposes)
-
- * src/opengate-client.cpp: connect to the server and send a message
-
- * configure.in: fix libxml2 support
-
- * src/opengate-server.cpp: start work on connection to metaserver
-
-2006-07-30 Christoph Brill <eg...@us...>
-
- * src/client/input: drop old handmade inputsystem
-
- * src/client/ui: add new OIS based input system
-
-2006-07-17 Christoph Brill <eg...@us...>
-
- * data/opengate.dtd: extend for ship validation
-
- * src/common/loader.cpp, src/common/loader.h: improve loader for
- array loading
-
- * src/common/equipment/guns/gun.cpp. src/common/equipment/guns/gun.h:
- add empty structure for gun
-
- * src/common/equipment/engine/money.cpp,
- src/common/equipment/engine/money.h: remove useless class
-
- * src/common/equipment/engine/engine.cpp,
- src/common/equipment/engine/engine.h: merge capabilities of class
- Money (setting the filename)
-
- * src/common/ships/ship.cpp, src/common/ships/ship.h: add working
- loader and add most of the attributes (including Engine, ECM, etc.)
-
-2006-07-16 Christoph Brill <eg...@us...>
-
- * src/server/network.cpp, src/client/network.cpp,
- src/opengate_client.cpp, src/common/company.cpp,
- src/common/loader.cpp, src/common/faction.cpp,
- src/common/exception.cpp, src/common/faction_storage.cpp,
- src/common/company_storage.cpp, src/common/objects/movable_object.cpp,
- src/common/objects/object.cpp, src/common/objects/ships/ship.cpp,
- src/common/components/component.cpp,
- src/common/equipment/equipment.cpp,
- src/common/equipment/engines/engine.cpp,
- src/common/equipment/engines/money.cpp,
- src/common/equipment/ecms/ecm.cpp, src/opengate_server.cpp,
- src/server/network.h, src/client/network.h,
- src/common/company_storage.h, src/common/loader.h,
- src/common/company.h, src/common/faction.h, src/common/exception.h,
- src/common/faction_storage.h, src/common/objects/object.h,
- src/common/objects/movable_object.h, src/common/objects/ships/ship.h,
- src/common/components/component.h, src/common/equipment/equipment.h,
- src/common/equipment/engines/engine.h,
- src/common/equipment/engines/money.h, src/common/equipment/ecms/ecm.h:
- sync with loader branch and add a simple XML-parser plus an engine
- that is loaded using it. Introduces validation based on DTD and a
- valid DTD for equipment and ships.
-
-
-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
- abstract class for moving objects by keyboard/mouse(/joystick)
-
-2006-04-15 Christoph Brill <eg...@us...>
-
- * src/gamestate.cpp, include/gamestate.h: add a simple gamestate for
- introducing a CEGUI based UI
-
- * src/camera.cpp, include/camera.h, src/framelistener.cpp,
- framelistner.h: split the camera into own files to strip the
- framelistener down to a minimum
-
- * srC/keyboard.cpp, include/keyboard.h, src/mouse.cpp, src/mouse.h,
- src/framelistener.cpp: split the keyboard and mouse to separate files
-
-2006-04-10 Christoph Brill <eg...@us...>
-
- * src/framelistener.cpp: add keybindings to movement
-
- * src/avatar.cpp, src/avatar.h: implement movement based on orientation
- of the ship
-
- * src/avatar.cpp, src/avatar.h: implement rotation based on quaternions
-
- * src/avatar.cpp, src/avatar.h: implement movement to system axis
-
-2006-04-09 Christoph Brill <eg...@us...>
-
- * src/framelistener.cpp: add initial tries to move the avatar
-
- * src/avatar.cpp, include/avatar.h: add object to represent
- interaction with the player, a so called "player avatar"
-
- * src/framelistener.cpp: comment the source and format it
-
- * include/framelistener.h: create proper doxygen comments for the class
-
- * include/application.h, src/application.cpp: No longer derive from the
- ExampleFrameapplication
-
- * include/framelistener.h, src/framelistener.cpp: No longer derive from
- the ExampleFramelistener
-
-2006-04-08 Christoph Brill <eg...@us...>
-
- * data/Ships/Octavius/Apteryx/octavius_aptery.mesh.xml,
- data/Ships/Octavius/Apteryx/octavius_aptery.mesh,
- data/ships/Quantar/Storm/quantar_storm.mesh.xml,
- data/ships/Quantar/Storm/quantar_storm.mesh : add ogre-mesh of
- the ships to use them ingame
-
- * src/framelistener.cpp, src/application.cpp, src/main.cpp,
- include/framelistener.h, include/application.h: split out classes
- to separate files
-
- * data/Ships: create ships folder
-
-2006-04-01 Christoph Brill <eg...@us...>
-
- * all: initial import
Deleted: Doxyfile
===================================================================
--- Doxyfile 2006-12-09 17:17:49 UTC (rev 263)
+++ Doxyfile 2006-12-09 17:44:44 UTC (rev 264)
@@ -1,273 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = opengate
-PROJECT_NUMBER = 0.0
-OUTPUT_DIRECTORY = /home/egore/source/opengate/doc/API/
-CREATE_SUBDIRS = YES
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = /home/egore/
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = YES
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = YES
-SORT_BY_SCOPE_NAME = YES
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = /home/egore/source/opengate/
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.d \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.m \
- *.mm \
- *.dox \
- *.py \
- *.C \
- *.CC \
- *.C++ \
- *.II \
- *.I++ \
- *.H \
- *.HH \
- *.H++ \
- *.CS \
- *.PHP \
- *.PHP3 \
- *.M \
- *.MM \
- *.PY
-RECURSIVE = YES
-EXCLUDE = /home/egore/source/opengate/website/
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
Deleted: INSTALL
===================================================================
--- INSTALL 2006-12-09 17:17:49 UTC (rev 263)
+++ INSTALL 2006-12-09 17:44:44 UTC (rev 264)
@@ -1 +0,0 @@
-link /usr/share/automake-1.9/INSTALL
\ No newline at end of file
Deleted: Makefile.am
===================================================================
--- Makefile.am 2006-12-09 17:17:49 UTC (rev 263)
+++ Makefile.am 2006-12-09 17:44:44 UTC (rev 264)
@@ -1 +0,0 @@
-SUBDIRS = src doc data
Deleted: Makefile.cvs
===================================================================
--- Makefile.cvs 2006-12-09 17:17:49 UTC (rev 263)
+++ Makefile.cvs 2006-12-09 17:44:44 UTC (rev 264)
@@ -1,8 +0,0 @@
-default: all
-
-all:
- aclocal
- autoheader
- automake
- autoconf
-
Deleted: Makefile.in
===================================================================
--- Makefile.in 2006-12-09 17:17:49 UTC (rev 263)
+++ Makefile.in 2006-12-09 17:44:44 UTC (rev 264)
@@ -1,626 +0,0 @@
-# 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@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- TODO config.guess config.sub depcomp install-sh ltmain.sh \
- missing mkinstalldirs
-subdir = .
-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)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = 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)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CEGUI_CFLAGS = @CEGUI_CFLAGS@
-CEGUI_LIBS = @CEGUI_LIBS@
-CEGUI_OGRE_CFLAGS = @CEGUI_OGRE_CFLAGS@
-CEGUI_OGRE_LIBS = @CEGUI_OGRE_LIBS@
-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@
-GRAPPLE_CFLAGS = @GRAPPLE_CFLAGS@
-GRAPPLE_LIBS = @GRAPPLE_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
-LIBCURL_LIBS = @LIBCURL_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OGRE_CFLAGS = @OGRE_CFLAGS@
-OGRE_LIBS = @OGRE_LIBS@
-OIS_CFLAGS = @OIS_CFLAGS@
-OIS_LIBS = @OIS_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-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@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-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@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = src doc data
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -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)...
[truncated message content] |
|
From: <ult...@us...> - 2007-08-27 16:00:21
|
Revision: 690
http://opengate.svn.sourceforge.net/opengate/?rev=690&view=rev
Author: ultrasick
Date: 2007-08-26 07:33:20 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading mouse cursor
Added Paths:
-----------
branches/ogsector/data/gui/imagesets/cursor.imageset
branches/ogsector/data/gui/imagesets/cursor.png
trunk/templates/data/misc/cursor.blend
Added: branches/ogsector/data/gui/imagesets/cursor.imageset
===================================================================
--- branches/ogsector/data/gui/imagesets/cursor.imageset (rev 0)
+++ branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-26 14:33:20 UTC (rev 690)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Imageset Name="Cursor" Imagefile="cursor.png">
+ <Image Name="Cursor1" XPos="00" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor2" XPos="21" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor3" XPos="42" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor4" XPos="63" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor5" XPos="84" YPos="00" Width="21" Height="21" />
+
+ <Image Name="Cursor6" XPos="00" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor7" XPos="21" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor8" XPos="42" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor9" XPos="63" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor10" XPos="84" YPos="21" Width="21" Height="21" />
+
+ <Image Name="Cursor11" XPos="00" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor12" XPos="21" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor13" XPos="42" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor14" XPos="63" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor15" XPos="84" YPos="42" Width="21" Height="21" />
+
+ <Image Name="Cursor16" XPos="00" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor17" XPos="21" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor18" XPos="42" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor19" XPos="63" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor20" XPos="84" YPos="63" Width="21" Height="21" />
+</Imageset>
Property changes on: branches/ogsector/data/gui/imagesets/cursor.imageset
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/ogsector/data/gui/imagesets/cursor.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/gui/imagesets/cursor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/misc/cursor.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/cursor.blend
___________________________________________________________________
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: <spo...@us...> - 2007-09-10 16:14:19
|
Revision: 718
http://opengate.svn.sourceforge.net/opengate/?rev=718&view=rev
Author: spom_spom
Date: 2007-09-10 09:14:19 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
Add: startup sequence
Modified Paths:
--------------
branches/ogsector/configure.ac
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/GameState.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/GameStateManager.h
branches/ogsector/src/Makefile.am
branches/ogsector/src/Makefile.in
branches/ogsector/src/OpenALSoundManager.cpp
branches/ogsector/src/OpenALSoundManager.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/common.h
branches/ogsector/src/opengateclient.cpp
branches/ogsector/src/testopenalmanager.cpp
Added Paths:
-----------
branches/ogsector/src/InitState.cpp
branches/ogsector/src/InitState.h
trunk/data/startup/bluehigh.ttf
trunk/data/startup/startup.fontdef
trunk/data/startup/startup.material
trunk/data/startup/startup.overlay
Modified: branches/ogsector/configure.ac
===================================================================
--- branches/ogsector/configure.ac 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/configure.ac 2007-09-10 16:14:19 UTC (rev 718)
@@ -46,6 +46,10 @@
dnl # some of the boost headers are needed by asio
#AC_CHECK_HEADER([boost/bind.h])
+AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS -lboost_thread")
+
+
+
#freealut - http://www.openal.org
PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1])
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $freealut_CFLAGS")
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/ogre.cfg 2007-09-10 16:14:19 UTC (rev 718)
@@ -4,4 +4,4 @@
FSAA=6
Full Screen=No
RTT Preferred Mode=FBO
-Video Mode=1024 x 768
+Video Mode=1280 x 1024
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/resources.cfg 2007-09-10 16:14:19 UTC (rev 718)
@@ -1,6 +1,7 @@
# Resource locations to be added to the 'boostrap' path
# This also contains the minimum you need to use the Ogre example framework
[Bootstrap]
+FileSystem=../../trunk/data/startup
# Resource locations to be added to the default path
[General]
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/DockedState.cpp 2007-09-10 16:14:19 UTC (rev 718)
@@ -87,7 +87,7 @@
overlayRootWindow_->addChildWindow( marketDialog_->rootWindow() );
backgroundSound_ = resources_->soundManager->createSoundSourceFromRessource( "sounds/docked/defaultMusic",
- "stationBackground", true, true);
+ "stationBackground", true, true);
clickSound_ = resources_->soundManager->createSoundSourceFromRessource( "sounds/GUI/click", "GUI/click" );
setupEventHandlers();
@@ -102,6 +102,8 @@
sceneMgr_->destroyManualObject( "BackgroundObject" );
sceneMgr_->getRootSceneNode()->removeAndDestroyChild( "Background" );
+ sceneMgr_->destroyCamera( "StationCamera" );
+
CEGUI::WindowManager::getSingleton().destroyWindow( overlayRootWindow_ );
resources_->ogreRoot->destroySceneManager( sceneMgr_ );
}
Modified: branches/ogsector/src/GameState.h
===================================================================
--- branches/ogsector/src/GameState.h 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/GameState.h 2007-09-10 16:14:19 UTC (rev 718)
@@ -157,7 +157,7 @@
protected:
/*! Constructor: This should be a private member of an inherited class. */
- GameState() {};
+ GameState() { overlayRootWindow_ = NULL; }
/*! Destructor: This should be a private member of an inherited class. */
virtual ~GameState( ) {};
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/GameStateManager.cpp 2007-09-10 16:14:19 UTC (rev 718)
@@ -29,6 +29,7 @@
#include <OgreRenderSystem.h>
#include <OgreMesh.h>
#include <OgreMeshManager.h>
+#include <OgreMaterialManager.h>
#include "LogManager.h"
#include "Console.h"
#include "Avatar.h"
@@ -40,6 +41,9 @@
#include "ConfigDialog.h"
#include "EntityManager.h"
+#include "DockedState.h"
+#include "UnDockedState.h"
+
#include <OgreFrameListener.h>
namespace OpenGate {
@@ -47,16 +51,14 @@
GameStateManager::GameStateManager( NetworkClient & nw, bool dialog ) {
resources_.network = & nw;
- log_ = NULL;
- vesselManager_ = NULL;
- configDialog_ = NULL;
+ log_ = NULL;
+ vesselManager_ = NULL;
+ configDialog_ = NULL;
+ log_ = LogManager::getSingletonPtr();
//** without any gamestate, shutdown immediately;
- shutdownRequest_ = true;
+ shutdownRequest_ = initialiseBootstrap( dialog );
- initialiseResources( dialog );
- shutdownRequest_ = false;
-
//** start for test purposes;
// const Ogre::RenderSystemCapabilities * caps = Ogre::Root::getSingleton().getRenderSystem()->getCapabilities();
// if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
@@ -104,8 +106,6 @@
// resources_.ogreRoot->renderOneFrame( );
// }
//** end just for test purposes
-
- configDialog_ = new ConfigDialog( );
}
GameStateManager::~GameStateManager( ){
@@ -183,7 +183,7 @@
}
while ( !shutdownRequest_ ){
- resources_.inputManager->capture();
+ if ( resources_.inputManager ) resources_.inputManager->capture();
captureNetwork();
@@ -277,7 +277,7 @@
// cleanup the current game state
if ( !stateStack_.empty() ) {
cleanup_( stateStack_.back() );
- stateStack_.back()->rootWindow()->removeChildWindow( configDialog_->rootWindow() );
+ if ( stateStack_.back()->rootWindow() ) stateStack_.back()->rootWindow()->removeChildWindow( configDialog_->rootWindow() );
stateStack_.back()->exit();
stateStack_.pop_back();
}
@@ -285,7 +285,7 @@
// store and init the new state
stateStack_.push_back( state );
stateStack_.back()->enter();
- stateStack_.back()->rootWindow()->addChildWindow( configDialog_->rootWindow() );
+ if ( stateStack_.back()->rootWindow() ) stateStack_.back()->rootWindow()->addChildWindow( configDialog_->rootWindow() );
init_( state );
}
@@ -335,15 +335,97 @@
resources_.ogreRoot->removeFrameListener( state );
}
-bool GameStateManager::initialiseResources( bool dialog ){
- log_ = LogManager::getSingletonPtr();
+bool GameStateManager::initialiseBootstrapResources( ) {
+ Ogre::ConfigFile cf; cf.load( "resources.cfg" );
+ // Go through all sections & settings in the file
+ Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
+ Ogre::String secName, typeName, archName;
+
+ while ( seci.hasMoreElements() ) {
+
+ secName = seci.peekNextKey();
+ Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+
+ std::cout << "Ressource: " << secName << std::endl;
+
+ if ( secName == "Bootstrap" ){
+ for ( Ogre::ConfigFile::SettingsMultiMap::iterator i = settings->begin(); i != settings->end(); ++i ){
+ typeName = i->first;
+ archName = i->second;
+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName );
+ resources_.resourcePaths().insert( archName );
+ }
+ }
+ }
+ Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( "Bootstrap" );
+ return true;
+}
+
+bool GameStateManager::initialiseBootstrap( bool dialog ){
resources_.ogreRoot = new Ogre::Root;
+ resources_.gameStateRoot = this;
if ( !initialiseOgreEngine_( dialog ) ) return false;
- if ( !initialiseOgreResources_() ) return false;
+ initialiseBootstrapResources();
+ initLoadingVector();
+ return true;
+}
+void GameStateManager::initLoadingVector(){
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseOgreResources,
+ "initialise Ogre resources" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::checkRenderSystemCapabilities,
+ "check render system capabilities" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseCEGUIEngine,
+ "initialise CEGUI engine" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseInputManager,
+ "initialise input system" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseConsole,
+ "initialise console" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseMiscResources,
+ "initialise opengate miscellaneous resources" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseSoundManager,
+ "initialise sound manager" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseVesselManager,
+ "initialise vessel manager" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseCommodityManager,
+ "initialise commodity manager" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::initialiseEquipmentManager,
+ "initialise equipment manager" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::createAvatar,
+ "create avatar" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::createConfigDialog,
+ "create configuration dialog" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::createDockedState,
+ "create station" ) );
+ loadResourcesVector_.push_back( std::pair< bool (GameStateManager::*)( ),
+ std::string >( &GameStateManager::createUnDockedState,
+ "create sector" ) );
+}
+
+bool GameStateManager::initialiseAllResources( ){
+ for ( uint i = 0; i < loadResourcesVector_.size(); i ++ ){
+ (this->*loadResourcesVector_[ i ].first)();
+ }
+ return true;
+}
+
+bool GameStateManager::checkRenderSystemCapabilities( ){
const Ogre::RenderSystemCapabilities * caps = ResourceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
@@ -354,10 +436,10 @@
log_->warn("Your card does not support dot3 blending or fragment programs." );
ResourceManager::getSingleton().setMappingCapability( false );
}
+ return true;
+}
- if ( !initialiseCEGUIEngine_( ) ) return false;
- if ( !initialiseInputManager_() ) return false;
-
+bool GameStateManager::initialiseConsole(){
resources_.console = new Console( );
resources_.ogreRoot->addFrameListener( resources_.console );
LogManager::getSingleton().setConsole( resources_.console );
@@ -367,19 +449,34 @@
resources_.console->addCommand( "/help", &GameStateManager::CMD_printHelp, "Show this help" );
resources_.console->addCommand( "/time", &GameStateManager::CMD_printTime, "Show current system time" );
resources_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." );
+ return true;
+}
+bool GameStateManager::initialiseMiscResources( ){
resources_.loadGlobalIDs( "ids.xml" );
resources_.load( "stations" );
+ return true;
+}
+bool GameStateManager::initialiseSoundManager(){
resources_.soundManager = new OpenALSoundManager( );
resources_.soundManager->loadRessourceNames( resources_.findFullFileName( "sounds.xml" ) );
+ return true;
+}
+bool GameStateManager::initialiseVesselManager(){
vesselManager_ = new VesselManager( );
vesselManager_->load( resources_.resourcePaths(), "ships" );
+ return true;
+}
+bool GameStateManager::initialiseCommodityManager(){
commodityManager_ = new CommodityManager( );
commodityManager_->load( resources_.resourcePaths(), "commodities" );
+ return true;
+}
+bool GameStateManager::initialiseEquipmentManager(){
equipmentManager_ = new EquipmentManager( );
equipmentManager_->load( resources_.resourcePaths(), "engines" );
equipmentManager_->load( resources_.resourcePaths(), "capacitors" );
@@ -387,9 +484,10 @@
equipmentManager_->load( resources_.resourcePaths(), "shields" );
equipmentManager_->load( resources_.resourcePaths(), "power_plants" );
equipmentManager_->load( resources_.resourcePaths(), "guns" );
+ return true;
+}
- resources_.gameStateRoot = this;
-
+bool GameStateManager::createAvatar(){
resources_.avatar = new Avatar( resources_.network->userName(), resources_.network->userID() );
resources_.avatar->setVessel( *VesselManager::getSingleton().vessel( "apteryx" ) );
resources_.avatar->vessel( )->setPowerPlant( EquipmentManager::getSingleton().powerPlant( "Spud" ) );
@@ -397,11 +495,24 @@
resources_.avatar->vessel( )->setRadar( EquipmentManager::getSingleton().radar( "Outlook" ) );
resources_.avatar->vessel( )->setShield( EquipmentManager::getSingleton().shield( "Kydango" ) );
resources_.avatar->vessel( )->setCapacitor( EquipmentManager::getSingleton().capacitor( "Sponge" ) );
+ return true;
+}
+bool GameStateManager::createConfigDialog(){
+ configDialog_ = new ConfigDialog( );
+ return true;
+}
+bool GameStateManager::createDockedState(){
+ OpenGate::DockedState::create( this, "DockedState" );
return true;
}
+bool GameStateManager::createUnDockedState(){
+ OpenGate::UnDockedState::create( this, "UnDockedState" );
+ return true;
+}
+
bool GameStateManager::initialiseOgreEngine_( bool dialog ){
if ( !dialog ){
resources_.ogreRoot->restoreConfig();
@@ -418,7 +529,7 @@
return false;
}
-bool GameStateManager::initialiseOgreResources_( ) {
+bool GameStateManager::initialiseOgreResources( ) {
// Load resource paths from config file
Ogre::ConfigFile cf; cf.load( "resources.cfg" );
@@ -429,21 +540,26 @@
while ( seci.hasMoreElements() ) {
secName = seci.peekNextKey();
+ std::cout << "Ressource: " << secName << std::endl;
+
Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
- for ( Ogre::ConfigFile::SettingsMultiMap::iterator i = settings->begin(); i != settings->end(); ++i ){
- typeName = i->first;
- archName = i->second;
- Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName );
- resources_.resourcePaths().insert( archName );
+ if ( secName != "Bootstrap" ){
+
+ for ( Ogre::ConfigFile::SettingsMultiMap::iterator i = settings->begin(); i != settings->end(); ++i ){
+ typeName = i->first;
+ archName = i->second;
+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName );
+ resources_.resourcePaths().insert( archName );
+ }
}
}
- Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+ Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( "General" );
return true;
}
-bool GameStateManager::initialiseCEGUIEngine_( ) {
+bool GameStateManager::initialiseCEGUIEngine( ) {
resources_.guiRenderer = new CEGUI::OgreCEGUIRenderer( resources_.renderWindow );
resources_.guiSystem = new CEGUI::System( resources_.guiRenderer );
@@ -459,7 +575,7 @@
return true;
}
-bool GameStateManager::initialiseInputManager_( ) {
+bool GameStateManager::initialiseInputManager( ) {
resources_.inputManager = new InputManager( );
unsigned long hWnd;
Modified: branches/ogsector/src/GameStateManager.h
===================================================================
--- branches/ogsector/src/GameStateManager.h 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/GameStateManager.h 2007-09-10 16:14:19 UTC (rev 718)
@@ -59,8 +59,30 @@
/*! Destructor that cleans up the states before the instance dies. */
~GameStateManager();
- bool initialiseResources( bool dialog );
+ void initLoadingVector();
+ bool initialiseBootstrap( bool dialog );
+ bool initialiseBootstrapResources( );
+ bool initialiseAllResources();
+ bool checkRenderSystemCapabilities( );
+ bool initialiseOgreResources( );
+ bool initialiseCEGUIEngine( );
+ bool initialiseInputManager( );
+
+ bool initialiseConsole();
+
+ //** load id, rank matrix etc.
+ bool initialiseMiscResources();
+ bool initialiseSoundManager();
+ bool initialiseVesselManager();
+ bool initialiseCommodityManager();
+ bool initialiseEquipmentManager();
+ bool createAvatar();
+ bool createConfigDialog();
+ bool createDockedState();
+ bool createUnDockedState();
+
+
ConfigDialog * configDialog() { return configDialog_; }
void switchConfigDialog( );
@@ -99,6 +121,9 @@
// bool enterDockedStateHack_;
+ std::vector< std::pair< bool (GameStateManager::*)( ), std::string > > * pLoadResourcesVector(){
+ return &loadResourcesVector_; }
+
protected:
/*! This initializes a state to receive the events. */
@@ -107,11 +132,7 @@
/*! This removes event handling from a previous state. */
void cleanup_( GameState * state );
-
bool initialiseOgreEngine_( bool dialog );
- bool initialiseOgreResources_( );
- bool initialiseCEGUIEngine_( );
- bool initialiseInputManager_( );
LogManager * log_;
VesselManager * vesselManager_;
@@ -126,6 +147,9 @@
bool shutdownRequest_;
ConfigDialog * configDialog_;
+
+ std::vector< std::pair< bool (GameStateManager::*)( ), std::string > > loadResourcesVector_;
+
};
} // namespace OpenGate
Added: branches/ogsector/src/InitState.cpp
===================================================================
--- branches/ogsector/src/InitState.cpp (rev 0)
+++ branches/ogsector/src/InitState.cpp 2007-09-10 16:14:19 UTC (rev 718)
@@ -0,0 +1,106 @@
+/***************************************************************************
+ * Copyright (C) 2006 by OpenGate development team *
+ * spo...@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 "InitState.h"
+#include "InputManager.h"
+#include "GameStateManager.h"
+
+#include <OgreMaterialManager.h>
+
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreRenderWindow.h>
+#include <OgreManualObject.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayElement.h>
+
+namespace OpenGate{
+
+InitState::InitState(){
+ sceneMgr_ = NULL;
+ loadStep_ = 0;
+}
+
+void InitState::createContent(){
+ sceneMgr_ = resources_->ogreRoot->createSceneManager( Ogre::ST_GENERIC, "IntroSceneManager" );
+ sceneMgr_->createCamera( "IntroCamera" );
+
+ Ogre::OverlayManager::getSingleton().getByName( "Startup" )->show();
+
+ loadResourcesVector_ = dynamic_cast< GameStateManager * >( parent_ )->pLoadResourcesVector();
+}
+
+void InitState::destroyContent(){
+
+ sceneMgr_->destroyCamera( "IntroSceneManager" );
+ resources_->ogreRoot->getAutoCreatedWindow()->removeAllViewports();
+ resources_->ogreRoot->destroySceneManager( sceneMgr_ );
+}
+
+void InitState::enter( ) {
+ Ogre::OverlayManager::getSingleton().getByName( "Startup" )->show();
+
+ Ogre::Viewport * vp = resources_->renderWindow->addViewport( sceneMgr_->getCamera( "IntroCamera" ),
+ 0, 0.0, 0.0, 1.0f, 1.0f );
+ vp->setBackgroundColour( Ogre::ColourValue( 0.0, 0.0, 0.0 ) );
+
+// resources_->inputManager->addKeyListener( this, "InitStateKeyListener" );
+// resources_->inputManager->addMouseListener( this, "InitStateMouseListener" );
+}
+
+void InitState::exit(){
+ Ogre::OverlayManager::getSingleton().getByName( "Startup" )->hide();
+ resources_->renderWindow->removeAllViewports();
+// resources_->inputManager->removeMouseListener( "InitStateMouseListener" );
+// resources_->inputManager->removeKeyListener( "InitStateKeyListener" );
+}
+
+bool InitState::frameStarted( const Ogre::FrameEvent & evt ){
+ if ( loadStep_ != loadResourcesVector_->size() ){
+ Ogre::OverlayManager::getSingleton().getOverlayElement( "Startup/TextArea" )
+ ->setCaption( ". . . " + (*loadResourcesVector_)[ loadStep_ ].second );
+ Ogre::OverlayManager::getSingleton().getOverlayElement( "Startup/Counter" )
+ ->setCaption( toStr( loadStep_+1 ) + "/" + toStr( loadResourcesVector_->size() ) );
+ }
+ return true;
+}
+
+bool InitState::frameEnded( const Ogre::FrameEvent & evt ){
+ if ( loadStep_ < loadResourcesVector_->size() ){
+ (dynamic_cast< GameStateManager * >( parent_ )->*(*loadResourcesVector_)[ loadStep_ ].first)();
+ loadStep_ ++;
+ } else if ( loadStep_ == loadResourcesVector_->size() ){
+ parent_->changeGameState( parent_->findByName( "DockedState" ) );
+ return false;
+ }
+ return true;
+}
+
+bool InitState::keyPressed( const OIS::KeyEvent & e ){
+ if ( e.key == OIS::KC_ESCAPE) { parent_->shutdown(); }
+
+ return true;
+}
+
+bool InitState::keyReleased( const OIS::KeyEvent & e ){
+ return true;
+}
+
+} // namespace OpenGate
Added: branches/ogsector/src/InitState.h
===================================================================
--- branches/ogsector/src/InitState.h (rev 0)
+++ branches/ogsector/src/InitState.h 2007-09-10 16:14:19 UTC (rev 718)
@@ -0,0 +1,84 @@
+/***************************************************************************
+ * Copyright (C) 2007 by OpenGate development team *
+ * spo...@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_INITSTATELISTENER__H
+#define _OPENGATE_INITSTATELISTENER__H
+
+#include <OgrePrerequisites.h>
+
+#include "LogManager.h"
+#include "GameState.h"
+#include "GameStateManager.h"
+
+#include <boost/thread/thread.hpp>
+
+namespace OpenGate{
+
+class OpenALSoundSource;
+
+/*!
+ * \brief This class defines the intro gamestate
+ *
+ * \author Carsten <spo...@us...>
+ */
+
+class InitResources;
+
+class InitState : public GameState {
+public:
+
+ DECLARE_GAMESTATE_CLASS( InitState );
+
+ virtual void createContent( );
+
+ virtual void destroyContent( );
+
+ /*! Inherit to supply game state enter code. */
+ virtual void enter( );
+
+ /*! Inherit to supply state exit code. */
+ virtual void exit( );
+
+ virtual bool frameStarted( const Ogre::FrameEvent & evt );
+ virtual bool frameEnded( const Ogre::FrameEvent & evt );
+
+ virtual bool keyPressed( const OIS::KeyEvent & e );
+ virtual bool keyReleased( const OIS::KeyEvent & e );
+
+ virtual bool mouseMoved(const OIS::MouseEvent&){ return true; }
+ virtual bool mousePressed(const OIS::MouseEvent&, OIS::MouseButtonID){ return true; }
+ virtual bool mouseReleased(const OIS::MouseEvent&, OIS::MouseButtonID){ return true; }
+ virtual bool buttonPressed(const OIS::JoyStickEvent&, int){ return true; }
+ virtual bool buttonReleased(const OIS::JoyStickEvent&, int){ return true; }
+ virtual bool axisMoved(const OIS::JoyStickEvent&, int){ return true; }
+
+protected:
+ InitState();
+ virtual ~InitState(){}
+
+ Ogre::SceneManager * sceneMgr_;
+ uint loadStep_;
+ std::vector< std::pair< bool (GameStateManager::*)( ), std::string > > * loadResourcesVector_;
+
+};
+
+} // namespace OpenGate
+
+#endif // _OPENGATE_DOCKEDSTATELISTENER__H
Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/Makefile.am 2007-09-10 16:14:19 UTC (rev 718)
@@ -35,6 +35,8 @@
GameStateManager.cpp \
InputManager.h \
InputManager.cpp \
+ InitState.h \
+ InitState.cpp \
LogManager.h \
LogManager.cpp \
MarketDialog.h \
Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/Makefile.in 2007-09-10 16:14:19 UTC (rev 718)
@@ -55,12 +55,12 @@
ConfigDialog.$(OBJEXT) Console.$(OBJEXT) DockedState.$(OBJEXT) \
Entity.$(OBJEXT) EntityManager.$(OBJEXT) GameState.$(OBJEXT) \
GameStateManager.$(OBJEXT) InputManager.$(OBJEXT) \
- LogManager.$(OBJEXT) MarketDialog.$(OBJEXT) \
- OpcodeWrapper.$(OBJEXT) OpenALSoundManager.$(OBJEXT) \
- Projectile.$(OBJEXT) ResourceManager.$(OBJEXT) \
- Sector.$(OBJEXT) SectorObjects.$(OBJEXT) \
- ShipConfigDialog.$(OBJEXT) Station.$(OBJEXT) \
- UnDockedState.$(OBJEXT) Vessel.$(OBJEXT) \
+ InitState.$(OBJEXT) LogManager.$(OBJEXT) \
+ MarketDialog.$(OBJEXT) OpcodeWrapper.$(OBJEXT) \
+ OpenALSoundManager.$(OBJEXT) Projectile.$(OBJEXT) \
+ ResourceManager.$(OBJEXT) Sector.$(OBJEXT) \
+ SectorObjects.$(OBJEXT) ShipConfigDialog.$(OBJEXT) \
+ Station.$(OBJEXT) UnDockedState.$(OBJEXT) Vessel.$(OBJEXT) \
VesselManager.$(OBJEXT) metaserver.$(OBJEXT)
opengateclient_OBJECTS = $(am_opengateclient_OBJECTS)
opengateclient_LDADD = $(LDADD)
@@ -225,6 +225,8 @@
GameStateManager.cpp \
InputManager.h \
InputManager.cpp \
+ InitState.h \
+ InitState.cpp \
LogManager.h \
LogManager.cpp \
MarketDialog.h \
@@ -378,6 +380,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EntityManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GameState.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GameStateManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitState.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InputManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MarketDialog.Po@am__quote@
Modified: branches/ogsector/src/OpenALSoundManager.cpp
===================================================================
--- branches/ogsector/src/OpenALSoundManager.cpp 2007-09-04 13:00:29 UTC (rev 717)
+++ branches/ogsector/src/OpenALSoundManager.cpp 2007-09-10 16:14:19 UTC (rev 718)
@@ -26,21 +26,21 @@
#include <cerrno>
#include <OgreRoot.h>
-#ifdef WIN32
-#include <al.h>
-#include <alc.h>
-extern "C" {
-ALenum alutGetError (void);
-const char *alutGetErrorString (ALenum error);
-ALvoid * alutLoadMemoryFromFile (const char *fileName, ALenum *format, ALsizei *size, ALfloat *frequency);
- void alutLoadWAVFile( ALbyte *fileName, ALenum *format, void **data, ALsizei *size,
- ALsizei *frequency, ALboolean *loop);
-}
-#else
-#include <AL/alut.h>
+#ifdef WIN32
+#include <al.h>
+#include <alc.h>
+
+extern "C" {
+ ALenum alutGetError( void );
+ const char *alutGetErrorString( ALenum error );
+ ALvoid * alutLoadMemoryFromFile( const char *fileName, ALenum *format, ALsizei *size, ALfloat *frequency );
+ void alutLoadWAVFile( ALbyte *fileName, ALenum *format, void **data, ALsizei *size,
+ ALsizei *frequency, ALboolean *loop);
+}
+#else
+#include <AL/alut.h>
#endif
-
#define STREAM_BUFFER_SIZE (4096 * 100)
namespace Ope...
[truncated message content] |
|
From: <ult...@us...> - 2007-10-05 15:58:30
|
Revision: 822
http://opengate.svn.sourceforge.net/opengate/?rev=822&view=rev
Author: ultrasick
Date: 2007-10-05 08:58:34 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
adding the last missing nebulae
+ correcting filename of ESO 510-G13 in the templates dir.
Added Paths:
-----------
templates/skybox/objects/eso_510-g13.png
templates/skybox/objects/ic_434_-_horsehead_nebula.png
templates/skybox/objects/ic_4406_-_retina_nebula.png
templates/skybox/objects/ic_5070_-_pelican_nebula.jpg
templates/skybox/objects/ngc_3372_-_carina_nebula.jpg
trunk/data/skybox/objects/ic_434_-_horsehead_nebula.png
trunk/data/skybox/objects/ic_434_-_horsehead_nebula.xml
trunk/data/skybox/objects/ic_4406_-_retina_nebula.png
trunk/data/skybox/objects/ic_4406_-_retina_nebula.xml
trunk/data/skybox/objects/ic_5070_-_pelican_nebula.png
trunk/data/skybox/objects/ic_5070_-_pelican_nebula.xml
trunk/data/skybox/objects/ngc_3372_-_carina_nebula.png
trunk/data/skybox/objects/ngc_3372_-_carina_nebula.xml
trunk/data/skybox/objects/ngc_5882.png
trunk/data/skybox/objects/ngc_5882.xml
Removed Paths:
-------------
templates/skybox/objects/eso510g13.png
Deleted: templates/skybox/objects/eso510g13.png
===================================================================
(Binary files differ)
Added: templates/skybox/objects/eso_510-g13.png
===================================================================
(Binary files differ)
Property changes on: templates/skybox/objects/eso_510-g13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/skybox/objects/ic_434_-_horsehead_nebula.png
===================================================================
(Binary files differ)
Property changes on: templates/skybox/objects/ic_434_-_horsehead_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/skybox/objects/ic_4406_-_retina_nebula.png
===================================================================
(Binary files differ)
Property changes on: templates/skybox/objects/ic_4406_-_retina_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/skybox/objects/ic_5070_-_pelican_nebula.jpg
===================================================================
(Binary files differ)
Property changes on: templates/skybox/objects/ic_5070_-_pelican_nebula.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/skybox/objects/ngc_3372_-_carina_nebula.jpg
===================================================================
(Binary files differ)
Property changes on: templates/skybox/objects/ngc_3372_-_carina_nebula.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ic_434_-_horsehead_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_434_-_horsehead_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ic_434_-_horsehead_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_434_-_horsehead_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ic_4406_-_retina_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_4406_-_retina_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ic_4406_-_retina_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_4406_-_retina_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ic_5070_-_pelican_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_5070_-_pelican_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ic_5070_-_pelican_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ic_5070_-_pelican_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_3372_-_carina_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_3372_-_carina_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_3372_-_carina_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_3372_-_carina_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_5882.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_5882.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_5882.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_5882.xml
___________________________________________________________________
Name: svn:mime-type
+ application/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: <ult...@us...> - 2007-11-16 23:16:38
|
Revision: 840
http://opengate.svn.sourceforge.net/opengate/?rev=840&view=rev
Author: ultrasick
Date: 2007-11-16 15:16:40 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
used a "work around" for the plutonium and the uranium model to avoid the bug in blender. Coder you can remove the fall back support for all other images but objectname_big.png and objectname_small.png now.
Modified Paths:
--------------
templates/commodities/plutonium.blend
templates/commodities/uranium.blend
Added Paths:
-----------
trunk/data/commodities/plutonium_big.png
trunk/data/commodities/plutonium_small.png
trunk/data/commodities/uranium_big.png
trunk/data/commodities/uranium_small.png
Removed Paths:
-------------
trunk/data/commodities/plutonium.png
trunk/data/commodities/uranium.png
Modified: templates/commodities/plutonium.blend
===================================================================
(Binary files differ)
Modified: templates/commodities/uranium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/plutonium.png
===================================================================
(Binary files differ)
Added: trunk/data/commodities/plutonium_big.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/plutonium_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/plutonium_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/plutonium_small.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/commodities/uranium.png
===================================================================
(Binary files differ)
Added: trunk/data/commodities/uranium_big.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/uranium_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/uranium_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/uranium_small.png
___________________________________________________________________
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: <ult...@us...> - 2007-11-25 22:17:04
|
Revision: 870
http://opengate.svn.sourceforge.net/opengate/?rev=870&view=rev
Author: ultrasick
Date: 2007-11-25 14:17:09 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
adding new model with proper UV mapping. The ship isn't fully texturized jet but I did enough texturization for today.
Added Paths:
-----------
templates/ships/tauseti/lady_kickstart/lady_kickstart1.blend
templates/ships/tauseti/lady_kickstart/texture_map.pspimage
trunk/data/ships/tauseti/lady_kickstart/texture_map.png
Added: templates/ships/tauseti/lady_kickstart/lady_kickstart1.blend
===================================================================
(Binary files differ)
Property changes on: templates/ships/tauseti/lady_kickstart/lady_kickstart1.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/ships/tauseti/lady_kickstart/texture_map.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/ships/tauseti/lady_kickstart/texture_map.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/lady_kickstart/texture_map.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/lady_kickstart/texture_map.png
___________________________________________________________________
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-03-31 23:01:22
|
Revision: 9 Author: egore Date: 2006-03-31 15:00:36 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=9&view=rev Log Message: ----------- end inital import Added Paths: ----------- COPYING INSTALL NEWS README TODO configure depcomp install-sh missing mkinstalldirs setup-gettext Added: COPYING =================================================================== --- COPYING (rev 0) +++ COPYING 2006-03-31 23:00:36 UTC (rev 9) @@ -0,0 +1 @@ +link /usr/share/automake-1.9/COPYING \ No newline at end of file Property changes on: COPYING ___________________________________________________________________ Name: svn:special + * Name: svn:mime-type + text/plain Name: propset + svn:eol-style Name: svn:eol-style + native Added: INSTALL =================================================================== --- INSTALL (rev 0) +++ INSTALL 2006-03-31 23:00:36 UTC (rev 9) @@ -0,0 +1 @@ +link /usr/share/automake-1.9/INSTALL \ No newline at end of file Property changes on: INSTALL ___________________________________________________________________ Name: svn:special + * Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: NEWS =================================================================== Property changes on: NEWS ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: README =================================================================== Property changes on: README ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: TODO =================================================================== Property changes on: TODO ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: configure =================================================================== --- configure (rev 0) +++ configure 2006-03-31 23:00:36 UTC (rev 9) @@ -0,0 +1,23921 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.59. +# +# Copyright (C) 2003 Free Software Foundation, Inc. +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# 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+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi +DUALCASE=1; export DUALCASE # for MKS sh + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + 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 + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# 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 +fi + + + 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 + + ;; + 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 + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /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 + /*) + if ("$as_dir/$as_base" -c ' + 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 + + # 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. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$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 + # 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= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +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='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 + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_executable_p="test -f" + +# 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'" + +# Sed expression to map a string onto a valid variable name. +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} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +echo=${ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<EOF +$* +EOF + exit 0 +fi + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + + +tagnames=${tagnames+${tagnames},}CXX + +tagnames=${tagnames+${tagnames},}F77 + +# 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_config_libobj_dir=. +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= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + +ac_unique_file="configure.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include <stdio.h> +#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#if STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# if HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#if HAVE_STRINGS_H +# include <strings.h> +#endif +#if HAVE_INTTYPES_H +# include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif +#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_files='' + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# 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. +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +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' + +ac_prev= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_option in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { 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" ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { 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'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { 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'" ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { 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" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + 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'" + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } +fi + +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $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; }; };; + esac +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 + {... [truncated message content] |
|
From: <eg...@us...> - 2006-04-08 13:10:34
|
Revision: 39 Author: egore Date: 2006-04-08 06:10:17 -0700 (Sat, 08 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=39&view=rev Log Message: ----------- add headers for the splitted classes Added Paths: ----------- include/ include/Makefile.am include/Makefile.in include/application.h include/constants.h include/framelistener.h Added: include/Makefile.am =================================================================== --- include/Makefile.am (rev 0) +++ include/Makefile.am 2006-04-08 13:10:17 UTC (rev 39) @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +## Created by Anjuta - will be overwritten +## If you don't want it to overwrite it, +## Please disable it in the Anjuta project configuration + +opengate_includedir = $(pkgincludedir) + +opengate_include_DATA = \ + application.h\ + framelistener.h\ + constants.h + +EXTRA_DIST = $(opengate_include_DATA) Property changes on: include/Makefile.am ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: include/Makefile.in =================================================================== --- include/Makefile.in (rev 0) +++ include/Makefile.in 2006-04-08 13:10:17 UTC (rev 39) @@ -0,0 +1,376 @@ +# 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 = include +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__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 = +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_includedir)" +opengate_includeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(opengate_include_DATA) +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@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +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@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +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@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +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@ +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@ +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@ +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@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +opengate_includedir = $(pkgincludedir) +opengate_include_DATA = \ + application.h\ + framelistener.h\ + constants.h + +EXTRA_DIST = $(opengate_include_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 include/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu include/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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: +install-opengate_includeDATA: $(opengate_include_DATA) + @$(NORMAL_INSTALL) + test -z "$(opengate_includedir)" || $(mkdir_p) "$(DESTDIR)$(opengate_includedir)" + @list='$(opengate_include_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(opengate_includeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(opengate_includedir)/$$f'"; \ + $(opengate_includeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(opengate_includedir)/$$f"; \ + done + +uninstall-opengate_includeDATA: + @$(NORMAL_UNINSTALL) + @list='$(opengate_include_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(opengate_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(opengate_includedir)/$$f"; \ + done +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 $(DATA) +installdirs: + for dir in "$(DESTDIR)$(opengate_includedir)"; 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-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-opengate_includeDATA + +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 uninstall-opengate_includeDATA + +.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_includeDATA 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_includeDATA + +# 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: include/Makefile.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: include/application.h =================================================================== --- include/application.h (rev 0) +++ include/application.h 2006-04-08 13:10:17 UTC (rev 39) @@ -0,0 +1,94 @@ +/*************************************************************************** + * application.h + * + * Sat Apr 8 10:26:58 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 _APPLICATION_H +#define _APPLICATION_H + +#include <ExampleApplication.h> +#include "framelistener.h" + +#ifdef __cplusplus +extern "C" +{ +#endif + +/*! + * + */ +class OpengateApp : public ExampleApplication { +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(); + +protected: + /*! \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. + */ + virtual void createCamera(); + + /*! \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. + */ + virtual void createViewports(void); + + /*! \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. + */ + virtual void createScene(void); + + /*! \biref Create the frame listener for the game + * + * This method creates the framelistener necessary to render a scene + */ + void createFrameListener(void); +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _APPLICATION_H */ Property changes on: include/application.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: include/constants.h =================================================================== --- include/constants.h (rev 0) +++ include/constants.h 2006-04-08 13:10:17 UTC (rev 39) @@ -0,0 +1,33 @@ +/*************************************************************************** + * constants.h + * + * Sat Apr 8 13:13:56 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 _CONSTANTS_H +#define _CONSTANTS_H + +#define SHIPDIR "Ships" +#define OCTAVIUS "Octavius" +#define QUANTAR "Quantar" +#define SOLRAIN "Solrain" + +#endif /* _CONSTANTS_H */ Property changes on: include/constants.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: include/framelistener.h =================================================================== --- include/framelistener.h (rev 0) +++ include/framelistener.h 2006-04-08 13:10:17 UTC (rev 39) @@ -0,0 +1,50 @@ +/*************************************************************************** + * framelistener.h + * + * Sat Apr 8 10:50:05 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 _FRAMELISTENER_H +#define _FRAMELISTENER_H + +#include <ExampleFrameListener.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +// Declare a subclass of the ExampleFrameListener class +class MyListener : public ExampleFrameListener { +public: + MyListener(RenderWindow* win, Camera* cam); + + bool frameStarted(const FrameEvent& evt); + + bool frameEnded(const FrameEvent& evt); + +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _FRAMELISTENER_H */ Property changes on: include/framelistener.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr 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-04-08 13:36:20
|
Revision: 41 Author: egore Date: 2006-04-08 06:35:48 -0700 (Sat, 08 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=41&view=rev Log Message: ----------- rename some internal targets Modified Paths: -------------- ChangeLog Makefile.am Makefile.in config.guess config.sub configure configure.in opengate.prj opengate.pws po/POTFILES.in Modified: ChangeLog =================================================================== --- ChangeLog 2006-04-08 13:12:24 UTC (rev 40) +++ ChangeLog 2006-04-08 13:35:48 UTC (rev 41) @@ -1,3 +1,17 @@ +2006-04-08 Christoph Brill <eg...@us...> + + * data/Ships/Octavius/Apteryx/octavius_aptery.mesh.xml, + data/Ships/Octavius/Apteryx/octavius_aptery.mesh, + data/ships/Quantar/Storm/quantar_storm.mesh.xml, + data/ships/Quantar/Storm/quantar_storm.mesh : add ogre-mesh of + the ships to use them ingame + + * src/framelistener.cpp, src/application.cpp, src/main.cpp, + include/framelistener.h, include/application.h: split out classes + to separate files + + * data/Ships: create ships folder + 2006-04-01 Christoph Brill <eg...@us...> * all: initial import Modified: Makefile.am =================================================================== --- Makefile.am 2006-04-08 13:12:24 UTC (rev 40) +++ Makefile.am 2006-04-08 13:35:48 UTC (rev 41) @@ -3,10 +3,10 @@ ## If you don't want it to overwrite it, ## Please disable it in the Anjuta project configuration -SUBDIRS = po src data +SUBDIRS = po include src data -osjgdocdir = ${prefix}/doc/osjg -osjgdoc_DATA = \ +opengatedocdir = ${prefix}/doc/opengate +opengatedoc_DATA = \ README\ COPYING\ AUTHORS\ @@ -15,8 +15,10 @@ NEWS\ TODO -EXTRA_DIST = $(osjgdoc_DATA) +EXTRA_DIST = $(opengatedoc_DATA) + + # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ Modified: Makefile.in =================================================================== --- Makefile.in 2006-04-08 13:12:24 UTC (rev 40) +++ Makefile.in 2006-04-08 13:35:48 UTC (rev 41) @@ -66,9 +66,9 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(osjgdocdir)" -osjgdocDATA_INSTALL = $(INSTALL_DATA) -DATA = $(osjgdoc_DATA) +am__installdirs = "$(DESTDIR)$(opengatedocdir)" +opengatedocDATA_INSTALL = $(INSTALL_DATA) +DATA = $(opengatedoc_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -208,9 +208,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = po src -osjgdocdir = ${prefix}/doc/osjg -osjgdoc_DATA = \ +SUBDIRS = po include src data +opengatedocdir = ${prefix}/doc/opengate +opengatedoc_DATA = \ README\ COPYING\ AUTHORS\ @@ -219,7 +219,7 @@ NEWS\ TODO -EXTRA_DIST = $(osjgdoc_DATA) +EXTRA_DIST = $(opengatedoc_DATA) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -284,22 +284,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-osjgdocDATA: $(osjgdoc_DATA) +install-opengatedocDATA: $(opengatedoc_DATA) @$(NORMAL_INSTALL) - test -z "$(osjgdocdir)" || $(mkdir_p) "$(DESTDIR)$(osjgdocdir)" - @list='$(osjgdoc_DATA)'; for p in $$list; do \ + test -z "$(opengatedocdir)" || $(mkdir_p) "$(DESTDIR)$(opengatedocdir)" + @list='$(opengatedoc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(osjgdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(osjgdocdir)/$$f'"; \ - $(osjgdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(osjgdocdir)/$$f"; \ + echo " $(opengatedocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(opengatedocdir)/$$f'"; \ + $(opengatedocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(opengatedocdir)/$$f"; \ done -uninstall-osjgdocDATA: +uninstall-opengatedocDATA: @$(NORMAL_UNINSTALL) - @list='$(osjgdoc_DATA)'; for p in $$list; do \ + @list='$(opengatedoc_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(osjgdocdir)/$$f'"; \ - rm -f "$(DESTDIR)$(osjgdocdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(opengatedocdir)/$$f'"; \ + rm -f "$(DESTDIR)$(opengatedocdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -584,7 +584,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(osjgdocdir)"; do \ + for dir in "$(DESTDIR)$(opengatedocdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -631,7 +631,7 @@ info-am: -install-data-am: install-osjgdocDATA +install-data-am: install-opengatedocDATA install-exec-am: @@ -659,7 +659,7 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-osjgdocDATA +uninstall-am: uninstall-info-am uninstall-opengatedocDATA uninstall-info: uninstall-info-recursive @@ -672,12 +672,13 @@ distuninstallcheck 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-osjgdocDATA install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-opengatedocDATA 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 uninstall-osjgdocDATA + uninstall uninstall-am uninstall-info-am \ + uninstall-opengatedocDATA # Copy all the spec files. Of cource, only one is actually used. Modified: config.guess =================================================================== --- config.guess 2006-04-08 13:12:24 UTC (rev 40) +++ config.guess 2006-04-08 13:35:48 UTC (rev 41) @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-23' +timestamp='2006-02-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -223,6 +224,9 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -794,6 +798,9 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -802,8 +809,11 @@ echo ${UNAME_MACHINE}-pc-pw32 exit ;; x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + echo i586-pc-interix${UNAME_RELEASE} exit ;; + EM64T:Interix*:[345]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -873,7 +883,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; mips64:Linux:*:*) @@ -892,7 +906,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or32:Linux:*:*) @@ -991,7 +1009,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout @@ -1001,7 +1019,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit Modified: config.sub =================================================================== --- config.sub 2006-04-08 13:12:24 UTC (rev 40) +++ config.sub 2006-04-08 13:35:48 UTC (rev 41) @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-23' +timestamp='2006-02-27' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -268,15 +269,16 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -298,10 +300,6 @@ ms1) basic_machine=mt-unknown ;; - nios2 | nios2-* | nios2 | nios2-*) - basic_machine=nios2-altera - os=-none - ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -354,17 +352,18 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -1148,7 +1147,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1221,7 +1220,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ Modified: configure =================================================================== --- configure 2006-04-08 13:12:24 UTC (rev 40) +++ configure 2006-04-08 13:35:48 UTC (rev 41) @@ -1802,7 +1802,7 @@ # Define the identity of the package. - PACKAGE=osjg + PACKAGE=opengate VERSION=0.1 @@ -5986,7 +5986,7 @@ -GETTEXT_PACKAGE=osjg +GETTEXT_PACKAGE=opengate cat >>confdefs.h <<_ACEOF @@ -22434,7 +22434,7 @@ _ACEOF - ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile" + ac_config_files="$ac_config_files Makefile po/Makefile.in include/Makefile src/Makefile data/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23015,7 +23015,9 @@ # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; Modified: configure.in =================================================================== --- configure.in 2006-04-08 13:12:24 UTC (rev 40) +++ configure.in 2006-04-08 13:35:48 UTC (rev 41) @@ -95,6 +95,7 @@ AC_OUTPUT([ Makefile po/Makefile.in +include/Makefile src/Makefile data/Makefile ]) Modified: opengate.prj =================================================================== --- opengate.prj 2006-04-08 13:12:24 UTC (rev 40) +++ opengate.prj 2006-04-08 13:35:48 UTC (rev 41) @@ -66,12 +66,17 @@ module.include.name=include module.include.type= -module.include.files= +module.include.files=\ + application.h\ + framelistener.h\ + constants.h module.source.name=src module.source.type= module.source.files=\ - main.cc + main.cpp\ + application.cpp\ + framelistener.cpp module.pixmap.name=pixmaps module.pixmap.type= @@ -80,8 +85,8 @@ module.data.name=data module.data.type= module.data.files=\ - Octavius/Apteryx/octavius_apteryx.mesh\ - Octavius/Apteryx/octavius_apteryx.mesh.xml + Ships/Octavius/Apteryx/octavius_apteryx.mesh\ + Ships/Quantar/Storm/quantar_storm.mesh module.help.name=help module.help.type= @@ -97,7 +102,8 @@ compiler.options.include.paths=\ /usr/include/OGRE\ /usr/include/CEGUI\ - /usr/share/doc/ogre-1.0.7/Samples/Common/include + /usr/share/doc/ogre-1.0.7/Samples/Common/include\ + ../include compiler.options.library.paths=\ /usr/local/lib compiler.options.libraries=\ Modified: opengate.pws =================================================================== --- opengate.pws 2006-04-08 13:12:24 UTC (rev 40) +++ opengate.pws 2006-04-08 13:35:48 UTC (rev 41) @@ -1,9 +1,21 @@ [filenumbers] -0=33 +0=28 +1=8 +2=25 +3=25 +4=41 +5=66 +6=1 [filemarkers] 0= +1= +2= +3= +4= +5= +6= [File View] filter.file.unmatch=*.so *.o *.a *.la @@ -17,12 +29,19 @@ clean before build=false [filelist] -0=/home/egore/source/opengate/src/main.cc +0=/home/egore/source/opengate/include/constants.h +1=/home/egore/source/opengate/src/resources.cfg +2=/home/egore/source/opengate/include/application.h +3=/home/egore/source/opengate/src/framelistener.cpp +4=/home/egore/source/opengate/include/framelistener.h +5=/home/egore/source/opengate/src/application.cpp +6=/home/egore/source/opengate/src/main.cpp [Project Tree] 0=0 1=0:0 2=0:1 +3=0:2 [File Tree] 0=0 Modified: po/POTFILES.in =================================================================== --- po/POTFILES.in 2006-04-08 13:12:24 UTC (rev 40) +++ po/POTFILES.in 2006-04-08 13:35:48 UTC (rev 41) @@ -5,6 +5,8 @@ ## Please disable it in the Anjuta project configuration # Source files -src/main.cc +src/main.cpp +src/application.cpp +src/framelistener.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-04-14 14:29:53
|
Revision: 53 Author: egore Date: 2006-04-14 07:29:31 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=53&view=rev Log Message: ----------- get rid of default OGRE stuff we don't want and don't need Modified Paths: -------------- opengate.pws src/application.cpp src/resources.cfg Added Paths: ----------- data/Materials/common.material data/Materials/skybox.zip data/Materials/tat/ Removed Paths: ------------- src/media.cfg src/quake3settings.cfg src/terrain.cfg src/world.cfg Added: data/Materials/common.material =================================================================== --- data/Materials/common.material (rev 0) +++ data/Materials/common.material 2006-04-14 14:29:31 UTC (rev 53) @@ -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/common.material ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: data/Materials/skybox.zip =================================================================== (Binary files differ) Property changes on: data/Materials/skybox.zip ___________________________________________________________________ Name: svn:mime-type + application/zip Modified: opengate.pws =================================================================== --- opengate.pws 2006-04-14 12:52:46 UTC (rev 52) +++ opengate.pws 2006-04-14 14:29:31 UTC (rev 53) @@ -1,10 +1,10 @@ [filenumbers] -0=589 -1=209 -2=134 -3=173 -4=28 +0=86 +1=1 +2=112 +3=86 +4=43 5=58 6=1 @@ -29,12 +29,8 @@ clean before build=false [filelist] -0=/home/egore/ogrekram/src/c_PhysicalObject.cpp -1=/home/egore/ogrekram/src/c_SimpleBody.cpp -2=/home/egore/source/opengate/src/application.cpp -3=/home/egore/source/opengate/src/framelistener.cpp -4=/home/egore/source/opengate/include/avatar.h -5=/home/egore/source/opengate/src/avatar.cpp +0=/home/egore/source/opengate/src/application.cpp +1=/home/egore/source/opengate/src/main.cpp [Project Tree] 0=0 Modified: src/application.cpp =================================================================== --- src/application.cpp 2006-04-14 12:52:46 UTC (rev 52) +++ src/application.cpp 2006-04-14 14:29:31 UTC (rev 53) @@ -52,8 +52,8 @@ setupResources(); - bool carryOn = configure(); - if (!carryOn) return false; + if (!configure()) + return false; chooseSceneManager(); @@ -81,15 +81,12 @@ // Show the configuration dialog and initialise the system // You can skip this and use root.restoreConfig() to load configuration // settings if you were sure there are valid ones saved in ogre.cfg - if(mRoot->showConfigDialog()) - { + if(mRoot->restoreConfig()) { // If returned true, user clicked OK so initialise // Here we choose to let the system create a default rendering window by passing 'true' mWindow = mRoot->initialise(true); return true; - } - else - { + } else { return false; } } @@ -125,7 +122,9 @@ // create an ambient light for the scene mSceneMgr->setAmbientLight( ColourValue( 1, 1, 1 ) ); mSceneMgr->setShadowTechnique( SHADOWTYPE_STENCIL_ADDITIVE ); - + + mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox"); + // Create an entity Entity* ent = mSceneMgr->createEntity( "Octavius Apteryx", "Ships/Octavius/Apteryx/octavius_apteryx.mesh" ); mAvatarNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(); Deleted: src/media.cfg =================================================================== --- src/media.cfg 2006-04-14 12:52:46 UTC (rev 52) +++ src/media.cfg 2006-04-14 14:29:31 UTC (rev 53) @@ -1,16 +0,0 @@ -Mesh=ogrehead.mesh -Mesh=geosphere4500.mesh -Mesh=razor.mesh -Mesh=knot.mesh -Mesh=RZR-002.mesh -Mesh=geosphere8000.mesh -Mesh=sphere.mesh - -CubeMap=cubescene.jpg -CubeMap=early_morning.jpg -CubeMap=cubemap.jpg -CubeMap=morning.jpg -CubeMap=cloudy_noon.jpg -CubeMap=evening.jpg -CubeMap=stormy.jpg -CubeMap=stevecube.jpg Deleted: src/quake3settings.cfg =================================================================== --- src/quake3settings.cfg 2006-04-14 12:52:46 UTC (rev 52) +++ src/quake3settings.cfg 2006-04-14 14:29:31 UTC (rev 53) @@ -1,2 +0,0 @@ -Pak0Location: /usr/local/games/quake3/baseq3/pak0.pk3 -Map: maps/q3dm3.bsp Modified: src/resources.cfg =================================================================== --- src/resources.cfg 2006-04-14 12:52:46 UTC (rev 52) +++ src/resources.cfg 2006-04-14 14:29:31 UTC (rev 53) @@ -1,24 +1,10 @@ # Resource locations to be added to the 'boostrap' path # This also contains the minimum you need to use the Ogre example framework -[Bootstrap] -Zip=../media/packs/OgreCore.zip +#[Bootstrap] +#Zip=../media/packs/OgreCore.zip # Resource locations to be added to the default path [General] FileSystem=../data FileSystem=../data/Materials -FileSystem=../media -FileSystem=../media/fonts -FileSystem=../media/materials/programs -FileSystem=../media/materials/scripts -FileSystem=../media/materials/textures -FileSystem=../media/models -FileSystem=../media/overlays -FileSystem=../media/particle -FileSystem=../media/gui -Zip=../media/packs/cubemap.zip -Zip=../media/packs/cubemapsJS.zip -Zip=../media/packs/dragon.zip -Zip=../media/packs/fresneldemo.zip -Zip=../media/packs/ogretestmap.zip -Zip=../media/packs/skybox.zip +Zip=../data/Materials/skybox.zip Deleted: src/terrain.cfg =================================================================== --- src/terrain.cfg 2006-04-14 12:52:46 UTC (rev 52) +++ src/terrain.cfg 2006-04-14 14:29:31 UTC (rev 53) @@ -1,71 +0,0 @@ -# The main world texture (if you wish the terrain manager to create a material for you) -WorldTexture=terrain_texture.jpg - -# The detail texture (if you wish the terrain manager to create a material for you) -DetailTexture=terrain_detail.jpg - -#number of times the detail texture will tile in a terrain tile -DetailTile=3 - -# Heightmap source -PageSource=Heightmap - -# Heightmap-source specific settings -Heightmap.image=terrain.png - -# If you use RAW, fill in the below too -# RAW-specific setting - size (horizontal/vertical) -#Heightmap.raw.size=513 -# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit) -#Heightmap.raw.bpp=2 - -# How large is a page of tiles (in vertices)? Must be (2^n)+1 -PageSize=513 - -# How large is each tile? Must be (2^n)+1 and be smaller than PageSize -TileSize=65 - -# The maximum error allowed when determining which LOD to use -MaxPixelError=3 - -# The size of a terrain page, in world units -PageWorldX=1500 -PageWorldZ=1500 -# Maximum height of the terrain -MaxHeight=100 - -# Upper LOD limit -MaxMipMapLevel=5 - -#VertexNormals=yes -#VertexColors=yes -#UseTriStrips=yes - -# Use vertex program to morph LODs, if available -VertexProgramMorph=yes - -# The proportional distance range at which the LOD morph starts to take effect -# This is as a proportion of the distance between the current LODs effective range, -# and the effective range of the next lower LOD -LODMorphStart=0.2 - -# This following section is for if you want to provide your own terrain shading routine -# Note that since you define your textures within the material this makes the -# WorldTexture and DetailTexture settings redundant - -# The name of the vertex program parameter you wish to bind the morph LOD factor to -# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely -# to the same position as the next lower LOD -# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING -#MorphLODFactorParamName=morphFactor - -# The index of the vertex program parameter you wish to bind the morph LOD factor to -# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely -# to the same position as the next lower LOD -# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING -#MorphLODFactorParamIndex=4 - -# The name of the material you will define to shade the terrain -#CustomMaterialName=TestTerrainMaterial - - Deleted: src/world.cfg =================================================================== --- src/world.cfg 2006-04-14 12:52:46 UTC (rev 52) +++ src/world.cfg 2006-04-14 14:29:31 UTC (rev 53) @@ -1,6 +0,0 @@ -HeightMap=2049x2049_map.png -Scale.x=2.0 -Scale.y=0.6 -Scale.z=2.0 -WorldTexture=terrain_texture.jpg -DetailTexture=terrain_detail.jpg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-04-16 16:46:42
|
Revision: 57 Author: egore Date: 2006-04-16 09:46:32 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=57&view=rev Log Message: ----------- bump project file, bump ChangeLog Modified Paths: -------------- ChangeLog opengate.prj opengate.pws po/POTFILES.in Modified: ChangeLog =================================================================== --- ChangeLog 2006-04-16 16:45:02 UTC (rev 56) +++ ChangeLog 2006-04-16 16:46:32 UTC (rev 57) @@ -1,3 +1,20 @@ +2006-04-16 Christoph Brill <eg...@us...> + + * src/movable_object.cpp, include/movable_object.h: introduce an + abstract class for moving objects by keyboard/mouse(/joystick) + +2006-04-15 Christoph Brill <eg...@us...> + + * src/gamestate.cpp, include/gamestate.h: add a simple gamestate for + introducing a CEGUI based UI + + * src/camera.cpp, include/camera.h, src/framelistener.cpp, + framelistner.h: split the camera into own files to strip the + framelistener down to a minimum + + * srC/keyboard.cpp, include/keyboard.h, src/mouse.cpp, src/mouse.h, + src/framelistener.cpp: split the keyboard and mouse to separate files + 2006-04-10 Christoph Brill <eg...@us...> * src/framelistener.cpp: add keybindings to movement @@ -2,4 +19,4 @@ - * src/avatar.cpp, src/avatar.h: implement movement based on orientation of - the ship + * src/avatar.cpp, src/avatar.h: implement movement based on orientation + of the ship @@ -23,8 +40,8 @@ * include/application.h, src/application.cpp: No longer derive from the ExampleFrameapplication - * include/framelistener.h, src/framelistener.cpp: No longer derive from the - ExampleFramelistener + * include/framelistener.h, src/framelistener.cpp: No longer derive from + the ExampleFramelistener 2006-04-08 Christoph Brill <eg...@us...> Modified: opengate.prj =================================================================== --- opengate.prj 2006-04-16 16:45:02 UTC (rev 56) +++ opengate.prj 2006-04-16 16:46:32 UTC (rev 57) @@ -70,8 +70,12 @@ application.h\ framelistener.h\ constants.h\ - optimize.h\ - avatar.h + avatar.h\ + keyboard.h\ + mouse.h\ + camera.h\ + gamestate.h\ + movable_object.h module.source.name=src module.source.type= @@ -79,7 +83,12 @@ main.cpp\ application.cpp\ framelistener.cpp\ - avatar.cpp + avatar.cpp\ + keyboard.cpp\ + mouse.cpp\ + camera.cpp\ + gamestate.cpp\ + movable_object.cpp module.pixmap.name=pixmaps module.pixmap.type= @@ -89,7 +98,14 @@ module.data.type= module.data.files=\ Ships/Octavius/Apteryx/octavius_apteryx.mesh\ - Ships/Quantar/Storm/quantar_storm.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 module.help.name=help module.help.type= Modified: opengate.pws =================================================================== --- opengate.pws 2006-04-16 16:45:02 UTC (rev 56) +++ opengate.pws 2006-04-16 16:46:32 UTC (rev 57) @@ -1,12 +1,17 @@ [filenumbers] -0=86 -1=1 -2=112 -3=86 -4=43 -5=58 -6=1 +0=37 +1=76 +2=1 +3=79 +4=41 +5=40 +6=163 +7=38 +8=74 +9=136 +10=98 +11=54 [filemarkers] 0= @@ -16,6 +21,11 @@ 4= 5= 6= +7= +8= +9= +10= +11= [File View] filter.file.unmatch=*.so *.o *.a *.la @@ -29,8 +39,18 @@ clean before build=false [filelist] -0=/home/egore/source/opengate/src/application.cpp -1=/home/egore/source/opengate/src/main.cpp +0=/home/egore/source/opengate/src/mouse.cpp +1=/home/egore/source/opengate/src/keyboard.cpp +2=/home/egore/source/opengate/include/avatar.h +3=/home/egore/source/opengate/src/avatar.cpp +4=/home/egore/source/opengate/include/keyboard.h +5=/home/egore/source/opengate/include/mouse.h +6=/home/egore/source/opengate/src/application.cpp +7=/home/egore/source/opengate/include/camera.h +8=/home/egore/source/opengate/src/camera.cpp +9=/home/egore/source/opengate/src/framelistener.cpp +10=/home/egore/source/opengate/include/application.h +11=/home/egore/source/opengate/include/framelistener.h [Project Tree] 0=0 Modified: po/POTFILES.in =================================================================== --- po/POTFILES.in 2006-04-16 16:45:02 UTC (rev 56) +++ po/POTFILES.in 2006-04-16 16:46:32 UTC (rev 57) @@ -9,5 +9,10 @@ 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 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: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: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... [truncated message content] |
|
From: <eg...@us...> - 2006-07-16 18:48:27
|
Revision: 87 Author: egore Date: 2006-07-16 11:47:43 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=87&view=rev Log Message: ----------- update autogenerated files and changelog switch from anjuta to kdevelop Modified Paths: -------------- ChangeLog Makefile.am Makefile.in README aclocal.m4 config.h.in configure configure.in Removed Paths: ------------- acconfig.h acinclude.m4 opengate.prj opengate.pws setup-gettext stamp-h.in Property Changed: ---------------- Makefile.am Makefile.in config.h.in configure.in Modified: ChangeLog =================================================================== --- ChangeLog 2006-07-16 18:46:36 UTC (rev 86) +++ ChangeLog 2006-07-16 18:47:43 UTC (rev 87) @@ -1,3 +1,29 @@ +2006-07-16 Christoph Brill <eg...@us...> + + * src/server/network.cpp, src/client/network.cpp, + src/opengate_client.cpp, src/common/company.cpp, + src/common/loader.cpp, src/common/faction.cpp, + src/common/exception.cpp, src/common/faction_storage.cpp, + src/common/company_storage.cpp, src/common/objects/movable_object.cpp, + src/common/objects/object.cpp, src/common/objects/ships/ship.cpp, + src/common/components/component.cpp, + src/common/equipment/equipment.cpp, + src/common/equipment/engines/engine.cpp, + src/common/equipment/engines/money.cpp, + src/common/equipment/ecms/ecm.cpp, src/opengate_server.cpp, + src/server/network.h, src/client/network.h, + src/common/company_storage.h, src/common/loader.h, + src/common/company.h, src/common/faction.h, src/common/exception.h, + src/common/faction_storage.h, src/common/objects/object.h, + src/common/objects/movable_object.h, src/common/objects/ships/ship.h, + src/common/components/component.h, src/common/equipment/equipment.h, + src/common/equipment/engines/engine.h, + src/common/equipment/engines/money.h, src/common/equipment/ecms/ecm.h: + sync with loader branch and add a simple XML-parser plus an engine + that is loaded using it. Introduces validation based on DTD and a + valid DTD for equipment and ships. + + 2006-04-17 Christoph Brill <eg...@us...> * src/input.cpp, include/input.h, src/keyboard.cpp, Modified: Makefile.am =================================================================== --- Makefile.am 2006-07-16 18:46:36 UTC (rev 86) +++ Makefile.am 2006-07-16 18:47:43 UTC (rev 87) @@ -1,27 +1,5 @@ -## Process this file with automake to produce Makefile.in -## Created by Anjuta - will be overwritten -## If you don't want it to overwrite it, -## Please disable it in the Anjuta project configuration +# not a GNU package. You can remove this line, if +# have all needed files, that a GNU package needs +AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = include src data - -opengatedocdir = ${prefix}/doc/opengate -opengatedoc_DATA = \ - README\ - COPYING\ - AUTHORS\ - ChangeLog\ - INSTALL\ - NEWS\ - TODO - -EXTRA_DIST = $(opengatedoc_DATA) - -# Copy all the spec files. Of cource, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done - +SUBDIRS = src po doc data Property changes on: Makefile.am ___________________________________________________________________ Name: svn:eolstyle + native Modified: Makefile.in =================================================================== --- Makefile.in 2006-07-16 18:46:36 UTC (rev 86) +++ Makefile.in 2006-07-16 18:47:43 UTC (rev 87) @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,12 +38,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO acconfig.h config.guess config.sub depcomp install-sh \ - ltmain.sh missing mkinstalldirs + TODO config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs subdir = . 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) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -60,15 +58,6 @@ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -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)$(opengatedocdir)" -opengatedocDATA_INSTALL = $(INSTALL_DATA) -DATA = $(opengatedoc_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -123,24 +112,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@ @@ -197,37 +173,30 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = include src data -opengatedocdir = ${prefix}/doc/opengate -opengatedoc_DATA = \ - README\ - COPYING\ - AUTHORS\ - ChangeLog\ - INSTALL\ - NEWS\ - TODO -EXTRA_DIST = $(opengatedoc_DATA) +# not a GNU package. You can remove this line, if +# have all needed files, that a GNU package needs +AUTOMAKE_OPTIONS = foreign 1.4 +SUBDIRS = src po doc data all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: am--refresh: @: -$(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*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -242,9 +211,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -256,7 +225,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -273,24 +242,7 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-opengatedocDATA: $(opengatedoc_DATA) - @$(NORMAL_INSTALL) - test -z "$(opengatedocdir)" || $(mkdir_p) "$(DESTDIR)$(opengatedocdir)" - @list='$(opengatedoc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(opengatedocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(opengatedocdir)/$$f'"; \ - $(opengatedocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(opengatedocdir)/$$f"; \ - done -uninstall-opengatedocDATA: - @$(NORMAL_UNINSTALL) - @list='$(opengatedoc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(opengatedocdir)/$$f'"; \ - rm -f "$(DESTDIR)$(opengatedocdir)/$$f"; \ - done - # 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, @@ -467,9 +419,6 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -569,12 +518,9 @@ exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(DATA) config.h +all-am: Makefile config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(opengatedocdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -619,7 +565,7 @@ info-am: -install-data-am: install-opengatedocDATA +install-data-am: install-exec-am: @@ -647,35 +593,25 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-opengatedocDATA +uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck 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-opengatedocDATA 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 \ - uninstall-opengatedocDATA + 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 - -# Copy all the spec files. Of cource, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done # 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: Makefile.in ___________________________________________________________________ Name: svn:eolstyle + native Modified: README =================================================================== --- README 2006-07-16 18:46:36 UTC (rev 86) +++ README 2006-07-16 18:47:43 UTC (rev 87) @@ -1,10 +0,0 @@ -Opengate - pre-alpha -==================== - -Currently everything is broken. Don't expect anything to work. Opengate may not -run on your system, may crash, may crash your system or whatever. Beware that -this code is currently only used for testing! - -You need a copy of the ORGESDK/Samples/Media/ in your folder /media, otherwise -you cannot start the game. I will not add this folder since we will not need -it once the game is done. Deleted: acconfig.h =================================================================== --- acconfig.h 2006-07-16 18:46:36 UTC (rev 86) +++ acconfig.h 2006-07-16 18:47:43 UTC (rev 87) @@ -1,14 +0,0 @@ -#undef ENABLE_NLS -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef HAVE_LIBSM -#undef PACKAGE_LOCALE_DIR -#undef PACKAGE_DOC_DIR -#undef PACKAGE_DATA_DIR -#undef PACKAGE_PIXMAPS_DIR -#undef PACKAGE_HELP_DIR -#undef PACKAGE_MENU_DIR -#undef PACKAGE_SOURCE_DIR -#undef GETTEXT_PACKAGE Deleted: acinclude.m4 =================================================================== --- acinclude.m4 2006-07-16 18:46:36 UTC (rev 86) +++ acinclude.m4 2006-07-16 18:47:43 UTC (rev 87) @@ -1 +0,0 @@ -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) Modified: aclocal.m4 =================================================================== --- aclocal.m4 2006-07-16 18:46:36 UTC (rev 86) +++ aclocal.m4 2006-07-16 18:47:43 UTC (rev 87) @@ -6540,29 +6540,6 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) - -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 4 - -# This was merged into AC_PROG_CC in Autoconf. - -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -]) -AU_DEFUN([fp_PROG_CC_STDC]) - # AM_CONDITIONAL -*- Autoconf -*- # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 @@ -6981,35 +6958,6 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 4 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -7369,4 +7317,3 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([acinclude.m4]) Modified: config.h.in =================================================================== --- config.h.in 2006-07-16 18:46:36 UTC (rev 86) +++ config.h.in 2006-07-16 18:47:43 UTC (rev 87) @@ -1,18 +1,4 @@ /* config.h.in. Generated from configure.in by autoheader. */ -#undef ENABLE_NLS -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef HAVE_LIBSM -#undef PACKAGE_LOCALE_DIR -#undef PACKAGE_DOC_DIR -#undef PACKAGE_DATA_DIR -#undef PACKAGE_PIXMAPS_DIR -#undef PACKAGE_HELP_DIR -#undef PACKAGE_MENU_DIR -#undef PACKAGE_SOURCE_DIR -#undef GETTEXT_PACKAGE /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H Property changes on: config.h.in ___________________________________________________________________ Name: svn:eolstyle + native Modified: configure =================================================================== --- configure 2006-07-16 18:46:36 UTC (rev 86) +++ configure 2006-07-16 18:47:43 UTC (rev 87) @@ -810,14 +810,11 @@ AMTAR am__tar am__untar -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -CC -CFLAGS +CXX +CXXFLAGS LDFLAGS CPPFLAGS -ac_ct_CC +ac_ct_CXX EXEEXT OBJEXT DEPDIR @@ -826,15 +823,6 @@ 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 @@ -846,39 +834,38 @@ host_cpu host_vendor host_os +CC +CFLAGS +ac_ct_CC +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +GREP +EGREP LN_S ECHO AR RANLIB +CPP 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 +LDFLAGS +CPPFLAGS CCC +CC +CFLAGS +CPP CXXCPP F77 FFLAGS' @@ -1459,8 +1446,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (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] @@ -1478,15 +1463,15 @@ --with-tags[=TAGS] include additional configurations [automatic] Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags + CXX C++ compiler command + CXXFLAGS C++ compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> + CC C compiler command + CFLAGS C compiler flags CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -1913,6 +1898,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_config_headers="$ac_config_headers config.h" + am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2376,309 +2364,34 @@ -ac_config_headers="$ac_config_headers config.h" -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to aut...@gn...." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to aut...@gn...." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2687,7 +2400,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2697,32 +2410,32 @@ fi fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - test -n "$CC" && break + test -n "$CXX" && break done fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_wo... [truncated message content] |
Thanks for helping keep SourceForge clean.
X