From 539e03b1988c9db8234ca4cbd044c9a418036dcf Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 16 Oct 2007 21:43:34 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1372 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- server.sh | 55 ++++++++++++++++++++++++++++++++++++ server_wizard.sh | 2 ++ source/wizard/src/Makefile | 16 +++++++++++ source/wizard/src/wizard.cpp | 6 ++-- 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100755 server.sh create mode 100755 server_wizard.sh create mode 100644 source/wizard/src/Makefile diff --git a/server.sh b/server.sh new file mode 100755 index 00000000..55934352 --- /dev/null +++ b/server.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# CUBE_DIR should refer to the directory in which Cube is placed. +#CUBE_DIR=~/cube +#CUBE_DIR=/usr/local/cube +CUBE_DIR=./ + +# SYSTEM_NAME should be set to the name of your operating system. +#SYSTEM_NAME=Linux +SYSTEM_NAME=`uname -s` + +# MACHINE_NAME should be set to the name of your processor. +#MACHINE_NAME=i686 +MACHINE_NAME=`uname -m` + +case ${SYSTEM_NAME} in +Linux) + SYSTEM_NAME=linux_ + ;; +*) + SYSTEM_NAME=native_ + ;; +esac + +case ${MACHINE_NAME} in +i486|i586|i686) + MACHINE_NAME= + ;; +*) + if [ ${SYSTEM_NAME} != native_ ] + then + SYSTEM_NAME=native_ + fi + MACHINE_NAME= + ;; +esac + +if [ -x ${CUBE_DIR}/bin_unix/native_server ] +then + SYSTEM_NAME=native_ + MACHINE_NAME= +fi + +if [ -x ${CUBE_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}server ] +then + cd ${CUBE_DIR} + exec ${CUBE_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}server $* +else + echo "Your platform does not have a pre-compiled Cube server." + echo "Please follow the following steps to build a native server:" + echo "1) Ensure you have the SDL, SDL-image, SDL-mixer, and OpenGL libraries installed." + echo "2) Change directory to source/src/ and type \"make install\"." + echo "3) If the build succeeds, return to this directory and run this script again." + exit 1 +fi + diff --git a/server_wizard.sh b/server_wizard.sh new file mode 100755 index 00000000..a9eb3fd4 --- /dev/null +++ b/server_wizard.sh @@ -0,0 +1,2 @@ +#!/bin/sh +bin_unix/server_wizard server_autogenerated.sh server.sh diff --git a/source/wizard/src/Makefile b/source/wizard/src/Makefile new file mode 100644 index 00000000..e1aa136b --- /dev/null +++ b/source/wizard/src/Makefile @@ -0,0 +1,16 @@ +CXXOPTFLAGS=-O3 -fomit-frame-pointer +INCLUDES=-I/usr/X11R6/include -I../enet/include `sdl-config --cflags` +CXXFLAGS=$(CXXOPTFLAGS) $(INCLUDES) -fsigned-char -Wall -Wno-deprecated + +PLATFORM_PREFIX=native +LIBS=-L/usr/X11R6/lib -L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU + +default: + $(CXX) $(CXXFLAGSS) wizard.cpp -o server_wizard $(LIBBS) + +clean: + -$(RM) -f $(OBJS) server_wizard + +install: default + cp server_wizard ../../../bin_unix/server_wizard + strip ../../../bin_unix/server_wizard diff --git a/source/wizard/src/wizard.cpp b/source/wizard/src/wizard.cpp index add706ad..43059375 100644 --- a/source/wizard/src/wizard.cpp +++ b/source/wizard/src/wizard.cpp @@ -51,8 +51,8 @@ int main(int argc, char **argv) cout << "message of the day:\t"; getline(cin, args["o"]); - cout << "server port:\t\t"; - getline(cin, args["f"]); + cout << "server port:\t\t"; + getline(cin, args["f"]); cout << "masterserver:\t\t"; getline(cin, args["m"]); @@ -113,7 +113,7 @@ int main(int argc, char **argv) } cout << "Done" << endl << endl; - cout << "Note: You can start ac_server.bat directly the next time you want to use this configuration again." << endl << endl; + cout << "Note: You can start " << outfile << " directly the next time you want to use this configuration again." << endl << endl; #ifdef WIN32