Bladeren bron

Now linking OpenRaider to correct TTF lib

Thomas Buck 10 jaren geleden
bovenliggende
commit
0c0ae24bff
2 gewijzigde bestanden met toevoegingen van 9 en 26 verwijderingen
  1. 3
    3
      Makefile
  2. 6
    23
      mac_dist/frameworks.sh

+ 3
- 3
Makefile Bestand weergeven

@@ -31,7 +31,7 @@ UNAME=$(shell uname -s)
31 31
 BASE_DEFS=-Iinclude -DUSING_EMITTER
32 32
 
33 33
 BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
34
-	-lpthread -lSDL_ttf
34
+	-lpthread -lSDL2_ttf
35 35
 
36 36
 # -DDEBUG_GL
37 37
 DEBUG_DEFS=-DDEBUG -DEXPERIMENTAL
@@ -50,6 +50,7 @@ AUDIO_LIBS += -lopenal -lalut
50 50
 GL_LIBS += -lGL -lGLU
51 51
 GL_LIBS += -L/usr/local/lib
52 52
 GL_DEFS += -isystem /usr/local/include
53
+BASE_LIBS += -L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi
53 54
 endif
54 55
 
55 56
 BASE_LIBS += $(AUDIO_LIBS)
@@ -92,8 +93,7 @@ BASE_CFLAGS=$(FLAGS_ALL) $(BASE_DEFS) \
92 93
 	-DVERSION=\"\\\"$(NAME)-$(VERSION)-$(BUILD_ID)\\\"\" \
93 94
 	-DBUILD_HOST=\"\\\"$(BUILD_HOST)\\\"\"
94 95
 
95
-LD_FLAGS=-L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi \
96
-	 -lm $(BASE_LIBS)
96
+LD_FLAGS=-lm $(BASE_LIBS)
97 97
 
98 98
 RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
99 99
 	-fomit-frame-pointer -O2 -Wall

+ 6
- 23
mac_dist/frameworks.sh Bestand weergeven

@@ -1,39 +1,22 @@
1 1
 #!/bin/sh
2 2
 echo Moving dynamic libraries into place
3 3
 cp /usr/local/lib/libalut.0.dylib bin/OpenRaider.app/Contents/Frameworks/libalut.0.dylib
4
-cp /opt/local/lib/libSDL_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL_ttf-2.0.0.dylib
4
+cp /opt/local/lib/libSDL2_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2_ttf-2.0.0.dylib
5 5
 cp /opt/local/lib/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libz.1.dylib
6
-cp /opt/local/lib/libSDL-1.2.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL-1.2.0.dylib
7 6
 cp /opt/local/lib/libSDL2-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2-2.0.0.dylib
8
-cp /opt/local/lib/libbz2.1.0.dylib bin/OpenRaider.app/Contents/Frameworks/libbz2.1.0.dylib
9 7
 cp /opt/local/lib/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
10 8
 cp /opt/local/lib/libpng16.16.dylib bin/OpenRaider.app/Contents/Frameworks/libpng16.16.dylib
11 9
 
12 10
 echo Fixing Paths for OpenRaider-bin
13 11
 install_name_tool -change /usr/local/lib/libalut.0.dylib @executable_path/../Frameworks/libalut.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
14
-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
12
+install_name_tool -change /opt/local/lib/libSDL2_ttf-2.0.0.dylib @executable_path/../Frameworks/libSDL2_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
15 13
 install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
16 14
 install_name_tool -change /opt/local/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
17
-install_name_tool -change /opt/X11/lib/libXmu.6.dylib /usr/X11/lib/libXmu.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
18
-install_name_tool -change /opt/X11/lib/libXt.6.dylib /usr/X11/lib/libXt.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
19
-install_name_tool -change /opt/X11/lib/libSM.6.dylib /usr/X11/lib/libSM.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
20
-install_name_tool -change /opt/X11/lib/libICE.6.dylib /usr/X11/lib/libICE.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
21
-install_name_tool -change /opt/X11/lib/libXext.6.dylib /usr/X11/lib/libXext.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
22
-install_name_tool -change /opt/X11/lib/libX11.6.dylib /usr/X11/lib/libX11.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
23
-install_name_tool -change /opt/X11/lib/libXi.6.dylib /usr/X11/lib/libXi.6.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
24 15
 
25
-# SDL_ttf seems to require libSDL-1.2.0. Weird MacPorts thing?
26
-echo Fixing Paths for libSDL-1.2.0.dylib
27
-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
28
-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
29
-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
30
-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
31
-
32
-echo Fixing Paths for libSDL_ttf-2.0.0.dylib
33
-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
34
-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
35
-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
36
-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
16
+echo Fixing Paths for libSDL2_ttf-2.0.0.dylib
17
+install_name_tool -change /opt/local/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2_ttf-2.0.0.dylib
18
+install_name_tool -change /opt/local/lib/libfreetype.6.dylib @executable_path/../Frameworks/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2_ttf-2.0.0.dylib
19
+install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2_ttf-2.0.0.dylib
37 20
 
38 21
 echo Fixing Paths for libfreetype.6.dylib
39 22
 install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib

Laden…
Annuleren
Opslaan