Skip to content

Commit

Permalink
Added test level. Fixed Mac Bundle libs.
Browse files Browse the repository at this point in the history 
Now works on vanilla Mac OS X, with only XQuartz necessary...
  • Loading branch information
@xythobuz
xythobuz committed Dec 21, 2013
1 parent 6ed8a89 commit 130c200
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 31 deletions.
27 changes: 27 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,37 @@ bundle: release
cp /opt/local/lib/libSDL_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
cp /opt/local/lib/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libz.1.dylib
cp /opt/local/lib/libSDL-1.2.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
cp /opt/local/lib/libbz2.1.0.dylib bin/OpenRaider.app/Contents/Frameworks/libbz2.1.0.dylib
cp /opt/local/lib/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
cp /opt/local/lib/libpng15.15.dylib bin/OpenRaider.app/Contents/Frameworks/libpng15.15.dylib
# OpenRaider-bin
install_name_tool -change /opt/local/lib/libalut.0.1.0.dylib @executable_path/../Frameworks/libalut.0.1.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/local/lib/libSDL_ttf-2.0.0.dylib @executable_path/../Frameworks/libSDL_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/local/lib/libSDL-1.2.0.dylib @executable_path/../Frameworks/libSDL-1.2.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libXmu.6.dylib /usr/X11/lib/libXmu.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libXt.6.dylib /usr/X11/lib/libXt.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libSM.6.dylib /usr/X11/lib/libSM.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libICE.6.dylib /usr/X11/lib/libICE.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libXext.6.dylib /usr/X11/lib/libXext.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libX11.6.dylib /usr/X11/lib/libX11.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
install_name_tool -change /opt/X11/lib/libXi.6.dylib /usr/X11/lib/libXi.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
# libSDL-1.2.0.dylib
install_name_tool -change /opt/local/lib/libX11.6.dylib /usr/X11/lib/libX11.6.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
install_name_tool -change /opt/local/lib/libXext.6.dylib /usr/X11/lib/libXext.6.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
install_name_tool -change /opt/local/lib/libXrandr.2.dylib /usr/X11/lib/libXrandr.2.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
install_name_tool -change /opt/local/lib/libXrender.1.dylib /usr/X11/lib/libXrender.1.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
# libSDL_ttf-2.0.0.dylib
install_name_tool -change /opt/local/lib/libSDL-1.2.0.dylib @executable_path/../Frameworks/libSDL-1.2.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
install_name_tool -change /opt/local/lib/libfreetype.6.dylib @executable_path/../Frameworks/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
install_name_tool -change /opt/local/lib/libbz2.1.0.dylib @executable_path/../Frameworks/libbz2.1.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
# libfreetype.6.dylib
install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
install_name_tool -change /opt/local/lib/libbz2.1.0.dylib @executable_path/../Frameworks/libbz2.1.0.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
install_name_tool -change /opt/local/lib/libpng15.15.dylib @executable_path/../Frameworks/libpng15.15.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
# libpng15.15.dylib
install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libpng15.15.dylib

bundle-image: bundle
hdiutil create -size 32m -fs HFS+ -volname "OpenRaider" bin/tmp.dmg
Expand Down
2 changes: 2 additions & 0 deletions TODO
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Mac Setup Script:
- Check not only for existence of ~/.OpenRaider but for all necessary files, so the user can update.

OpenRaider
TODO ( Updated 2003.05.17 )
Expand Down
58 changes: 29 additions & 29 deletions data/OpenRaider.init
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,35 @@ DumpTexture=false
#Music=tr4/103_A3_Out_Night.wav
#Music=tr4/108_A8_Coastal.wav
Map=custom/Yvel.tr2
Map=custom/villa2.phd
Map=custom/fenician1.phd
Map=custom/1984.tr2
Map=custom/bigchamber.tr4
Map=custom/cleopal.tr4
Map=custom/khysos.tr4
Map=custom/Nasa.tr2
Map=custom/mansionfrost.tr2
Map=tr1/gym.phd
Map=tr1/level1.phd
Map=tr1/level2.phd
Map=tr2/unwater.tr2
Map=tr3/willsden.tr2
Map=tr3/undersea.tr2
Map=tr3/scotland.tr2
Map=tr3/HOUSE.TR2
Map=tr3/zoo.tr2
Map=tr3/slinc.tr2
Map=tr3/temple.tr2
Map=tr3/shore.tr2
Map=tr3/chunnel.tr2
Map=tr4/angkor1.tr4
Map=tr4/ang_race.tr4
Map=tr4/karnak1.tr4
Map=tr4/lake.tr4
Map=tr4/settomb1.tr4
Map=tr4/settomb2.tr4
Map=tr4/title.tr4
Map=tr5/demo.trc
#Map=custom/villa2.phd
#Map=custom/fenician1.phd
#Map=custom/1984.tr2
#Map=custom/bigchamber.tr4
#Map=custom/cleopal.tr4
#Map=custom/khysos.tr4
#Map=custom/Nasa.tr2
#Map=custom/mansionfrost.tr2
#Map=tr1/gym.phd
#Map=tr1/level1.phd
#Map=tr1/level2.phd
#Map=tr2/unwater.tr2
#Map=tr3/willsden.tr2
#Map=tr3/undersea.tr2
#Map=tr3/scotland.tr2
#Map=tr3/HOUSE.TR2
#Map=tr3/zoo.tr2
#Map=tr3/slinc.tr2
#Map=tr3/temple.tr2
#Map=tr3/shore.tr2
#Map=tr3/chunnel.tr2
#Map=tr4/angkor1.tr4
#Map=tr4/ang_race.tr4
#Map=tr4/karnak1.tr4
#Map=tr4/lake.tr4
#Map=tr4/settomb1.tr4
#Map=tr4/settomb2.tr4
#Map=tr4/title.tr4
#Map=tr5/demo.trc

[OpenRaider.Console]
bind +console 96
Expand Down
Binary file added data/Yvel.tr2
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion mac_dist/OpenRaider
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ if [ ! -d "~/.OpenRaider" ]; then
mkdir -p ~/.OpenRaider
cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
mkdir -p ~/.OpenRaider/paks
mkdir -p ~/.OpenRaider/paks/custom
mkdir -p ~/.OpenRaider/music
mkdir -p ~/.OpenRaider/data
mkdir -p ~/.OpenRaider/sshots
cp ../Resources/defaults/*.tga ~/.OpenRaider/data
cp ../Resources/defaults/*.wav ~/.OpenRaider/data
cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
cp ../Resources/defaults/*.tr2 ~/.OpenRaider/paks/custom
echo "DONE"
fi
./OpenRaider-bin
3 changes: 2 additions & 1 deletion setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ echo "Setting up OpenRaider for user $USER..."
mkdir -p ~/.OpenRaider
cp data/OpenRaider.init ~/.OpenRaider/
cp data/custom.cfg ~/.OpenRaider/
mkdir -p ~/.OpenRaider/paks
mkdir -p ~/.OpenRaider/paks/custom
mkdir -p ~/.OpenRaider/music
mkdir -p ~/.OpenRaider/data
mkdir -p ~/.OpenRaider/sshots
cp data/*.tga ~/.OpenRaider/data
cp data/*.wav ~/.OpenRaider/data
cp data/*.ttf ~/.OpenRaider/data
cp data/*.tr2 ~/.OpenRaider/paks/custom
echo "DONE"

0 comments on commit 130c200

Please sign in to comment.