0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed wesnothd compile problems

Browse source
This commit is contained in:
uid68803 2003-12-29 15:10:51 +00:00
parent 6516d3f869
commit 0901d82b59
3 changed files with 16 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/server/Makefile.am
View file

@ -5,16 +5,14 @@ bin_PROGRAMS = wesnothd
#############################################################################
wesnothd_SOURCES = game.cpp \
../game_events.cpp \
player.cpp \
server.cpp \
variable.cpp \
../config.cpp \
../filesystem.cpp \
../game_config.cpp \
../log.cpp \
../network.cpp \
../replay.cpp \
../unit.cpp \
game.hpp \
../game_events.hpp \
player.hpp \
@ -22,9 +20,7 @@ wesnothd_SOURCES = game.cpp \
../filesystem.hpp \
../game_config.hpp \
../log.hpp \
../network.hpp \
../replay.hpp \
../unit.hpp
../network.hpp
AM_CXXFLAGS = @SDL_CFLAGS@
AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@

92
src/server/Makefile.in
View file

@ -148,16 +148,14 @@ bin_PROGRAMS = wesnothd
# Wesnothd Server #
#############################################################################
wesnothd_SOURCES = game.cpp \
../game_events.cpp \
player.cpp \
server.cpp \
variable.cpp \
../config.cpp \
../filesystem.cpp \
../game_config.cpp \
../log.cpp \
../network.cpp \
../replay.cpp \
../unit.cpp \
game.hpp \
../game_events.hpp \
player.hpp \
@ -165,9 +163,7 @@ wesnothd_SOURCES = game.cpp \
../filesystem.hpp \
../game_config.hpp \
../log.hpp \
../network.hpp \
../replay.hpp \
../unit.hpp
../network.hpp
AM_CXXFLAGS = @SDL_CFLAGS@
@ -180,10 +176,9 @@ CONFIG_CLEAN_FILES =
bin_PROGRAMS = wesnothd$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
am_wesnothd_OBJECTS = game.$(OBJEXT) game_events.$(OBJEXT) \
player.$(OBJEXT) server.$(OBJEXT) config.$(OBJEXT) \
filesystem.$(OBJEXT) game_config.$(OBJEXT) log.$(OBJEXT) \
network.$(OBJEXT) replay.$(OBJEXT) unit.$(OBJEXT)
am_wesnothd_OBJECTS = game.$(OBJEXT) player.$(OBJEXT) server.$(OBJEXT) \
variable.$(OBJEXT) config.$(OBJEXT) filesystem.$(OBJEXT) \
game_config.$(OBJEXT) log.$(OBJEXT) network.$(OBJEXT)
wesnothd_OBJECTS = $(am_wesnothd_OBJECTS)
wesnothd_LDADD = $(LDADD)
wesnothd_DEPENDENCIES =
@ -194,10 +189,9 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po ./$(DEPDIR)/filesystem.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/game.Po ./$(DEPDIR)/game_config.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/game_events.Po ./$(DEPDIR)/log.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/network.Po ./$(DEPDIR)/player.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/replay.Po ./$(DEPDIR)/server.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/unit.Po
@AMDEP_TRUE@ ./$(DEPDIR)/log.Po ./$(DEPDIR)/network.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/server.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/variable.Po
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
@ -258,13 +252,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesystem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_config.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_events.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replay.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/variable.Po@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@ -288,28 +280,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
game_events.o: ../game_events.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_events.o -MD -MP -MF "$(DEPDIR)/game_events.Tpo" \
@am__fastdepCXX_TRUE@ -c -o game_events.o `test -f '../game_events.cpp' || echo '$(srcdir)/'`../game_events.cpp; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/game_events.Tpo" "$(DEPDIR)/game_events.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/game_events.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../game_events.cpp' object='game_events.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/game_events.Po' tmpdepfile='$(DEPDIR)/game_events.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_events.o `test -f '../game_events.cpp' || echo '$(srcdir)/'`../game_events.cpp
game_events.obj: ../game_events.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_events.obj -MD -MP -MF "$(DEPDIR)/game_events.Tpo" \
@am__fastdepCXX_TRUE@ -c -o game_events.obj `if test -f '../game_events.cpp'; then $(CYGPATH_W) '../game_events.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_events.cpp'; fi`; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/game_events.Tpo" "$(DEPDIR)/game_events.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/game_events.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../game_events.cpp' object='game_events.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/game_events.Po' tmpdepfile='$(DEPDIR)/game_events.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_events.obj `if test -f '../game_events.cpp'; then $(CYGPATH_W) '../game_events.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_events.cpp'; fi`
config.o: ../config.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" \
@am__fastdepCXX_TRUE@ -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp; \
@ -419,50 +389,6 @@ network.obj: ../network.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/network.Po' tmpdepfile='$(DEPDIR)/network.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.obj `if test -f '../network.cpp'; then $(CYGPATH_W) '../network.cpp'; else $(CYGPATH_W) '$(srcdir)/../network.cpp'; fi`
replay.o: ../replay.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT replay.o -MD -MP -MF "$(DEPDIR)/replay.Tpo" \
@am__fastdepCXX_TRUE@ -c -o replay.o `test -f '../replay.cpp' || echo '$(srcdir)/'`../replay.cpp; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/replay.Tpo" "$(DEPDIR)/replay.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/replay.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../replay.cpp' object='replay.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/replay.Po' tmpdepfile='$(DEPDIR)/replay.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o replay.o `test -f '../replay.cpp' || echo '$(srcdir)/'`../replay.cpp
replay.obj: ../replay.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT replay.obj -MD -MP -MF "$(DEPDIR)/replay.Tpo" \
@am__fastdepCXX_TRUE@ -c -o replay.obj `if test -f '../replay.cpp'; then $(CYGPATH_W) '../replay.cpp'; else $(CYGPATH_W) '$(srcdir)/../replay.cpp'; fi`; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/replay.Tpo" "$(DEPDIR)/replay.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/replay.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../replay.cpp' object='replay.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/replay.Po' tmpdepfile='$(DEPDIR)/replay.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o replay.obj `if test -f '../replay.cpp'; then $(CYGPATH_W) '../replay.cpp'; else $(CYGPATH_W) '$(srcdir)/../replay.cpp'; fi`
unit.o: ../unit.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unit.o -MD -MP -MF "$(DEPDIR)/unit.Tpo" \
@am__fastdepCXX_TRUE@ -c -o unit.o `test -f '../unit.cpp' || echo '$(srcdir)/'`../unit.cpp; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/unit.Tpo" "$(DEPDIR)/unit.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/unit.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../unit.cpp' object='unit.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/unit.Po' tmpdepfile='$(DEPDIR)/unit.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unit.o `test -f '../unit.cpp' || echo '$(srcdir)/'`../unit.cpp
unit.obj: ../unit.cpp
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unit.obj -MD -MP -MF "$(DEPDIR)/unit.Tpo" \
@am__fastdepCXX_TRUE@ -c -o unit.obj `if test -f '../unit.cpp'; then $(CYGPATH_W) '../unit.cpp'; else $(CYGPATH_W) '$(srcdir)/../unit.cpp'; fi`; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/unit.Tpo" "$(DEPDIR)/unit.Po"; \
@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/unit.Tpo"; exit 1; \
@am__fastdepCXX_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../unit.cpp' object='unit.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/unit.Po' tmpdepfile='$(DEPDIR)/unit.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unit.obj `if test -f '../unit.cpp'; then $(CYGPATH_W) '../unit.cpp'; else $(CYGPATH_W) '$(srcdir)/../unit.cpp'; fi`
uninstall-info-am:
ETAGS = etags

5
src/server/variable.cpp Normal file
View file

@ -0,0 +1,5 @@
#include "../game_events.hpp"
namespace game_events {
const std::string& get_variable(const std::string& str) { return str; }
}