소스 검색

More or less working. No sound!

Thomas Buck 10 년 전
부모
커밋
580270d5f2
12개의 변경된 파일572개의 추가작업 그리고 405개의 파일을 삭제
  1. 1
    2
      .gitignore
  2. 93
    0
      CMakeLists.txt
  3. 0
    388
      Makefile
  4. 136
    0
      cmake/FindALUT.cmake
  5. 163
    0
      cmake/FindSDL2.cmake
  6. 163
    0
      cmake/FindSDL2TTF.cmake
  7. 0
    13
      deps.sh
  8. 13
    0
      include/Config.h.in
  9. 1
    0
      include/OpenRaider.h
  10. 1
    0
      include/Render.h
  11. 1
    0
      include/SDLSystem.h
  12. 0
    2
      src/Sound.cpp

+ 1
- 2
.gitignore 파일 보기

@@ -1,4 +1,3 @@
1 1
 .DS_Store
2
-bin
3
-depend
2
+build
4 3
 doc

+ 93
- 0
CMakeLists.txt 파일 보기

@@ -0,0 +1,93 @@
1
+cmake_minimum_required (VERSION 2.8)
2
+project (OpenRaider)
3
+
4
+# Version Number
5
+set (OpenRaider_VERSION_MAJOR 0)
6
+set (OpenRaider_VERSION_MINOR 1)
7
+set (OpenRaider_VERSION_MICRO 2)
8
+
9
+# Build Host
10
+set (OpenRaider_BUILD_HOST ${CMAKE_HOST_SYSTEM})
11
+
12
+# Configuration Header file
13
+configure_file (
14
+    "${PROJECT_SOURCE_DIR}/include/Config.h.in"
15
+    "${PROJECT_BINARY_DIR}/Config.h"
16
+)
17
+include_directories ("${PROJECT_BINARY_DIR}")
18
+
19
+# Preprocessor Flags
20
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
21
+
22
+# Source Files, Executable
23
+add_executable (OpenRaider
24
+    src/Camera.cpp
25
+    src/Emitter.cpp
26
+    src/GLString.cpp
27
+    src/MatMath.cpp
28
+    src/Matrix.cpp
29
+    src/Mesh.cpp
30
+    src/Network.cpp
31
+    src/OpenRaider.cpp
32
+    src/Particle.cpp
33
+    src/Quaternion.cpp
34
+    src/Render.cpp
35
+    src/SDLSystem.cpp
36
+    src/SkeletalModel.cpp
37
+    src/Sound.cpp
38
+    src/System.cpp
39
+    src/Texture.cpp
40
+    src/TombRaider.cpp
41
+    src/Vector3d.cpp
42
+    src/ViewVolume.cpp
43
+    src/World.cpp
44
+    src/tga.cpp
45
+)
46
+
47
+# Definitions for Debug build
48
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DEXPERIMENTAL")
49
+
50
+# Definitions for all builds
51
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSING_EMITTER")
52
+
53
+# Include Directory
54
+include_directories ("${PROJECT_SOURCE_DIR}/include")
55
+
56
+# Include External Modules
57
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
58
+
59
+# Add SDL2 Library
60
+find_package (SDL2 REQUIRED)
61
+include_directories (${SDL2_INCLUDE_DIR})
62
+set (LIBS ${LIBS} ${SDL2_LIBRARY})
63
+
64
+# Add SDL2_ttf Library
65
+find_package (SDL2TTF REQUIRED)
66
+include_directories (${SDL2TTF_INCLUDE_DIR})
67
+set (LIBS ${LIBS} ${SDL2TTF_LIBRARY})
68
+
69
+# Add OpenGL Library
70
+find_package (OpenGL REQUIRED)
71
+include_directories (${OPENGL_INCLUDE_DIRS})
72
+set (LIBS ${LIBS} ${OPENGL_LIBRARIES})
73
+
74
+# Add OpenAL Library
75
+find_package (OpenAL REQUIRED)
76
+include_directories (${OPENAL_INCLUDE_DIRS})
77
+set (LIBS ${LIBS} ${OPENAL_LIBRARIES})
78
+
79
+# Add ALUT Library
80
+find_package (ALUT REQUIRED)
81
+include_directories (${ALUT_INCLUDE_DIRS})
82
+set (LIBS ${LIBS} ${ALUT_LIBRARIES})
83
+
84
+# Add Z Library
85
+find_package (ZLIB REQUIRED)
86
+include_directories (${ZLIB_INCLUDE_DIRS})
87
+set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
88
+
89
+# Link to all found libs
90
+target_link_libraries (OpenRaider ${LIBS})
91
+
92
+# Add the install targets
93
+install (TARGETS OpenRaider DESTINATION bin)

+ 0
- 388
Makefile 파일 보기

@@ -1,388 +0,0 @@
1
-###############################################################
2
-# Mongoose <stu7440@westga.edu>
3
-###############################################################
4
-# + Cleaner clean
5
-# + Add new include tree
6
-# + Add new flags
7
-# + Install/Uninstall
8
-# + Debian and Redhat packaging
9
-# + Lots of misc new features
10
-###############################################################
11
-BUILD_SELECT=debug
12
-
13
-NAME=OpenRaider
14
-NAME_TAR=openraider
15
-MAJOR_VERSION=0
16
-MINOR_VERSION=1
17
-MICRO_VERSION=2
18
-BUILD_ID=$(shell date "+%Y%m%d")
19
-PRE=
20
-VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(PRE)
21
-VERSION_DEB=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_ID)
22
-BUILD_HOST=$(shell uname -s -n -r -m)
23
-ARCH=$(shell uname -m -s | sed -e "s/ /-/g")
24
-UNAME=$(shell uname -s)
25
-
26
-###############################################################
27
-
28
-# -DMULTITEXTURE			Add OpenGL multitexturing
29
-# -DUSING_EMITTER_IN_GAME	Run particle test in game
30
-
31
-BASE_DEFS=-Iinclude $(shell sdl2-config --cflags | sed "s/-I/-isystem /g") -DUSING_EMITTER
32
-
33
-BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
34
-	-lpthread -lSDL2_ttf
35
-
36
-# -DDEBUG_GL
37
-DEBUG_DEFS=-DDEBUG -DEXPERIMENTAL
38
-DEBUG_OBJ=
39
-
40
-ifeq ($(UNAME),Darwin)
41
-AUDIO_LIBS += -lalut
42
-AUDIO_LIBS += -framework OpenAL
43
-AUDIO_LIBS += -L/usr/local/lib
44
-AUDIO_DEFS += -isystem /usr/local/include
45
-GL_LIBS += -framework OpenGL
46
-else
47
-AUDIO_LIBS += -lopenal -lalut
48
-GL_LIBS += -lGL -lGLU
49
-GL_LIBS += -L/usr/local/lib
50
-GL_DEFS += -isystem /usr/local/include
51
-BASE_LIBS += -L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi
52
-endif
53
-
54
-BASE_LIBS += $(AUDIO_LIBS)
55
-BASE_LIBS += $(GL_LIBS)
56
-BASE_DEFS += $(AUDIO_DEFS)
57
-BASE_DEFS += $(GL_DEFS)
58
-
59
-###############################################################
60
-
61
-TREE_DIR=OpenRaider
62
-BUILD_DEBUG_DIR=bin/debug
63
-BUILD_RELEASE_DIR=bin/release
64
-BUILD_PROF_DIR=bin/prof
65
-BUILD_TEST_DIR=bin/test
66
-BUILD_INSTALL_DIR=bin/$(BUILD_SELECT)
67
-DEB_DIR=/tmp/$(NAME).deb
68
-
69
-# Edited for Debian GNU/Linux.
70
-DESTDIR =
71
-INSTALL_BIN=$(DESTDIR)/usr/games
72
-INSTALL_LIB=$(DESTDIR)/usr/lib
73
-INSTALL_DOC=$(DESTDIR)/usr/share/doc/$(NAME)
74
-INSTALL_SHARE=$(DESTDIR)/usr/share/$(NAME)
75
-INSTALL_INCLUDE=$(DESTDIR)/usr/include
76
-
77
-###############################################################
78
-CC=gcc
79
-WARNINGS=-Weverything -Wno-padded -Wno-packed
80
-WARNINGS+=-Wno-global-constructors -Wno-exit-time-destructors
81
-WARNINGS+=-Wno-documentation-unknown-command -Wno-c++98-compat-pedantic
82
-WARNINGS+=-Wno-missing-prototypes -Wno-missing-variable-declarations
83
-WARNINGS+=-Wno-disabled-macro-expansion
84
-
85
-WARNINGS+=-Wno-shorten-64-to-32 -Wno-sign-conversion
86
-
87
-FLAGS_ALL=-std=c++11
88
-
89
-BASE_CFLAGS=$(FLAGS_ALL) $(BASE_DEFS) \
90
-	-DVERSION=\"\\\"$(NAME)-$(VERSION)-$(BUILD_ID)\\\"\" \
91
-	-DBUILD_HOST=\"\\\"$(BUILD_HOST)\\\"\"
92
-
93
-LD_FLAGS=-lm $(BASE_LIBS)
94
-
95
-RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
96
-	-fomit-frame-pointer -O2 -Wall
97
-
98
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 $(DEBUG_DEFS) $(WARNINGS)
99
-
100
-################################################################
101
-
102
-DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
103
-DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
104
-
105
-TARGETS=$(BUILDDIR)/$(NAME)
106
-
107
-################################################################
108
-auto: $(BUILD_SELECT)
109
-
110
-run: $(BUILD_SELECT)
111
-	bin/$(BUILD_SELECT)/OpenRaider
112
-
113
-targets: $(TARGETS)
114
-
115
-bundle: release
116
-	mac_dist/bundle.sh
117
-	mac_dist/plist.sh $(NAME) $(VERSION) $(BUILD_ID) > bin/OpenRaider.app/Contents/Info.plist
118
-	mac_dist/frameworks.sh
119
-
120
-bundle-image: bundle
121
-	mac_dist/image.sh
122
-
123
-bundle-archive: bundle
124
-	mac_dist/archive.sh
125
-
126
-all: debug release prof
127
-
128
-debug:
129
-	@-mkdir -p $(BUILD_DEBUG_DIR)
130
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) \
131
-	CFLAGS="$(DEBUG_CFLAGS)" \
132
-	LD_FLAGS="$(LD_FLAGS)"
133
-
134
-prof:
135
-	@-mkdir -p $(BUILD_PROF_DIR)
136
-	$(MAKE) targets BUILDDIR=$(BUILD_PROF_DIR) \
137
-	CFLAGS="$(DEBUG_CFLAGS) -pg" \
138
-	LD_FLAGS="$(LD_FLAGS) -pg"
139
-
140
-release:
141
-	@-mkdir -p $(BUILD_RELEASE_DIR)
142
-	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) \
143
-	CFLAGS="$(RELEASE_CFLAGS)" \
144
-	LD_FLAGS="$(LD_FLAGS)"
145
-
146
-#####################################
147
-
148
-ded:
149
-	@-mkdir -p $(BUILD_DEBUG_DIR)/ded
150
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR)/ded \
151
-	CFLAGS="$(DEBUG_CFLAGS) -DDEDICATED_SERVER" \
152
-	LD_FLAGS="$(LD_FLAGS)"
153
-
154
-depend:
155
-	@-echo "Making deps..."
156
-	@-echo "# Autogenerated dependency file" > depend
157
-	@-find ./src -name "*.cpp" -exec ./deps.sh $(BASE_DEFS) {} \; >> depend
158
-	@-echo "[DONE]"
159
-
160
-################################################################
161
-
162
-OBJS = \
163
-	$(DEBUG_OBJ) \
164
-	$(BUILDDIR)/Camera.o \
165
-	$(BUILDDIR)/Emitter.o \
166
-	$(BUILDDIR)/GLString.o \
167
-	$(BUILDDIR)/MatMath.o \
168
-	$(BUILDDIR)/Matrix.o \
169
-	$(BUILDDIR)/Mesh.o \
170
-	$(BUILDDIR)/Network.o \
171
-	$(BUILDDIR)/OpenRaider.o \
172
-	$(BUILDDIR)/Particle.o \
173
-	$(BUILDDIR)/Quaternion.o \
174
-	$(BUILDDIR)/Render.o \
175
-	$(BUILDDIR)/SDLSystem.o \
176
-	$(BUILDDIR)/SkeletalModel.o \
177
-	$(BUILDDIR)/Sound.o \
178
-	$(BUILDDIR)/System.o \
179
-	$(BUILDDIR)/Texture.o \
180
-	$(BUILDDIR)/tga.o \
181
-	$(BUILDDIR)/TombRaider.o \
182
-	$(BUILDDIR)/Vector3d.o \
183
-	$(BUILDDIR)/ViewVolume.o \
184
-	$(BUILDDIR)/World.o
185
-
186
-
187
-$(BUILDDIR)/$(NAME) : $(OBJS)
188
-	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJS)
189
-
190
-#################################################################
191
-
192
-CHECK_BIN=cppcheck
193
-CHECK_DIR=.
194
-CHECK_STD=--std=c++11 --std=posix
195
-CHECK_FLAGS=--quiet --force
196
-CHECK_INC=-Iinclude
197
-CHECK_NORMAL=--enable=information,warning,performance,portability
198
-CHECK_FULL=--enable=all
199
-CHECK_CONFIG=--check-config
200
-
201
-check:
202
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
203
-		$(CHECK_NORMAL) $(CHECK_DIR)
204
-
205
-checkFull:
206
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
207
-		$(CHECK_FULL) $(CHECK_DIR)
208
-
209
-checkConfig:
210
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_CONFIG) $(CHECK_DIR)
211
-
212
-#################################################################
213
-
214
-docLocal:
215
-	sed -i '' 's/HAVE_DOT               = YES/HAVE_DOT               = NO/g' Doxyfile
216
-	doxygen
217
-	cp -R doc/html/* ../apache/
218
-	rm -rf doc
219
-	sed -i '' 's/HAVE_DOT               = NO/HAVE_DOT               = YES/g' Doxyfile
220
-
221
-#################################################################
222
-
223
-clean: clean-small clean-dep clean-doc
224
-
225
-clean-small: clean-build clean-test clean-obj
226
-	@-rm -rf bin/OpenRaider.app
227
-	@-rm -rf bin/OpenRaider.dmg
228
-	@-rm -rf bin/OpenRaider.zip
229
-
230
-clean-dep:
231
-	@-echo "Cleaning dependencies"
232
-	@-rm -f depend
233
-	@-echo "[DONE]"
234
-
235
-clean-test:
236
-	@-echo "Cleaning test builds"
237
-	@-rm -f $(BUILD_TEST_DIR)/*.o
238
-	@-rm -rf $(BUILD_TEST_DIR)/*.dSYM
239
-	@-rm -f $(BUILD_TEST_DIR)/*.test
240
-	@-rm -rf $(BUILD_TEST_DIR)/*.build
241
-	@-echo "[DONE]"
242
-
243
-clean-obj:
244
-	@-echo "Cleaning objects"
245
-	@-rm -f $(BUILD_PROF_DIR)/*.o
246
-	@-rm -f $(BUILD_DEBUG_DIR)/*.o
247
-	@-rm -f $(BUILD_RELEASE_DIR)/*.o
248
-	@-rm -f $(BUILD_TEST_DIR)/*.o
249
-	@-echo "[DONE]"
250
-
251
-clean-build:
252
-	@-echo "Cleaning builds"
253
-	@-rm -f $(BUILD_PROF_DIR)/$(NAME)
254
-	@-rm -f $(BUILD_DEBUG_DIR)/$(NAME)
255
-	@-rm -f $(BUILD_RELEASE_DIR)/$(NAME)
256
-	@-echo "[DONE]"
257
-
258
-clean-doc:
259
-	@-echo "Cleaning docs"
260
-	@-rm -rf doc
261
-	@-echo "[DONE]"
262
-
263
-
264
-#################################################################
265
-
266
--include depend
267
-
268
-#################################################################
269
-
270
-ifneq ($(UNAME),Darwin)
271
-
272
-install:
273
-	mkdir -p $(INSTALL_SHARE)/data
274
-	cp setup.sh $(INSTALL_SHARE)
275
-	cp data/* $(INSTALL_SHARE)/data
276
-	mkdir -p $(INSTALL_DOC)
277
-	cp README.md README.old ChangeLog
278
-	mkdir -p $(INSTALL_BIN)
279
-	cp bin/$(BUILD_SELECT)/OpenRaider $(INSTALL_BIN)
280
-
281
-bin-tarball: clean-build clean-test clean-obj $(BUILD_SELECT)
282
-	@-cd .. && tar zcvf $(NAME_TAR)-$(VERSION_DEB)-$(ARCH).tar.gz \
283
-		$(TREE_DIR)/Makefile $(TREE_DIR)/data \
284
-		$(TREE_DIR)/bin/$(BUILD_SELECT)/OpenRaider \
285
-		$(TREE_DIR)/README.md $(TREE_DIR)/ChangeLog
286
-
287
-endif
288
-
289
-#################################################################
290
-# Unit Test builds
291
-#################################################################
292
-TEST_FLAGS=$(FLAGS_ALL) -g -O0 -DDEBUG -DUNIT_TEST -lstdc++ -Iinclude
293
-
294
-TEST_MAP_TR5=~/.OpenRaider/paks/tr5/demo.trc
295
-TEST_MAP_TR4=~/.OpenRaider/paks/tr4/angkor1.tr4
296
-TEST_MAP_TR3=~/.OpenRaider/paks/tr3/scotland.tr2
297
-TEST_MAP_TR2=~/.OpenRaider/paks/tr2/unwater.tr2
298
-TEST_MAP_TR1=~/.OpenRaider/paks/tr1/level1.phd
299
-
300
-test.build: Matrix.test Math.test Network.test Sound.test tga.test GLString.test TombRaider.test
301
-
302
-test: test.build
303
-	@-echo "================================================="
304
-	@-echo "Running Matrix unit test"
305
-	$(BUILD_TEST_DIR)/Matrix.test
306
-	@-echo "================================================="
307
-	@-echo "Running Math unit test"
308
-	$(BUILD_TEST_DIR)/Math.test
309
-	@-echo "================================================="
310
-	@-echo "Running Sound unit test"
311
-	$(BUILD_TEST_DIR)/Sound.test
312
-	@-echo "================================================="
313
-	@-echo "Running TGA unit test"
314
-	$(BUILD_TEST_DIR)/tga.test
315
-	@-echo "================================================="
316
-	@-echo "Running GLString unit test"
317
-	$(BUILD_TEST_DIR)/GLString.test
318
-	@-echo "================================================="
319
-	@-echo "Running TombRaider unit test"
320
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR1)
321
-
322
-TombRaider.reg_test:
323
-	$(MAKE) TombRaider.test
324
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR1) > /tmp/log.tr1
325
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR2) > /tmp/log.tr2
326
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR3) > /tmp/log.tr3
327
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR4) > /tmp/log.tr4
328
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR5) > /tmp/log.tr5
329
-
330
-TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES
331
-
332
-TombRaider.test:
333
-	@-mkdir -p $(BUILD_TEST_DIR)
334
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
335
-	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
336
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o" \
337
-	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
338
-	LD_FLAGS="-lz -lstdc++"
339
-
340
-#################################################################
341
-
342
-GLString.test:
343
-	mkdir -p $(BUILD_TEST_DIR)
344
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
345
-	$(shell sdl2-config --libs) \
346
-	$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
347
-	src/Texture.cpp src/tga.cpp src/GLString.cpp \
348
-	test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
349
-
350
-#################################################################
351
-
352
-Matrix.test:
353
-	@-echo "Building Matrix unit test"
354
-	mkdir -p $(BUILD_TEST_DIR)
355
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
356
-	src/Matrix.cpp src/Quaternion.cpp src/Vector3d.cpp src/MatMath.cpp \
357
-	test/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
358
-
359
-Math.test:
360
-	@-echo "Building Math unit test"
361
-	mkdir -p $(BUILD_TEST_DIR)
362
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
363
-	src/MatMath.cpp src/Vector3d.cpp test/MatMath.cpp -o $(BUILD_TEST_DIR)/Math.test
364
-
365
-#################################################################
366
-
367
-Network.test:
368
-	mkdir -p $(BUILD_TEST_DIR)
369
-	$(CC) $(TEST_FLAGS) $(WARNINGS) src/MatMath.cpp src/Vector3d.cpp \
370
-	src/Network.cpp test/Network.cpp -o $(BUILD_TEST_DIR)/Network.test
371
-
372
-#################################################################
373
-
374
-Sound.test:
375
-	mkdir -p $(BUILD_TEST_DIR)
376
-	$(CC) $(TEST_FLAGS) $(WARNINGS) \
377
-		$(AUDIO_LIBS) $(AUDIO_DEFS) \
378
-		src/Sound.cpp test/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
379
-
380
-#################################################################
381
-
382
-tga.test:
383
-	mkdir -p $(BUILD_TEST_DIR)
384
-	$(CC) $(TEST_FLAGS) $(WARNINGS) \
385
-		src/tga.cpp test/tga.cpp -o $(BUILD_TEST_DIR)/tga.test
386
-
387
-#################################################################
388
-

+ 136
- 0
cmake/FindALUT.cmake 파일 보기

@@ -0,0 +1,136 @@
1
+# - try to find the OpenAL ALUT library
2
+#
3
+# Users may optionally supply:
4
+#  ALUT_ROOT_DIR - a prefix to start searching.
5
+#
6
+# Cache Variables: (probably not for direct use in your scripts)
7
+#  ALUT_INCLUDE_DIR
8
+#  ALUT_LIBRARY
9
+#
10
+# Non-cache variables you might use in your CMakeLists.txt:
11
+#  ALUT_FOUND
12
+#  ALUT_INCLUDE_DIRS
13
+#  ALUT_LIBRARIES
14
+#  ALUT_WORKAROUND_INCLUDE_DIRS - add these to your include path with
15
+#   include_directories(${ALUT_WORKAROUND_INCLUDE_DIRS} ${ALUT_INCLUDE_DIRS})
16
+#   so you can always #include <AL/al.h> and #include <AL/alut.h> even on
17
+#   Mac where the paths might differ.
18
+#
19
+# Requires these CMake modules:
20
+#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
21
+#
22
+# Original Author:
23
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
24
+# http://academic.cleardefinition.com
25
+# Iowa State University HCI Graduate Program/VRAC
26
+#
27
+# Copyright Iowa State University 2009-2010.
28
+# Distributed under the Boost Software License, Version 1.0.
29
+# (See accompanying file LICENSE_1_0.txt or copy at
30
+# http://www.boost.org/LICENSE_1_0.txt)
31
+
32
+set(ALUT_ROOT_DIR
33
+	"${ALUT_ROOT_DIR}"
34
+	CACHE
35
+	PATH
36
+	"Path to search for ALUT library")
37
+
38
+# Share search paths with OpenAL
39
+if(NOT "$ENV{OPENALDIR}" STREQUAL "")
40
+	if(NOT ALUT_ROOT_DIR)
41
+		set(ALUT_ROOT_DIR "$ENV{OPENALDIR}")
42
+	endif()
43
+else()
44
+	if(ALUT_ROOT_DIR)
45
+		set(ENV{OPENALDIR} "${ALUT_ROOT_DIR}")
46
+	endif()
47
+endif()
48
+
49
+
50
+
51
+###
52
+# Configure ALUT
53
+###
54
+find_path(ALUT_INCLUDE_DIR
55
+	NAMES
56
+	alut.h
57
+	HINTS
58
+	"${ALUT_ROOT_DIR}"
59
+	PATH_SUFFIXES
60
+	AL
61
+	alut
62
+	OpenAL
63
+	include
64
+	include/alut
65
+	include/freealut
66
+	include/AL
67
+	include/OpenAL
68
+	PATHS
69
+	/usr/local
70
+	/opt/local
71
+	/sw)
72
+mark_as_advanced(ALUT_INCLUDE_DIR)
73
+
74
+find_library(ALUT_LIBRARY
75
+	NAMES
76
+	alut
77
+	HINTS
78
+	"${ALUT_ROOT_DIR}"
79
+	PATH_SUFFIXES
80
+	lib
81
+	lib64
82
+	PATHS
83
+	/usr/local
84
+	/opt/local
85
+	/sw)
86
+mark_as_advanced(ALUT_LIBRARY)
87
+
88
+###
89
+# Prereq: OpenAL
90
+###
91
+
92
+# On Mac OS X, the ALUT headers were in the OpenAL framework until 10.4.7
93
+# If we found ALUT headers elsewhere, it's probably freealut which may
94
+# define the same symbols as the library in the framework (?)
95
+# so we might want to save/restore the CMake variable that controls searching
96
+# in frameworks
97
+find_package(OpenAL QUIET)
98
+
99
+# handle the QUIETLY and REQUIRED arguments and set xxx_FOUND to TRUE if
100
+# all listed variables are TRUE
101
+include(FindPackageHandleStandardArgs)
102
+find_package_handle_standard_args(ALUT
103
+	DEFAULT_MSG
104
+	ALUT_LIBRARY
105
+	ALUT_INCLUDE_DIR
106
+	OPENAL_FOUND)
107
+
108
+if(ALUT_FOUND)
109
+	set(ALUT_INCLUDE_DIRS "${OPENAL_INCLUDE_DIR}" "${ALUT_INCLUDE_DIR}")
110
+	set(ALUT_LIBRARIES "${OPENAL_LIBRARY}" ${ALUT_LIBRARY})
111
+	if(APPLE)
112
+		get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
113
+		if("${OPENAL_INCLUDE_DIR}" MATCHES "\\.framework$")
114
+			# OpenAL is in a framework - need a workaround
115
+			set(OPENAL_WORKAROUND_INCLUDE_DIR
116
+				"${_moddir}/workarounds/mac-openal")
117
+			list(APPEND
118
+				ALUT_WORKAROUND_INCLUDE_DIRS
119
+				"${OPENAL_WORKAROUND_INCLUDE_DIR}")
120
+		endif()
121
+		if("${ALUT_INCLUDE_DIR}" MATCHES "\\.framework$")
122
+			# ALUT is in the OpenAL framework - need a workaround
123
+			set(ALUT_WORKAROUND_INCLUDE_DIR
124
+				"${_moddir}/workarounds/mac-alut-framework")
125
+			list(APPEND
126
+				ALUT_WORKAROUND_INCLUDE_DIRS
127
+				"${ALUT_WORKAROUND_INCLUDE_DIR}")
128
+		endif()
129
+	endif()
130
+
131
+	if("${ALUT_INCLUDE_DIR}" MATCHES "AL$")
132
+		get_filename_component(_parent "${ALUT_INCLUDE_DIR}/.." ABSOLUTE)
133
+		list(APPEND ALUT_INCLUDE_DIRS "${_parent}")
134
+	endif()
135
+	mark_as_advanced(ALUT_ROOT_DIR)
136
+endif()

+ 163
- 0
cmake/FindSDL2.cmake 파일 보기

@@ -0,0 +1,163 @@
1
+# Locate SDL2 library
2
+# This module defines
3
+# SDL2_LIBRARY, the name of the library to link against
4
+# SDL2_FOUND, if false, do not try to link to SDL2
5
+# SDL2_INCLUDE_DIR, where to find SDL.h
6
+#
7
+# This module responds to the the flag:
8
+# SDL2_BUILDING_LIBRARY
9
+# If this is defined, then no SDL2main will be linked in because
10
+# only applications need main().
11
+# Otherwise, it is assumed you are building an application and this
12
+# module will attempt to locate and set the the proper link flags
13
+# as part of the returned SDL2_LIBRARY variable.
14
+#
15
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
16
+# OS X framework based version. (Other versions link to -lSDL2main which
17
+# this module will try to find on your behalf.) Also for OS X, this
18
+# module will automatically add the -framework Cocoa on your behalf.
19
+#
20
+#
21
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
22
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
23
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
24
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
25
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
26
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
27
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
28
+#
29
+#
30
+# $SDL2DIR is an environment variable that would
31
+# correspond to the ./configure --prefix=$SDL2DIR
32
+# used in building SDL2.
33
+# l.e.galup  9-20-02
34
+#
35
+# Modified by Eric Wing.
36
+# Added code to assist with automated building by using environmental variables
37
+# and providing a more controlled/consistent search behavior.
38
+# Added new modifications to recognize OS X frameworks and
39
+# additional Unix paths (FreeBSD, etc).
40
+# Also corrected the header search path to follow "proper" SDL guidelines.
41
+# Added a search for SDL2main which is needed by some platforms.
42
+# Added a search for threads which is needed by some platforms.
43
+# Added needed compile switches for MinGW.
44
+#
45
+# On OSX, this will prefer the Framework version (if found) over others.
46
+# People will have to manually change the cache values of
47
+# SDL2_LIBRARY to override this selection or set the CMake environment
48
+# CMAKE_INCLUDE_PATH to modify the search paths.
49
+#
50
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
51
+# This needed to change because "proper" SDL convention
52
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
53
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
54
+
55
+#=============================================================================
56
+# Copyright 2003-2009 Kitware, Inc.
57
+#
58
+# Distributed under the OSI-approved BSD License (the "License");
59
+# see accompanying file Copyright.txt for details.
60
+#
61
+# This software is distributed WITHOUT ANY WARRANTY; without even the
62
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
63
+# See the License for more information.
64
+#=============================================================================
65
+# (To distribute this file outside of CMake, substitute the full
66
+#  License text for the above reference.)
67
+
68
+SET(SDL2_SEARCH_PATHS
69
+	~/Library/Frameworks
70
+	/Library/Frameworks
71
+	/usr/local
72
+	/usr
73
+	/sw # Fink
74
+	/opt/local # DarwinPorts
75
+	/opt/csw # Blastwave
76
+	/opt
77
+)
78
+
79
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
80
+	HINTS
81
+	$ENV{SDL2DIR}
82
+	PATH_SUFFIXES include/SDL2 include
83
+	PATHS ${SDL2_SEARCH_PATHS}
84
+)
85
+
86
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
87
+	NAMES SDL2
88
+	HINTS
89
+	$ENV{SDL2DIR}
90
+	PATH_SUFFIXES lib64 lib
91
+	PATHS ${SDL2_SEARCH_PATHS}
92
+)
93
+
94
+IF(NOT SDL2_BUILDING_LIBRARY)
95
+	IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
96
+		# Non-OS X framework versions expect you to also dynamically link to
97
+		# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
98
+		# seem to provide SDL2main for compatibility even though they don't
99
+		# necessarily need it.
100
+		FIND_LIBRARY(SDL2MAIN_LIBRARY
101
+			NAMES SDL2main
102
+			HINTS
103
+			$ENV{SDL2DIR}
104
+			PATH_SUFFIXES lib64 lib
105
+			PATHS ${SDL2_SEARCH_PATHS}
106
+		)
107
+	ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
108
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
109
+
110
+# SDL2 may require threads on your system.
111
+# The Apple build may not need an explicit flag because one of the
112
+# frameworks may already provide it.
113
+# But for non-OSX systems, I will use the CMake Threads package.
114
+IF(NOT APPLE)
115
+	FIND_PACKAGE(Threads)
116
+ENDIF(NOT APPLE)
117
+
118
+# MinGW needs an additional library, mwindows
119
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
120
+# (Actually on second look, I think it only needs one of the m* libraries.)
121
+IF(MINGW)
122
+	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
123
+ENDIF(MINGW)
124
+
125
+IF(SDL2_LIBRARY_TEMP)
126
+	# For SDL2main
127
+	IF(NOT SDL2_BUILDING_LIBRARY)
128
+		IF(SDL2MAIN_LIBRARY)
129
+			SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
130
+		ENDIF(SDL2MAIN_LIBRARY)
131
+	ENDIF(NOT SDL2_BUILDING_LIBRARY)
132
+
133
+	# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
134
+	# CMake doesn't display the -framework Cocoa string in the UI even
135
+	# though it actually is there if I modify a pre-used variable.
136
+	# I think it has something to do with the CACHE STRING.
137
+	# So I use a temporary variable until the end so I can set the
138
+	# "real" variable in one-shot.
139
+	IF(APPLE)
140
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
141
+	ENDIF(APPLE)
142
+
143
+	# For threads, as mentioned Apple doesn't need this.
144
+	# In fact, there seems to be a problem if I used the Threads package
145
+	# and try using this line, so I'm just skipping it entirely for OS X.
146
+	IF(NOT APPLE)
147
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
148
+	ENDIF(NOT APPLE)
149
+
150
+	# For MinGW library
151
+	IF(MINGW)
152
+		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
153
+	ENDIF(MINGW)
154
+
155
+	# Set the final string here so the GUI reflects the final state.
156
+	SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
157
+	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
158
+	SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
159
+ENDIF(SDL2_LIBRARY_TEMP)
160
+
161
+INCLUDE(FindPackageHandleStandardArgs)
162
+
163
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

+ 163
- 0
cmake/FindSDL2TTF.cmake 파일 보기

@@ -0,0 +1,163 @@
1
+# Locate SDL2 library
2
+# This module defines
3
+# SDL2_LIBRARY, the name of the library to link against
4
+# SDL2_FOUND, if false, do not try to link to SDL2
5
+# SDL2_INCLUDE_DIR, where to find SDL.h
6
+#
7
+# This module responds to the the flag:
8
+# SDL2_BUILDING_LIBRARY
9
+# If this is defined, then no SDL2main will be linked in because
10
+# only applications need main().
11
+# Otherwise, it is assumed you are building an application and this
12
+# module will attempt to locate and set the the proper link flags
13
+# as part of the returned SDL2_LIBRARY variable.
14
+#
15
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
16
+# OS X framework based version. (Other versions link to -lSDL2main which
17
+# this module will try to find on your behalf.) Also for OS X, this
18
+# module will automatically add the -framework Cocoa on your behalf.
19
+#
20
+#
21
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
22
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
23
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
24
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
25
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
26
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
27
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
28
+#
29
+#
30
+# $SDL2DIR is an environment variable that would
31
+# correspond to the ./configure --prefix=$SDL2DIR
32
+# used in building SDL2.
33
+# l.e.galup  9-20-02
34
+#
35
+# Modified by Eric Wing.
36
+# Added code to assist with automated building by using environmental variables
37
+# and providing a more controlled/consistent search behavior.
38
+# Added new modifications to recognize OS X frameworks and
39
+# additional Unix paths (FreeBSD, etc).
40
+# Also corrected the header search path to follow "proper" SDL guidelines.
41
+# Added a search for SDL2main which is needed by some platforms.
42
+# Added a search for threads which is needed by some platforms.
43
+# Added needed compile switches for MinGW.
44
+#
45
+# On OSX, this will prefer the Framework version (if found) over others.
46
+# People will have to manually change the cache values of
47
+# SDL2_LIBRARY to override this selection or set the CMake environment
48
+# CMAKE_INCLUDE_PATH to modify the search paths.
49
+#
50
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
51
+# This needed to change because "proper" SDL convention
52
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
53
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
54
+
55
+#=============================================================================
56
+# Copyright 2003-2009 Kitware, Inc.
57
+#
58
+# Distributed under the OSI-approved BSD License (the "License");
59
+# see accompanying file Copyright.txt for details.
60
+#
61
+# This software is distributed WITHOUT ANY WARRANTY; without even the
62
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
63
+# See the License for more information.
64
+#=============================================================================
65
+# (To distribute this file outside of CMake, substitute the full
66
+#  License text for the above reference.)
67
+
68
+SET(SDL2TTF_SEARCH_PATHS
69
+	~/Library/Frameworks
70
+	/Library/Frameworks
71
+	/usr/local
72
+	/usr
73
+	/sw # Fink
74
+	/opt/local # DarwinPorts
75
+	/opt/csw # Blastwave
76
+	/opt
77
+)
78
+
79
+FIND_PATH(SDL2TTF_INCLUDE_DIR SDL_ttf.h
80
+	HINTS
81
+	$ENV{SDL2TTFDIR}
82
+	PATH_SUFFIXES include/SDL2 include
83
+	PATHS ${SDL2TTF_SEARCH_PATHS}
84
+)
85
+
86
+FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP
87
+	NAMES SDL2_ttf
88
+	HINTS
89
+	$ENV{SDL2TTFDIR}
90
+	PATH_SUFFIXES lib64 lib
91
+	PATHS ${SDL2TTF_SEARCH_PATHS}
92
+)
93
+
94
+IF(NOT SDL2TTF_BUILDING_LIBRARY)
95
+	IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
96
+		# Non-OS X framework versions expect you to also dynamically link to
97
+		# SDL2TTFmain. This is mainly for Windows and OS X. Other (Unix) platforms
98
+		# seem to provide SDL2TTFmain for compatibility even though they don't
99
+		# necessarily need it.
100
+		FIND_LIBRARY(SDL2TTFMAIN_LIBRARY
101
+			NAMES SDL2_ttf
102
+			HINTS
103
+			$ENV{SDL2TTFDIR}
104
+			PATH_SUFFIXES lib64 lib
105
+			PATHS ${SDL2TTF_SEARCH_PATHS}
106
+		)
107
+	ENDIF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
108
+ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
109
+
110
+# SDL2TTF may require threads on your system.
111
+# The Apple build may not need an explicit flag because one of the
112
+# frameworks may already provide it.
113
+# But for non-OSX systems, I will use the CMake Threads package.
114
+IF(NOT APPLE)
115
+	FIND_PACKAGE(Threads)
116
+ENDIF(NOT APPLE)
117
+
118
+# MinGW needs an additional library, mwindows
119
+# It's total link flags should look like -lmingw32 -lSDL2TTFmain -lSDL2TTF -lmwindows
120
+# (Actually on second look, I think it only needs one of the m* libraries.)
121
+IF(MINGW)
122
+	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
123
+ENDIF(MINGW)
124
+
125
+IF(SDL2TTF_LIBRARY_TEMP)
126
+	# For SDL2TTFmain
127
+	IF(NOT SDL2TTF_BUILDING_LIBRARY)
128
+		IF(SDL2TTFMAIN_LIBRARY)
129
+			SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTFMAIN_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
130
+		ENDIF(SDL2TTFMAIN_LIBRARY)
131
+	ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
132
+
133
+	# For OS X, SDL2TTF uses Cocoa as a backend so it must link to Cocoa.
134
+	# CMake doesn't display the -framework Cocoa string in the UI even
135
+	# though it actually is there if I modify a pre-used variable.
136
+	# I think it has something to do with the CACHE STRING.
137
+	# So I use a temporary variable until the end so I can set the
138
+	# "real" variable in one-shot.
139
+	IF(APPLE)
140
+		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} "-framework Cocoa")
141
+	ENDIF(APPLE)
142
+
143
+	# For threads, as mentioned Apple doesn't need this.
144
+	# In fact, there seems to be a problem if I used the Threads package
145
+	# and try using this line, so I'm just skipping it entirely for OS X.
146
+	IF(NOT APPLE)
147
+		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
148
+	ENDIF(NOT APPLE)
149
+
150
+	# For MinGW library
151
+	IF(MINGW)
152
+		SET(SDL2TTF_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
153
+	ENDIF(MINGW)
154
+
155
+	# Set the final string here so the GUI reflects the final state.
156
+	SET(SDL2TTF_LIBRARY ${SDL2TTF_LIBRARY_TEMP} CACHE STRING "Where the SDL2TTF Library can be found")
157
+	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
158
+	SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "")
159
+ENDIF(SDL2TTF_LIBRARY_TEMP)
160
+
161
+INCLUDE(FindPackageHandleStandardArgs)
162
+
163
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR)

+ 0
- 13
deps.sh 파일 보기

@@ -1,13 +0,0 @@
1
-# Mongoose - This is a simple dep line generator
2
-# modified by xythobuz
3
-#
4
-# Call it passing CFLAGS and a source filename
5
-# to generate a dep line
6
-
7
-cc -MM -w $@
8
-OUT=$?
9
-if [ $OUT -eq 0 ];then
10
-    printf "\$(BUILDDIR)/"
11
-    cc -MM -w $@
12
-    printf "\t \$(DO_CC)\n\n"
13
-fi

+ 13
- 0
include/Config.h.in 파일 보기

@@ -0,0 +1,13 @@
1
+#define OpenRaider_VERSION_MAJOR @OpenRaider_VERSION_MAJOR@
2
+#define OpenRaider_VERSION_MINOR @OpenRaider_VERSION_MINOR@
3
+#define OpenRaider_VERSION_MICRO @OpenRaider_VERSION_MICRO@
4
+#define OpenRaider_BUILD_HOST @OpenRaider_BUILD_HOST@
5
+
6
+// Stringification Helper
7
+#define _xstringify(s) _stringify(s)
8
+#define _stringify(s) #s
9
+
10
+#define VERSION_NUMBER OpenRaider_VERSION_MAJOR.OpenRaider_VERSION_MINOR.OpenRaider_VERSION_MICRO
11
+
12
+#define VERSION _xstringify(OpenRaider-VERSION_NUMBER)
13
+#define BUILD_HOST _xstringify(OpenRaider_BUILD_HOST)

+ 1
- 0
include/OpenRaider.h 파일 보기

@@ -10,6 +10,7 @@
10 10
 
11 11
 #include <map>
12 12
 
13
+#include "Config.h"
13 14
 #include "List.h"
14 15
 #include "Vector.h"
15 16
 #include "TombRaider.h"

+ 1
- 0
include/Render.h 파일 보기

@@ -8,6 +8,7 @@
8 8
 #ifndef _RENDER_H_
9 9
 #define _RENDER_H_
10 10
 
11
+#include "Config.h"
11 12
 #include "List.h"
12 13
 #include "Vector.h"
13 14
 #include "Matrix.h"

+ 1
- 0
include/SDLSystem.h 파일 보기

@@ -10,6 +10,7 @@
10 10
 
11 11
 #include "SDL.h"
12 12
 
13
+#include "Config.h"
13 14
 #include "System.h"
14 15
 
15 16
 /*!

+ 0
- 2
src/Sound.cpp 파일 보기

@@ -8,10 +8,8 @@
8 8
 
9 9
 #ifdef __APPLE__
10 10
 #include <OpenAL/al.h>
11
-#include <OpenAL/alc.h>
12 11
 #else
13 12
 #include <AL/al.h>
14
-#include <AL/alc.h>
15 13
 #endif
16 14
 
17 15
 #include <AL/alut.h>

Loading…
취소
저장