浏览代码

Moved freealut, as it has build problems on OS X

Thomas Buck 11 年前
父节点
当前提交
96473e6f24
共有 4 个文件被更改,包括 26 次插入9 次删除
  1. 3
    0
      ChangeLog
  2. 8
    6
      Makefile
  3. 1
    1
      README.md
  4. 14
    2
      TODO

+ 3
- 0
ChangeLog 查看文件

@@ -6,6 +6,9 @@
6 6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
7 7
 
8 8
 	[ 20140102 ]
9
+	* Improved the Mac build steps...
10
+	  Freealut now in /usr/local so we don't need to call
11
+	  install_name_tool on the built binary
9 12
 	* Removed the old & unused GLUTSystem
10 13
 	* Replaced the (unknown) included sample sound file
11 14
 	* Removed some redundant build config defines

+ 8
- 6
Makefile 查看文件

@@ -30,7 +30,7 @@ UNAME=$(shell uname -s)
30 30
 # -DMULTITEXTURE		Add OpenGL multitexturing
31 31
 # -DUNICODE_SUPPORT		Add unicode/internation keyboard support
32 32
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
33
-BASE_DEFS=$(shell sdl-config --cflags) -Isrc -I/opt/local/include -DSDL_INTERFACE \
33
+BASE_DEFS=$(shell sdl-config --cflags) -Isrc -DSDL_INTERFACE \
34 34
 	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
35 35
 	-DUSING_OPENAL -DUSING_MTK_TGA -DUSING_PTHREADS \
36 36
 	-DUSING_HEL -DHAVE_SDL_TTF
@@ -44,16 +44,21 @@ DEBUG_OBJ=
44 44
 
45 45
 ifeq ($(UNAME),Darwin)
46 46
 AUDIO_LIBS += -lalut
47
-AUDIO_LIBS += -L/opt/local/lib
48
-AUDIO_LIBS += -I/opt/local/include
49 47
 AUDIO_LIBS += -framework OpenAL
48
+AUDIO_LIBS += -L/usr/local/lib
49
+AUDIO_DEFS += -I/usr/local/include
50
+BASE_LIBS += -L/opt/local/lib
51
+BASE_DEFS += -I/opt/local/include
50 52
 BASE_LIBS += -framework OpenGL
51 53
 BASE_LIBS += -framework GLUT
52 54
 else
53 55
 AUDIO_LIBS += -lopenal
56
+BASE_LIBS += -L/usr/local/lib
57
+BASE_DEFS += -I/usr/local/include
54 58
 endif
55 59
 
56 60
 BASE_LIBS += $(AUDIO_LIBS)
61
+BASE_DEFS += $(AUDIO_DEFS)
57 62
 
58 63
 # libferit, File transfer via HTTP/FTP/etc support
59 64
 LIBFERIT_LIB=/usr/local/lib/libferit.so
@@ -218,9 +223,6 @@ OBJS = \
218 223
 
219 224
 $(BUILDDIR)/$(NAME) : $(OBJS)
220 225
 	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJS)
221
-ifeq ($(UNAME),Darwin)
222
-	install_name_tool -change libalut.0.1.0.dylib /opt/local/lib/libalut.0.1.0.dylib $@
223
-endif
224 226
 
225 227
 #################################################################
226 228
 

+ 1
- 1
README.md 查看文件

@@ -33,7 +33,7 @@ To get Sound, you need [freealut](https://github.com/vancegroup/freealut). Get,
33 33
     git clone git@github.com:vancegroup/freealut.git
34 34
     mkdir build
35 35
     cd build
36
-    cmake .. -DCMAKE_INSTALL_PREFIX:STRING="/opt/local" -DCMAKE_C_FLAGS:STRING="-O2"
36
+    cmake .. -DCMAKE_INSTALL_PREFIX:STRING="/usr/local" -DCMAKE_C_FLAGS:STRING="-O2"
37 37
     make
38 38
     sudo make install
39 39
 

+ 14
- 2
TODO 查看文件

@@ -1,5 +1,17 @@
1
-Mac Setup Script:
2
-- Check not only for existence of ~/.OpenRaider but for all necessary files, so the user can update.
1
+ OpenRaider TODO 2014
2
+ ====================
3
+
4
+    * Mac Setup Script:
5
+      - Check not only for existence of ~/.OpenRaider but for all
6
+        necessary files, so the user can update.
7
+
8
+    * Get MD3 stuff (what does it even do?) to build
9
+
10
+    * Fix up the UNIT tests. Maybe move them into separate files?
11
+
12
+    * Remove install_name_tool in Makefile, as it is a problem with
13
+      building freealut on Mac
14
+
3 15
 
4 16
  OpenRaider 
5 17
  TODO ( Updated 2003.05.17 )

正在加载...
取消
保存