Removed mac_dist, not needed with cmake

cmake/FindSDL2TTF.cmake

@@ -102,67 +102,7 @@ FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP
 	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

mac_dist/OpenRaider.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-if [ ! -d "${HOME}/.OpenRaider" ]; then
-    echo "Setting up OpenRaider for user $USER..."
-    mkdir -p ~/.OpenRaider
-    cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
-    cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
-    mkdir -p ~/.OpenRaider/paks
-    mkdir -p ~/.OpenRaider/music
-    mkdir -p ~/.OpenRaider/data
-    mkdir -p ~/.OpenRaider/sshots
-    cp ../Resources/defaults/*.tga ~/.OpenRaider/data
-    cp ../Resources/defaults/*.wav ~/.OpenRaider/data
-    cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
-    echo "DONE"
-    osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.init to your needs..."'
-fi
-if [[ ! -n `find "${HOME}/.OpenRaider/paks" -type f -exec echo Found {} \;` ]]; then
-    echo "Missing level files!"
-    osascript -e 'tell app "System Events" to display alert "No level files stored in ~/.OpenRaider/paks\n\nPlace level files there and edit ~/.OpenRaider/OpenRaider.init"'
-else
-    if [[ ! `diff "${HOME}/.OpenRaider/OpenRaider.init" "../Resources/defaults/OpenRaider.init"` ]]; then
-        if [[ ! `diff "${HOME}/.OpenRaider/custom.cfg" "../Resources/defaults/custom.cfg"` ]]; then
-            echo "Unconfigured user!"
-            osascript -e 'tell app "System Events" to display alert "Please edit ~/.OpenRaider/OpenRaider.init or ~/.OpenRaider/custom.cfg"'
-        else
-            ./OpenRaider-bin
-        fi
-    else
-        ./OpenRaider-bin
-    fi
-fi

mac_dist/archive.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo Creating ZIP file..
-cd bin
-zip -r OpenRaider.zip OpenRaider.app ../ChangeLog ../COPYING ../README.md ../README.old
-echo Archive ready!

mac_dist/bundle.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo Creating bundle directory structure
-mkdir -p bin/OpenRaider.app/Contents/MacOS
-mkdir -p bin/OpenRaider.app/Contents/Resources/defaults
-mkdir -p bin/OpenRaider.app/Contents/Frameworks
-
-echo Moving bundle data in place
-cp mac_dist/openraider.icns bin/OpenRaider.app/Contents/Resources/openraider.icns
-cp mac_dist/OpenRaider.sh bin/OpenRaider.app/Contents/MacOS/OpenRaider
-cp bin/release/OpenRaider bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
-cp data/* bin/OpenRaider.app/Contents/Resources/defaults/

mac_dist/frameworks.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-echo Moving dynamic libraries into place
-cp /usr/local/lib/libalut.0.dylib bin/OpenRaider.app/Contents/Frameworks/libalut.0.dylib
-cp /opt/local/lib/libSDL2_ttf-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2_ttf-2.0.0.dylib
-cp /opt/local/lib/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libz.1.dylib
-cp /opt/local/lib/libSDL2-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2-2.0.0.dylib
-cp /opt/local/lib/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
-cp /opt/local/lib/libpng16.16.dylib bin/OpenRaider.app/Contents/Frameworks/libpng16.16.dylib
-
-echo Fixing Paths for OpenRaider-bin
-install_name_tool -change /usr/local/lib/libalut.0.dylib @executable_path/../Frameworks/libalut.0.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
-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
-install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
-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
-
-echo Fixing Paths for libSDL2_ttf-2.0.0.dylib
-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
-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
-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
-
-echo Fixing Paths for libfreetype.6.dylib
-install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
-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
-install_name_tool -change /opt/local/lib/libpng16.16.dylib @executable_path/../Frameworks/libpng16.16.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
-
-echo Fixing Paths for libpng16.16.dylib
-install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libpng16.16.dylib
-
-echo Dynamic libraries are set up!

mac_dist/image.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-echo Creating temporary image
-hdiutil create -size 32m -fs HFS+ -volname "OpenRaider" bin/tmp.dmg
-
-echo Mounting image
-hdiutil attach bin/tmp.dmg
-
-echo Moving files
-cp -r bin/OpenRaider.app /Volumes/OpenRaider/OpenRaider.app
-osascript -e 'tell application "Finder" to make alias file to POSIX file "/Applications" at POSIX file "/Volumes/OpenRaider/"'
-cp COPYING /Volumes/OpenRaider/
-cp README.md /Volumes/OpenRaider/
-cp README.old /Volumes/OpenRaider/
-
-echo Unmounting image
-hdiutil detach /Volumes/OpenRaider
-
-echo Converting image
-hdiutil convert bin/tmp.dmg -format UDZO -o bin/OpenRaider.dmg
-rm -rf bin/tmp.dmg
-
-echo Image ready!

mac_dist/plist.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Argument 1: Project Name
-# Argument 2: Short Version (0.1.1)
-# Argument 3: Long Version (0.1.1-20131214)
-
-YEAR=`date +%Y`
-
-echo '<?xml version="1.0" encoding="UTF-8"?>'
-echo '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
-echo '<plist version="1.0">'
-echo '<dict>'
-echo '        <key>CFBundleDevelopmentRegion</key>'
-echo '        <string>English</string>'
-echo '        <key>CFBundleExecutable</key>'
-echo "        <string>$1</string>"
-echo '        <key>CFBundleGetInfoString</key>'
-echo "        <string>$1 Version $2-$3</string>"
-echo '        <key>CFBundleIconFile</key>'
-echo '        <string>openraider.icns</string>'
-echo '        <key>CFBundleIdentifier</key>'
-echo '        <string>de.xythobuz.openraider</string>'
-echo '        <key>CFBundleInfoDictionaryVersion</key>'
-echo '        <string>6.0</string>'
-echo '        <key>CFBundleLongVersionString</key>'
-echo "        <string>$2-$3</string>"
-echo '        <key>CFBundleName</key>'
-echo "        <string>$1</string>"
-echo '        <key>CFBundlePackageType</key>'
-echo '        <string>APPL</string>'
-echo '        <key>CFBundleShortVersionString</key>'
-echo "        <string>$2-$3</string>"
-echo '        <key>CFBundleSignature</key>'
-echo '        <string>????</string>'
-echo '        <key>CFBundleVersion</key>'
-echo "        <string>$2-$3</string>"
-echo '        <key>CSResourcesFileMapped</key>'
-echo '        <true/>'
-echo '        <key>NSHumanReadableCopyright</key>'
-echo "        <string>Copyright 2001 - ${YEAR}</string>"
-echo '</dict>'
-echo '</plist>'

setup.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-## If you modify this file, do similar changes in mac_dist/OpenRaider.sh
-
 echo "Setting up OpenRaider for user $USER..."
 mkdir -p ~/.OpenRaider
 cp data/OpenRaider.init ~/.OpenRaider/