More or less working. No sound!

.gitignore

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

CMakeLists.txt

@@ -0,0 +1,93 @@
+cmake_minimum_required (VERSION 2.8)
+project (OpenRaider)
+
+# Version Number
+set (OpenRaider_VERSION_MAJOR 0)
+set (OpenRaider_VERSION_MINOR 1)
+set (OpenRaider_VERSION_MICRO 2)
+
+# Build Host
+set (OpenRaider_BUILD_HOST ${CMAKE_HOST_SYSTEM})
+
+# Configuration Header file
+configure_file (
+    "${PROJECT_SOURCE_DIR}/include/Config.h.in"
+    "${PROJECT_BINARY_DIR}/Config.h"
+)
+include_directories ("${PROJECT_BINARY_DIR}")
+
+# Preprocessor Flags
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+# Source Files, Executable
+add_executable (OpenRaider
+    src/Camera.cpp
+    src/Emitter.cpp
+    src/GLString.cpp
+    src/MatMath.cpp
+    src/Matrix.cpp
+    src/Mesh.cpp
+    src/Network.cpp
+    src/OpenRaider.cpp
+    src/Particle.cpp
+    src/Quaternion.cpp
+    src/Render.cpp
+    src/SDLSystem.cpp
+    src/SkeletalModel.cpp
+    src/Sound.cpp
+    src/System.cpp
+    src/Texture.cpp
+    src/TombRaider.cpp
+    src/Vector3d.cpp
+    src/ViewVolume.cpp
+    src/World.cpp
+    src/tga.cpp
+)
+
+# Definitions for Debug build
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DEXPERIMENTAL")
+
+# Definitions for all builds
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSING_EMITTER")
+
+# Include Directory
+include_directories ("${PROJECT_SOURCE_DIR}/include")
+
+# Include External Modules
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+# Add SDL2 Library
+find_package (SDL2 REQUIRED)
+include_directories (${SDL2_INCLUDE_DIR})
+set (LIBS ${LIBS} ${SDL2_LIBRARY})
+
+# Add SDL2_ttf Library
+find_package (SDL2TTF REQUIRED)
+include_directories (${SDL2TTF_INCLUDE_DIR})
+set (LIBS ${LIBS} ${SDL2TTF_LIBRARY})
+
+# Add OpenGL Library
+find_package (OpenGL REQUIRED)
+include_directories (${OPENGL_INCLUDE_DIRS})
+set (LIBS ${LIBS} ${OPENGL_LIBRARIES})
+
+# Add OpenAL Library
+find_package (OpenAL REQUIRED)
+include_directories (${OPENAL_INCLUDE_DIRS})
+set (LIBS ${LIBS} ${OPENAL_LIBRARIES})
+
+# Add ALUT Library
+find_package (ALUT REQUIRED)
+include_directories (${ALUT_INCLUDE_DIRS})
+set (LIBS ${LIBS} ${ALUT_LIBRARIES})
+
+# Add Z Library
+find_package (ZLIB REQUIRED)
+include_directories (${ZLIB_INCLUDE_DIRS})
+set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
+
+# Link to all found libs
+target_link_libraries (OpenRaider ${LIBS})
+
+# Add the install targets
+install (TARGETS OpenRaider DESTINATION bin)

Makefile

@@ -1,388 +0,0 @@
-###############################################################
-# Mongoose <stu7440@westga.edu>
-###############################################################
-# + Cleaner clean
-# + Add new include tree
-# + Add new flags
-# + Install/Uninstall
-# + Debian and Redhat packaging
-# + Lots of misc new features
-###############################################################
-BUILD_SELECT=debug
-
-NAME=OpenRaider
-NAME_TAR=openraider
-MAJOR_VERSION=0
-MINOR_VERSION=1
-MICRO_VERSION=2
-BUILD_ID=$(shell date "+%Y%m%d")
-PRE=
-VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(PRE)
-VERSION_DEB=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_ID)
-BUILD_HOST=$(shell uname -s -n -r -m)
-ARCH=$(shell uname -m -s | sed -e "s/ /-/g")
-UNAME=$(shell uname -s)
-
-###############################################################
-
-# -DMULTITEXTURE			Add OpenGL multitexturing
-# -DUSING_EMITTER_IN_GAME	Run particle test in game
-
-BASE_DEFS=-Iinclude $(shell sdl2-config --cflags | sed "s/-I/-isystem /g") -DUSING_EMITTER
-
-BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
-	-lpthread -lSDL2_ttf
-
-# -DDEBUG_GL
-DEBUG_DEFS=-DDEBUG -DEXPERIMENTAL
-DEBUG_OBJ=
-
-ifeq ($(UNAME),Darwin)
-AUDIO_LIBS += -lalut
-AUDIO_LIBS += -framework OpenAL
-AUDIO_LIBS += -L/usr/local/lib
-AUDIO_DEFS += -isystem /usr/local/include
-GL_LIBS += -framework OpenGL
-else
-AUDIO_LIBS += -lopenal -lalut
-GL_LIBS += -lGL -lGLU
-GL_LIBS += -L/usr/local/lib
-GL_DEFS += -isystem /usr/local/include
-BASE_LIBS += -L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi
-endif
-
-BASE_LIBS += $(AUDIO_LIBS)
-BASE_LIBS += $(GL_LIBS)
-BASE_DEFS += $(AUDIO_DEFS)
-BASE_DEFS += $(GL_DEFS)
-
-###############################################################
-
-TREE_DIR=OpenRaider
-BUILD_DEBUG_DIR=bin/debug
-BUILD_RELEASE_DIR=bin/release
-BUILD_PROF_DIR=bin/prof
-BUILD_TEST_DIR=bin/test
-BUILD_INSTALL_DIR=bin/$(BUILD_SELECT)
-DEB_DIR=/tmp/$(NAME).deb
-
-# Edited for Debian GNU/Linux.
-DESTDIR =
-INSTALL_BIN=$(DESTDIR)/usr/games
-INSTALL_LIB=$(DESTDIR)/usr/lib
-INSTALL_DOC=$(DESTDIR)/usr/share/doc/$(NAME)
-INSTALL_SHARE=$(DESTDIR)/usr/share/$(NAME)
-INSTALL_INCLUDE=$(DESTDIR)/usr/include
-
-###############################################################
-CC=gcc
-WARNINGS=-Weverything -Wno-padded -Wno-packed
-WARNINGS+=-Wno-global-constructors -Wno-exit-time-destructors
-WARNINGS+=-Wno-documentation-unknown-command -Wno-c++98-compat-pedantic
-WARNINGS+=-Wno-missing-prototypes -Wno-missing-variable-declarations
-WARNINGS+=-Wno-disabled-macro-expansion
-
-WARNINGS+=-Wno-shorten-64-to-32 -Wno-sign-conversion
-
-FLAGS_ALL=-std=c++11
-
-BASE_CFLAGS=$(FLAGS_ALL) $(BASE_DEFS) \
-	-DVERSION=\"\\\"$(NAME)-$(VERSION)-$(BUILD_ID)\\\"\" \
-	-DBUILD_HOST=\"\\\"$(BUILD_HOST)\\\"\"
-
-LD_FLAGS=-lm $(BASE_LIBS)
-
-RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-	-fomit-frame-pointer -O2 -Wall
-
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 $(DEBUG_DEFS) $(WARNINGS)
-
-################################################################
-
-DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
-DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
-
-TARGETS=$(BUILDDIR)/$(NAME)
-
-################################################################
-auto: $(BUILD_SELECT)
-
-run: $(BUILD_SELECT)
-	bin/$(BUILD_SELECT)/OpenRaider
-
-targets: $(TARGETS)
-
-bundle: release
-	mac_dist/bundle.sh
-	mac_dist/plist.sh $(NAME) $(VERSION) $(BUILD_ID) > bin/OpenRaider.app/Contents/Info.plist
-	mac_dist/frameworks.sh
-
-bundle-image: bundle
-	mac_dist/image.sh
-
-bundle-archive: bundle
-	mac_dist/archive.sh
-
-all: debug release prof
-
-debug:
-	@-mkdir -p $(BUILD_DEBUG_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) \
-	CFLAGS="$(DEBUG_CFLAGS)" \
-	LD_FLAGS="$(LD_FLAGS)"
-
-prof:
-	@-mkdir -p $(BUILD_PROF_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_PROF_DIR) \
-	CFLAGS="$(DEBUG_CFLAGS) -pg" \
-	LD_FLAGS="$(LD_FLAGS) -pg"
-
-release:
-	@-mkdir -p $(BUILD_RELEASE_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) \
-	CFLAGS="$(RELEASE_CFLAGS)" \
-	LD_FLAGS="$(LD_FLAGS)"
-
-#####################################
-
-ded:
-	@-mkdir -p $(BUILD_DEBUG_DIR)/ded
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR)/ded \
-	CFLAGS="$(DEBUG_CFLAGS) -DDEDICATED_SERVER" \
-	LD_FLAGS="$(LD_FLAGS)"
-
-depend:
-	@-echo "Making deps..."
-	@-echo "# Autogenerated dependency file" > depend
-	@-find ./src -name "*.cpp" -exec ./deps.sh $(BASE_DEFS) {} \; >> depend
-	@-echo "[DONE]"
-
-################################################################
-
-OBJS = \
-	$(DEBUG_OBJ) \
-	$(BUILDDIR)/Camera.o \
-	$(BUILDDIR)/Emitter.o \
-	$(BUILDDIR)/GLString.o \
-	$(BUILDDIR)/MatMath.o \
-	$(BUILDDIR)/Matrix.o \
-	$(BUILDDIR)/Mesh.o \
-	$(BUILDDIR)/Network.o \
-	$(BUILDDIR)/OpenRaider.o \
-	$(BUILDDIR)/Particle.o \
-	$(BUILDDIR)/Quaternion.o \
-	$(BUILDDIR)/Render.o \
-	$(BUILDDIR)/SDLSystem.o \
-	$(BUILDDIR)/SkeletalModel.o \
-	$(BUILDDIR)/Sound.o \
-	$(BUILDDIR)/System.o \
-	$(BUILDDIR)/Texture.o \
-	$(BUILDDIR)/tga.o \
-	$(BUILDDIR)/TombRaider.o \
-	$(BUILDDIR)/Vector3d.o \
-	$(BUILDDIR)/ViewVolume.o \
-	$(BUILDDIR)/World.o
-
-
-$(BUILDDIR)/$(NAME) : $(OBJS)
-	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJS)
-
-#################################################################
-
-CHECK_BIN=cppcheck
-CHECK_DIR=.
-CHECK_STD=--std=c++11 --std=posix
-CHECK_FLAGS=--quiet --force
-CHECK_INC=-Iinclude
-CHECK_NORMAL=--enable=information,warning,performance,portability
-CHECK_FULL=--enable=all
-CHECK_CONFIG=--check-config
-
-check:
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
-		$(CHECK_NORMAL) $(CHECK_DIR)
-
-checkFull:
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_STD) \
-		$(CHECK_FULL) $(CHECK_DIR)
-
-checkConfig:
-	$(CHECK_BIN) $(CHECK_FLAGS) $(CHECK_INC) $(CHECK_CONFIG) $(CHECK_DIR)
-
-#################################################################
-
-docLocal:
-	sed -i '' 's/HAVE_DOT               = YES/HAVE_DOT               = NO/g' Doxyfile
-	doxygen
-	cp -R doc/html/* ../apache/
-	rm -rf doc
-	sed -i '' 's/HAVE_DOT               = NO/HAVE_DOT               = YES/g' Doxyfile
-
-#################################################################
-
-clean: clean-small clean-dep clean-doc
-
-clean-small: clean-build clean-test clean-obj
-	@-rm -rf bin/OpenRaider.app
-	@-rm -rf bin/OpenRaider.dmg
-	@-rm -rf bin/OpenRaider.zip
-
-clean-dep:
-	@-echo "Cleaning dependencies"
-	@-rm -f depend
-	@-echo "[DONE]"
-
-clean-test:
-	@-echo "Cleaning test builds"
-	@-rm -f $(BUILD_TEST_DIR)/*.o
-	@-rm -rf $(BUILD_TEST_DIR)/*.dSYM
-	@-rm -f $(BUILD_TEST_DIR)/*.test
-	@-rm -rf $(BUILD_TEST_DIR)/*.build
-	@-echo "[DONE]"
-
-clean-obj:
-	@-echo "Cleaning objects"
-	@-rm -f $(BUILD_PROF_DIR)/*.o
-	@-rm -f $(BUILD_DEBUG_DIR)/*.o
-	@-rm -f $(BUILD_RELEASE_DIR)/*.o
-	@-rm -f $(BUILD_TEST_DIR)/*.o
-	@-echo "[DONE]"
-
-clean-build:
-	@-echo "Cleaning builds"
-	@-rm -f $(BUILD_PROF_DIR)/$(NAME)
-	@-rm -f $(BUILD_DEBUG_DIR)/$(NAME)
-	@-rm -f $(BUILD_RELEASE_DIR)/$(NAME)
-	@-echo "[DONE]"
-
-clean-doc:
-	@-echo "Cleaning docs"
-	@-rm -rf doc
-	@-echo "[DONE]"
-
-
-#################################################################
-
--include depend
-
-#################################################################
-
-ifneq ($(UNAME),Darwin)
-
-install:
-	mkdir -p $(INSTALL_SHARE)/data
-	cp setup.sh $(INSTALL_SHARE)
-	cp data/* $(INSTALL_SHARE)/data
-	mkdir -p $(INSTALL_DOC)
-	cp README.md README.old ChangeLog
-	mkdir -p $(INSTALL_BIN)
-	cp bin/$(BUILD_SELECT)/OpenRaider $(INSTALL_BIN)
-
-bin-tarball: clean-build clean-test clean-obj $(BUILD_SELECT)
-	@-cd .. && tar zcvf $(NAME_TAR)-$(VERSION_DEB)-$(ARCH).tar.gz \
-		$(TREE_DIR)/Makefile $(TREE_DIR)/data \
-		$(TREE_DIR)/bin/$(BUILD_SELECT)/OpenRaider \
-		$(TREE_DIR)/README.md $(TREE_DIR)/ChangeLog
-
-endif
-
-#################################################################
-# Unit Test builds
-#################################################################
-TEST_FLAGS=$(FLAGS_ALL) -g -O0 -DDEBUG -DUNIT_TEST -lstdc++ -Iinclude
-
-TEST_MAP_TR5=~/.OpenRaider/paks/tr5/demo.trc
-TEST_MAP_TR4=~/.OpenRaider/paks/tr4/angkor1.tr4
-TEST_MAP_TR3=~/.OpenRaider/paks/tr3/scotland.tr2
-TEST_MAP_TR2=~/.OpenRaider/paks/tr2/unwater.tr2
-TEST_MAP_TR1=~/.OpenRaider/paks/tr1/level1.phd
-
-test.build: Matrix.test Math.test Network.test Sound.test tga.test GLString.test TombRaider.test
-
-test: test.build
-	@-echo "================================================="
-	@-echo "Running Matrix unit test"
-	$(BUILD_TEST_DIR)/Matrix.test
-	@-echo "================================================="
-	@-echo "Running Math unit test"
-	$(BUILD_TEST_DIR)/Math.test
-	@-echo "================================================="
-	@-echo "Running Sound unit test"
-	$(BUILD_TEST_DIR)/Sound.test
-	@-echo "================================================="
-	@-echo "Running TGA unit test"
-	$(BUILD_TEST_DIR)/tga.test
-	@-echo "================================================="
-	@-echo "Running GLString unit test"
-	$(BUILD_TEST_DIR)/GLString.test
-	@-echo "================================================="
-	@-echo "Running TombRaider unit test"
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR1)
-
-TombRaider.reg_test:
-	$(MAKE) TombRaider.test
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR1) > /tmp/log.tr1
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR2) > /tmp/log.tr2
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR3) > /tmp/log.tr3
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR4) > /tmp/log.tr4
-	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR5) > /tmp/log.tr5
-
-TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES
-
-TombRaider.test:
-	@-mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
-	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o" \
-	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
-	LD_FLAGS="-lz -lstdc++"
-
-#################################################################
-
-GLString.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
-	$(shell sdl2-config --libs) \
-	$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
-	src/Texture.cpp src/tga.cpp src/GLString.cpp \
-	test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
-
-#################################################################
-
-Matrix.test:
-	@-echo "Building Matrix unit test"
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
-	src/Matrix.cpp src/Quaternion.cpp src/Vector3d.cpp src/MatMath.cpp \
-	test/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
-
-Math.test:
-	@-echo "Building Math unit test"
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -g -lm -lstdc++ -Iinclude \
-	src/MatMath.cpp src/Vector3d.cpp test/MatMath.cpp -o $(BUILD_TEST_DIR)/Math.test
-
-#################################################################
-
-Network.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(TEST_FLAGS) $(WARNINGS) src/MatMath.cpp src/Vector3d.cpp \
-	src/Network.cpp test/Network.cpp -o $(BUILD_TEST_DIR)/Network.test
-
-#################################################################
-
-Sound.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(TEST_FLAGS) $(WARNINGS) \
-		$(AUDIO_LIBS) $(AUDIO_DEFS) \
-		src/Sound.cpp test/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
-
-#################################################################
-
-tga.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(TEST_FLAGS) $(WARNINGS) \
-		src/tga.cpp test/tga.cpp -o $(BUILD_TEST_DIR)/tga.test
-
-#################################################################
-

cmake/FindALUT.cmake

@@ -0,0 +1,136 @@
+# - try to find the OpenAL ALUT library
+#
+# Users may optionally supply:
+#  ALUT_ROOT_DIR - a prefix to start searching.
+#
+# Cache Variables: (probably not for direct use in your scripts)
+#  ALUT_INCLUDE_DIR
+#  ALUT_LIBRARY
+#
+# Non-cache variables you might use in your CMakeLists.txt:
+#  ALUT_FOUND
+#  ALUT_INCLUDE_DIRS
+#  ALUT_LIBRARIES
+#  ALUT_WORKAROUND_INCLUDE_DIRS - add these to your include path with
+#   include_directories(${ALUT_WORKAROUND_INCLUDE_DIRS} ${ALUT_INCLUDE_DIRS})
+#   so you can always #include <AL/al.h> and #include <AL/alut.h> even on
+#   Mac where the paths might differ.
+#
+# Requires these CMake modules:
+#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(ALUT_ROOT_DIR
+	"${ALUT_ROOT_DIR}"
+	CACHE
+	PATH
+	"Path to search for ALUT library")
+
+# Share search paths with OpenAL
+if(NOT "$ENV{OPENALDIR}" STREQUAL "")
+	if(NOT ALUT_ROOT_DIR)
+		set(ALUT_ROOT_DIR "$ENV{OPENALDIR}")
+	endif()
+else()
+	if(ALUT_ROOT_DIR)
+		set(ENV{OPENALDIR} "${ALUT_ROOT_DIR}")
+	endif()
+endif()
+
+
+
+###
+# Configure ALUT
+###
+find_path(ALUT_INCLUDE_DIR
+	NAMES
+	alut.h
+	HINTS
+	"${ALUT_ROOT_DIR}"
+	PATH_SUFFIXES
+	AL
+	alut
+	OpenAL
+	include
+	include/alut
+	include/freealut
+	include/AL
+	include/OpenAL
+	PATHS
+	/usr/local
+	/opt/local
+	/sw)
+mark_as_advanced(ALUT_INCLUDE_DIR)
+
+find_library(ALUT_LIBRARY
+	NAMES
+	alut
+	HINTS
+	"${ALUT_ROOT_DIR}"
+	PATH_SUFFIXES
+	lib
+	lib64
+	PATHS
+	/usr/local
+	/opt/local
+	/sw)
+mark_as_advanced(ALUT_LIBRARY)
+
+###
+# Prereq: OpenAL
+###
+
+# On Mac OS X, the ALUT headers were in the OpenAL framework until 10.4.7
+# If we found ALUT headers elsewhere, it's probably freealut which may
+# define the same symbols as the library in the framework (?)
+# so we might want to save/restore the CMake variable that controls searching
+# in frameworks
+find_package(OpenAL QUIET)
+
+# handle the QUIETLY and REQUIRED arguments and set xxx_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ALUT
+	DEFAULT_MSG
+	ALUT_LIBRARY
+	ALUT_INCLUDE_DIR
+	OPENAL_FOUND)
+
+if(ALUT_FOUND)
+	set(ALUT_INCLUDE_DIRS "${OPENAL_INCLUDE_DIR}" "${ALUT_INCLUDE_DIR}")
+	set(ALUT_LIBRARIES "${OPENAL_LIBRARY}" ${ALUT_LIBRARY})
+	if(APPLE)
+		get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+		if("${OPENAL_INCLUDE_DIR}" MATCHES "\\.framework$")
+			# OpenAL is in a framework - need a workaround
+			set(OPENAL_WORKAROUND_INCLUDE_DIR
+				"${_moddir}/workarounds/mac-openal")
+			list(APPEND
+				ALUT_WORKAROUND_INCLUDE_DIRS
+				"${OPENAL_WORKAROUND_INCLUDE_DIR}")
+		endif()
+		if("${ALUT_INCLUDE_DIR}" MATCHES "\\.framework$")
+			# ALUT is in the OpenAL framework - need a workaround
+			set(ALUT_WORKAROUND_INCLUDE_DIR
+				"${_moddir}/workarounds/mac-alut-framework")
+			list(APPEND
+				ALUT_WORKAROUND_INCLUDE_DIRS
+				"${ALUT_WORKAROUND_INCLUDE_DIR}")
+		endif()
+	endif()
+
+	if("${ALUT_INCLUDE_DIR}" MATCHES "AL$")
+		get_filename_component(_parent "${ALUT_INCLUDE_DIR}/.." ABSOLUTE)
+		list(APPEND ALUT_INCLUDE_DIRS "${_parent}")
+	endif()
+	mark_as_advanced(ALUT_ROOT_DIR)
+endif()

cmake/FindSDL2.cmake

@@ -0,0 +1,163 @@
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+SET(SDL2_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+	HINTS
+	$ENV{SDL2DIR}
+	PATH_SUFFIXES include/SDL2 include
+	PATHS ${SDL2_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
+	NAMES SDL2
+	HINTS
+	$ENV{SDL2DIR}
+	PATH_SUFFIXES lib64 lib
+	PATHS ${SDL2_SEARCH_PATHS}
+)
+
+IF(NOT SDL2_BUILDING_LIBRARY)
+	IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+		# Non-OS X framework versions expect you to also dynamically link to
+		# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+		# seem to provide SDL2main for compatibility even though they don't
+		# necessarily need it.
+		FIND_LIBRARY(SDL2MAIN_LIBRARY
+			NAMES SDL2main
+			HINTS
+			$ENV{SDL2DIR}
+			PATH_SUFFIXES lib64 lib
+			PATHS ${SDL2_SEARCH_PATHS}
+		)
+	ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+# SDL2 may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+	FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+IF(SDL2_LIBRARY_TEMP)
+	# For SDL2main
+	IF(NOT SDL2_BUILDING_LIBRARY)
+		IF(SDL2MAIN_LIBRARY)
+			SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+		ENDIF(SDL2MAIN_LIBRARY)
+	ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+	# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+	# CMake doesn't display the -framework Cocoa string in the UI even
+	# though it actually is there if I modify a pre-used variable.
+	# I think it has something to do with the CACHE STRING.
+	# So I use a temporary variable until the end so I can set the
+	# "real" variable in one-shot.
+	IF(APPLE)
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+	ENDIF(APPLE)
+
+	# For threads, as mentioned Apple doesn't need this.
+	# In fact, there seems to be a problem if I used the Threads package
+	# and try using this line, so I'm just skipping it entirely for OS X.
+	IF(NOT APPLE)
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+	ENDIF(NOT APPLE)
+
+	# For MinGW library
+	IF(MINGW)
+		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+	ENDIF(MINGW)
+
+	# Set the final string here so the GUI reflects the final state.
+	SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+	SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+ENDIF(SDL2_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

cmake/FindSDL2TTF.cmake

@@ -0,0 +1,163 @@
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+SET(SDL2TTF_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+FIND_PATH(SDL2TTF_INCLUDE_DIR SDL_ttf.h
+	HINTS
+	$ENV{SDL2TTFDIR}
+	PATH_SUFFIXES include/SDL2 include
+	PATHS ${SDL2TTF_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP
+	NAMES SDL2_ttf
+	HINTS
+	$ENV{SDL2TTFDIR}
+	PATH_SUFFIXES lib64 lib
+	PATHS ${SDL2TTF_SEARCH_PATHS}
+)
+
+IF(NOT SDL2TTF_BUILDING_LIBRARY)
+	IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
+		# Non-OS X framework versions expect you to also dynamically link to
+		# SDL2TTFmain. This is mainly for Windows and OS X. Other (Unix) platforms
+		# seem to provide SDL2TTFmain for compatibility even though they don't
+		# necessarily need it.
+		FIND_LIBRARY(SDL2TTFMAIN_LIBRARY
+			NAMES SDL2_ttf
+			HINTS
+			$ENV{SDL2TTFDIR}
+			PATH_SUFFIXES lib64 lib
+			PATHS ${SDL2TTF_SEARCH_PATHS}
+		)
+	ENDIF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
+
+# SDL2TTF may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+	FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2TTFmain -lSDL2TTF -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+IF(SDL2TTF_LIBRARY_TEMP)
+	# For SDL2TTFmain
+	IF(NOT SDL2TTF_BUILDING_LIBRARY)
+		IF(SDL2TTFMAIN_LIBRARY)
+			SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTFMAIN_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
+		ENDIF(SDL2TTFMAIN_LIBRARY)
+	ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
+
+	# For OS X, SDL2TTF uses Cocoa as a backend so it must link to Cocoa.
+	# CMake doesn't display the -framework Cocoa string in the UI even
+	# though it actually is there if I modify a pre-used variable.
+	# I think it has something to do with the CACHE STRING.
+	# So I use a temporary variable until the end so I can set the
+	# "real" variable in one-shot.
+	IF(APPLE)
+		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} "-framework Cocoa")
+	ENDIF(APPLE)
+
+	# For threads, as mentioned Apple doesn't need this.
+	# In fact, there seems to be a problem if I used the Threads package
+	# and try using this line, so I'm just skipping it entirely for OS X.
+	IF(NOT APPLE)
+		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+	ENDIF(NOT APPLE)
+
+	# For MinGW library
+	IF(MINGW)
+		SET(SDL2TTF_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
+	ENDIF(MINGW)
+
+	# Set the final string here so the GUI reflects the final state.
+	SET(SDL2TTF_LIBRARY ${SDL2TTF_LIBRARY_TEMP} CACHE STRING "Where the SDL2TTF Library can be found")
+	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+	SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "")
+ENDIF(SDL2TTF_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR)

deps.sh

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

include/Config.h.in

@@ -0,0 +1,13 @@
+#define OpenRaider_VERSION_MAJOR @OpenRaider_VERSION_MAJOR@
+#define OpenRaider_VERSION_MINOR @OpenRaider_VERSION_MINOR@
+#define OpenRaider_VERSION_MICRO @OpenRaider_VERSION_MICRO@
+#define OpenRaider_BUILD_HOST @OpenRaider_BUILD_HOST@
+
+// Stringification Helper
+#define _xstringify(s) _stringify(s)
+#define _stringify(s) #s
+
+#define VERSION_NUMBER OpenRaider_VERSION_MAJOR.OpenRaider_VERSION_MINOR.OpenRaider_VERSION_MICRO
+
+#define VERSION _xstringify(OpenRaider-VERSION_NUMBER)
+#define BUILD_HOST _xstringify(OpenRaider_BUILD_HOST)

include/OpenRaider.h

@@ -10,6 +10,7 @@
 
 #include <map>
 
+#include "Config.h"
 #include "List.h"
 #include "Vector.h"
 #include "TombRaider.h"

include/Render.h

@@ -8,6 +8,7 @@
 #ifndef _RENDER_H_
 #define _RENDER_H_
 
+#include "Config.h"
 #include "List.h"
 #include "Vector.h"
 #include "Matrix.h"

include/SDLSystem.h

@@ -10,6 +10,7 @@
 
 #include "SDL.h"
 
+#include "Config.h"
 #include "System.h"
 
 /*!

src/Sound.cpp

@@ -8,10 +8,8 @@
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
-#include <OpenAL/alc.h>
 #else
 #include <AL/al.h>
-#include <AL/alc.h>
 #endif
 
 #include <AL/alut.h>