Преглед на файлове

Added test level. Fixed Mac Bundle libs.

Now works on vanilla Mac OS X, with only XQuartz necessary...
Thomas Buck преди 10 години
родител
ревизия
130c200612
променени са 6 файла, в които са добавени 62 реда и са изтрити 31 реда
  1. 27
    0
      Makefile
  2. 2
    0
      TODO
  3. 29
    29
      data/OpenRaider.init
  4. Двоични данни
      data/Yvel.tr2
  5. 2
    1
      mac_dist/OpenRaider
  6. 2
    1
      setup.sh

+ 27
- 0
Makefile Целия файл

@@ -127,10 +127,37 @@ bundle: release
127 127
 	cp /opt/local/lib/libSDL_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
128 128
 	cp /opt/local/lib/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libz.1.dylib
129 129
 	cp /opt/local/lib/libSDL-1.2.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
130
+	cp /opt/local/lib/libbz2.1.0.dylib bin/OpenRaider.app/Contents/Frameworks/libbz2.1.0.dylib
131
+	cp /opt/local/lib/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
132
+	cp /opt/local/lib/libpng15.15.dylib bin/OpenRaider.app/Contents/Frameworks/libpng15.15.dylib
133
+	# OpenRaider-bin
130 134
 	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
131 135
 	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
132 136
 	install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
133 137
 	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
138
+	install_name_tool -change /opt/X11/lib/libXmu.6.dylib /usr/X11/lib/libXmu.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
139
+	install_name_tool -change /opt/X11/lib/libXt.6.dylib /usr/X11/lib/libXt.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
140
+	install_name_tool -change /opt/X11/lib/libSM.6.dylib /usr/X11/lib/libSM.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
141
+	install_name_tool -change /opt/X11/lib/libICE.6.dylib /usr/X11/lib/libICE.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
142
+	install_name_tool -change /opt/X11/lib/libXext.6.dylib /usr/X11/lib/libXext.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
143
+	install_name_tool -change /opt/X11/lib/libX11.6.dylib /usr/X11/lib/libX11.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
144
+	install_name_tool -change /opt/X11/lib/libXi.6.dylib /usr/X11/lib/libXi.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
145
+	# libSDL-1.2.0.dylib
146
+	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
147
+	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
148
+	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
149
+	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
150
+	# libSDL_ttf-2.0.0.dylib
151
+	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
152
+	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
153
+	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
154
+	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
155
+	# libfreetype.6.dylib
156
+	install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
157
+	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
158
+	install_name_tool -change /opt/local/lib/libpng15.15.dylib @executable_path/../Frameworks/libpng15.15.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
159
+	# libpng15.15.dylib
160
+	install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libpng15.15.dylib
134 161
 
135 162
 bundle-image: bundle
136 163
 	hdiutil create -size 32m -fs HFS+ -volname "OpenRaider" bin/tmp.dmg

+ 2
- 0
TODO Целия файл

@@ -1,3 +1,5 @@
1
+Mac Setup Script:
2
+- Check not only for existence of ~/.OpenRaider but for all necessary files, so the user can update.
1 3
 
2 4
  OpenRaider 
3 5
  TODO ( Updated 2003.05.17 )

+ 29
- 29
data/OpenRaider.init Целия файл

@@ -35,35 +35,35 @@ DumpTexture=false
35 35
 #Music=tr4/103_A3_Out_Night.wav
36 36
 #Music=tr4/108_A8_Coastal.wav
37 37
 Map=custom/Yvel.tr2
38
-Map=custom/villa2.phd
39
-Map=custom/fenician1.phd
40
-Map=custom/1984.tr2
41
-Map=custom/bigchamber.tr4
42
-Map=custom/cleopal.tr4
43
-Map=custom/khysos.tr4
44
-Map=custom/Nasa.tr2
45
-Map=custom/mansionfrost.tr2
46
-Map=tr1/gym.phd
47
-Map=tr1/level1.phd
48
-Map=tr1/level2.phd
49
-Map=tr2/unwater.tr2
50
-Map=tr3/willsden.tr2
51
-Map=tr3/undersea.tr2
52
-Map=tr3/scotland.tr2
53
-Map=tr3/HOUSE.TR2
54
-Map=tr3/zoo.tr2
55
-Map=tr3/slinc.tr2
56
-Map=tr3/temple.tr2
57
-Map=tr3/shore.tr2
58
-Map=tr3/chunnel.tr2
59
-Map=tr4/angkor1.tr4
60
-Map=tr4/ang_race.tr4
61
-Map=tr4/karnak1.tr4
62
-Map=tr4/lake.tr4
63
-Map=tr4/settomb1.tr4
64
-Map=tr4/settomb2.tr4
65
-Map=tr4/title.tr4
66
-Map=tr5/demo.trc
38
+#Map=custom/villa2.phd
39
+#Map=custom/fenician1.phd
40
+#Map=custom/1984.tr2
41
+#Map=custom/bigchamber.tr4
42
+#Map=custom/cleopal.tr4
43
+#Map=custom/khysos.tr4
44
+#Map=custom/Nasa.tr2
45
+#Map=custom/mansionfrost.tr2
46
+#Map=tr1/gym.phd
47
+#Map=tr1/level1.phd
48
+#Map=tr1/level2.phd
49
+#Map=tr2/unwater.tr2
50
+#Map=tr3/willsden.tr2
51
+#Map=tr3/undersea.tr2
52
+#Map=tr3/scotland.tr2
53
+#Map=tr3/HOUSE.TR2
54
+#Map=tr3/zoo.tr2
55
+#Map=tr3/slinc.tr2
56
+#Map=tr3/temple.tr2
57
+#Map=tr3/shore.tr2
58
+#Map=tr3/chunnel.tr2
59
+#Map=tr4/angkor1.tr4
60
+#Map=tr4/ang_race.tr4
61
+#Map=tr4/karnak1.tr4
62
+#Map=tr4/lake.tr4
63
+#Map=tr4/settomb1.tr4
64
+#Map=tr4/settomb2.tr4
65
+#Map=tr4/title.tr4
66
+#Map=tr5/demo.trc
67 67
 
68 68
 [OpenRaider.Console]
69 69
 bind +console 96

Двоични данни
data/Yvel.tr2 Целия файл


+ 2
- 1
mac_dist/OpenRaider Целия файл

@@ -5,13 +5,14 @@ if [ ! -d "~/.OpenRaider" ]; then
5 5
     mkdir -p ~/.OpenRaider
6 6
     cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
7 7
     cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
8
-    mkdir -p ~/.OpenRaider/paks
8
+    mkdir -p ~/.OpenRaider/paks/custom
9 9
     mkdir -p ~/.OpenRaider/music
10 10
     mkdir -p ~/.OpenRaider/data
11 11
     mkdir -p ~/.OpenRaider/sshots
12 12
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
13 13
     cp ../Resources/defaults/*.wav ~/.OpenRaider/data
14 14
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
15
+    cp ../Resources/defaults/*.tr2 ~/.OpenRaider/paks/custom
15 16
     echo "DONE"
16 17
 fi
17 18
 ./OpenRaider-bin

+ 2
- 1
setup.sh Целия файл

@@ -6,11 +6,12 @@ echo "Setting up OpenRaider for user $USER..."
6 6
 mkdir -p ~/.OpenRaider
7 7
 cp data/OpenRaider.init ~/.OpenRaider/
8 8
 cp data/custom.cfg ~/.OpenRaider/
9
-mkdir -p ~/.OpenRaider/paks
9
+mkdir -p ~/.OpenRaider/paks/custom
10 10
 mkdir -p ~/.OpenRaider/music
11 11
 mkdir -p ~/.OpenRaider/data
12 12
 mkdir -p ~/.OpenRaider/sshots
13 13
 cp data/*.tga ~/.OpenRaider/data
14 14
 cp data/*.wav ~/.OpenRaider/data
15 15
 cp data/*.ttf ~/.OpenRaider/data
16
+cp data/*.tr2 ~/.OpenRaider/paks/custom
16 17
 echo "DONE"

Loading…
Отказ
Запис