浏览代码

Removed mac_dist, not needed with cmake

Thomas Buck 10 年前
父节点
当前提交
b673ba0e7b
共有 9 个文件被更改,包括 0 次插入206 次删除
  1. 0
    60
      cmake/FindSDL2TTF.cmake
  2. 0
    32
      mac_dist/OpenRaider.sh
  3. 0
    6
      mac_dist/archive.sh
  4. 0
    12
      mac_dist/bundle.sh
  5. 0
    29
      mac_dist/frameworks.sh
  6. 0
    23
      mac_dist/image.sh
  7. 二进制
      mac_dist/openraider.icns
  8. 0
    42
      mac_dist/plist.sh
  9. 0
    2
      setup.sh

+ 0
- 60
cmake/FindSDL2TTF.cmake 查看文件

@@ -102,67 +102,7 @@ FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP
102 102
 	PATHS ${SDL2TTF_SEARCH_PATHS}
103 103
 )
104 104
 
105
-IF(NOT SDL2TTF_BUILDING_LIBRARY)
106
-	IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
107
-		# Non-OS X framework versions expect you to also dynamically link to
108
-		# SDL2TTFmain. This is mainly for Windows and OS X. Other (Unix) platforms
109
-		# seem to provide SDL2TTFmain for compatibility even though they don't
110
-		# necessarily need it.
111
-		FIND_LIBRARY(SDL2TTFMAIN_LIBRARY
112
-			NAMES SDL2_ttf
113
-			HINTS
114
-			$ENV{SDL2TTFDIR}
115
-			PATH_SUFFIXES lib64 lib
116
-			PATHS ${SDL2TTF_SEARCH_PATHS}
117
-		)
118
-	ENDIF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
119
-ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
120
-
121
-# SDL2TTF may require threads on your system.
122
-# The Apple build may not need an explicit flag because one of the
123
-# frameworks may already provide it.
124
-# But for non-OSX systems, I will use the CMake Threads package.
125
-IF(NOT APPLE)
126
-	FIND_PACKAGE(Threads)
127
-ENDIF(NOT APPLE)
128
-
129
-# MinGW needs an additional library, mwindows
130
-# It's total link flags should look like -lmingw32 -lSDL2TTFmain -lSDL2TTF -lmwindows
131
-# (Actually on second look, I think it only needs one of the m* libraries.)
132
-IF(MINGW)
133
-	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
134
-ENDIF(MINGW)
135
-
136 105
 IF(SDL2TTF_LIBRARY_TEMP)
137
-	# For SDL2TTFmain
138
-	IF(NOT SDL2TTF_BUILDING_LIBRARY)
139
-		IF(SDL2TTFMAIN_LIBRARY)
140
-			SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTFMAIN_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
141
-		ENDIF(SDL2TTFMAIN_LIBRARY)
142
-	ENDIF(NOT SDL2TTF_BUILDING_LIBRARY)
143
-
144
-	# For OS X, SDL2TTF uses Cocoa as a backend so it must link to Cocoa.
145
-	# CMake doesn't display the -framework Cocoa string in the UI even
146
-	# though it actually is there if I modify a pre-used variable.
147
-	# I think it has something to do with the CACHE STRING.
148
-	# So I use a temporary variable until the end so I can set the
149
-	# "real" variable in one-shot.
150
-	IF(APPLE)
151
-		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} "-framework Cocoa")
152
-	ENDIF(APPLE)
153
-
154
-	# For threads, as mentioned Apple doesn't need this.
155
-	# In fact, there seems to be a problem if I used the Threads package
156
-	# and try using this line, so I'm just skipping it entirely for OS X.
157
-	IF(NOT APPLE)
158
-		SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
159
-	ENDIF(NOT APPLE)
160
-
161
-	# For MinGW library
162
-	IF(MINGW)
163
-		SET(SDL2TTF_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2TTF_LIBRARY_TEMP})
164
-	ENDIF(MINGW)
165
-
166 106
 	# Set the final string here so the GUI reflects the final state.
167 107
 	SET(SDL2TTF_LIBRARY ${SDL2TTF_LIBRARY_TEMP} CACHE STRING "Where the SDL2TTF Library can be found")
168 108
 	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI

+ 0
- 32
mac_dist/OpenRaider.sh 查看文件

@@ -1,32 +0,0 @@
1
-#!/bin/sh
2
-cd `dirname $0`
3
-if [ ! -d "${HOME}/.OpenRaider" ]; then
4
-    echo "Setting up OpenRaider for user $USER..."
5
-    mkdir -p ~/.OpenRaider
6
-    cp ../Resources/defaults/OpenRaider.init ~/.OpenRaider/
7
-    cp ../Resources/defaults/custom.cfg ~/.OpenRaider/
8
-    mkdir -p ~/.OpenRaider/paks
9
-    mkdir -p ~/.OpenRaider/music
10
-    mkdir -p ~/.OpenRaider/data
11
-    mkdir -p ~/.OpenRaider/sshots
12
-    cp ../Resources/defaults/*.tga ~/.OpenRaider/data
13
-    cp ../Resources/defaults/*.wav ~/.OpenRaider/data
14
-    cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
15
-    echo "DONE"
16
-    osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.init to your needs..."'
17
-fi
18
-if [[ ! -n `find "${HOME}/.OpenRaider/paks" -type f -exec echo Found {} \;` ]]; then
19
-    echo "Missing level files!"
20
-    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"'
21
-else
22
-    if [[ ! `diff "${HOME}/.OpenRaider/OpenRaider.init" "../Resources/defaults/OpenRaider.init"` ]]; then
23
-        if [[ ! `diff "${HOME}/.OpenRaider/custom.cfg" "../Resources/defaults/custom.cfg"` ]]; then
24
-            echo "Unconfigured user!"
25
-            osascript -e 'tell app "System Events" to display alert "Please edit ~/.OpenRaider/OpenRaider.init or ~/.OpenRaider/custom.cfg"'
26
-        else
27
-            ./OpenRaider-bin
28
-        fi
29
-    else
30
-        ./OpenRaider-bin
31
-    fi
32
-fi

+ 0
- 6
mac_dist/archive.sh 查看文件

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

+ 0
- 12
mac_dist/bundle.sh 查看文件

@@ -1,12 +0,0 @@
1
-#!/bin/sh
2
-
3
-echo Creating bundle directory structure
4
-mkdir -p bin/OpenRaider.app/Contents/MacOS
5
-mkdir -p bin/OpenRaider.app/Contents/Resources/defaults
6
-mkdir -p bin/OpenRaider.app/Contents/Frameworks
7
-
8
-echo Moving bundle data in place
9
-cp mac_dist/openraider.icns bin/OpenRaider.app/Contents/Resources/openraider.icns
10
-cp mac_dist/OpenRaider.sh bin/OpenRaider.app/Contents/MacOS/OpenRaider
11
-cp bin/release/OpenRaider bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
12
-cp data/* bin/OpenRaider.app/Contents/Resources/defaults/

+ 0
- 29
mac_dist/frameworks.sh 查看文件

@@ -1,29 +0,0 @@
1
-#!/bin/sh
2
-echo Moving dynamic libraries into place
3
-cp /usr/local/lib/libalut.0.dylib bin/OpenRaider.app/Contents/Frameworks/libalut.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
-cp /opt/local/lib/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libz.1.dylib
6
-cp /opt/local/lib/libSDL2-2.0.0.dylib bin/OpenRaider.app/Contents/Frameworks/libSDL2-2.0.0.dylib
7
-cp /opt/local/lib/libfreetype.6.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
8
-cp /opt/local/lib/libpng16.16.dylib bin/OpenRaider.app/Contents/Frameworks/libpng16.16.dylib
9
-
10
-echo Fixing Paths for OpenRaider-bin
11
-install_name_tool -change /usr/local/lib/libalut.0.dylib @executable_path/../Frameworks/libalut.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
13
-install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/MacOS/OpenRaider-bin
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
15
-
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
20
-
21
-echo Fixing Paths for libfreetype.6.dylib
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
23
-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
24
-install_name_tool -change /opt/local/lib/libpng16.16.dylib @executable_path/../Frameworks/libpng16.16.dylib bin/OpenRaider.app/Contents/Frameworks/libfreetype.6.dylib
25
-
26
-echo Fixing Paths for libpng16.16.dylib
27
-install_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib bin/OpenRaider.app/Contents/Frameworks/libpng16.16.dylib
28
-
29
-echo Dynamic libraries are set up!

+ 0
- 23
mac_dist/image.sh 查看文件

@@ -1,23 +0,0 @@
1
-#!/bin/sh
2
-
3
-echo Creating temporary image
4
-hdiutil create -size 32m -fs HFS+ -volname "OpenRaider" bin/tmp.dmg
5
-
6
-echo Mounting image
7
-hdiutil attach bin/tmp.dmg
8
-
9
-echo Moving files
10
-cp -r bin/OpenRaider.app /Volumes/OpenRaider/OpenRaider.app
11
-osascript -e 'tell application "Finder" to make alias file to POSIX file "/Applications" at POSIX file "/Volumes/OpenRaider/"'
12
-cp COPYING /Volumes/OpenRaider/
13
-cp README.md /Volumes/OpenRaider/
14
-cp README.old /Volumes/OpenRaider/
15
-
16
-echo Unmounting image
17
-hdiutil detach /Volumes/OpenRaider
18
-
19
-echo Converting image
20
-hdiutil convert bin/tmp.dmg -format UDZO -o bin/OpenRaider.dmg
21
-rm -rf bin/tmp.dmg
22
-
23
-echo Image ready!

二进制
mac_dist/openraider.icns 查看文件


+ 0
- 42
mac_dist/plist.sh 查看文件

@@ -1,42 +0,0 @@
1
-#!/bin/sh
2
-
3
-# Argument 1: Project Name
4
-# Argument 2: Short Version (0.1.1)
5
-# Argument 3: Long Version (0.1.1-20131214)
6
-
7
-YEAR=`date +%Y`
8
-
9
-echo '<?xml version="1.0" encoding="UTF-8"?>'
10
-echo '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
11
-echo '<plist version="1.0">'
12
-echo '<dict>'
13
-echo '        <key>CFBundleDevelopmentRegion</key>'
14
-echo '        <string>English</string>'
15
-echo '        <key>CFBundleExecutable</key>'
16
-echo "        <string>$1</string>"
17
-echo '        <key>CFBundleGetInfoString</key>'
18
-echo "        <string>$1 Version $2-$3</string>"
19
-echo '        <key>CFBundleIconFile</key>'
20
-echo '        <string>openraider.icns</string>'
21
-echo '        <key>CFBundleIdentifier</key>'
22
-echo '        <string>de.xythobuz.openraider</string>'
23
-echo '        <key>CFBundleInfoDictionaryVersion</key>'
24
-echo '        <string>6.0</string>'
25
-echo '        <key>CFBundleLongVersionString</key>'
26
-echo "        <string>$2-$3</string>"
27
-echo '        <key>CFBundleName</key>'
28
-echo "        <string>$1</string>"
29
-echo '        <key>CFBundlePackageType</key>'
30
-echo '        <string>APPL</string>'
31
-echo '        <key>CFBundleShortVersionString</key>'
32
-echo "        <string>$2-$3</string>"
33
-echo '        <key>CFBundleSignature</key>'
34
-echo '        <string>????</string>'
35
-echo '        <key>CFBundleVersion</key>'
36
-echo "        <string>$2-$3</string>"
37
-echo '        <key>CSResourcesFileMapped</key>'
38
-echo '        <true/>'
39
-echo '        <key>NSHumanReadableCopyright</key>'
40
-echo "        <string>Copyright 2001 - ${YEAR}</string>"
41
-echo '</dict>'
42
-echo '</plist>'

+ 0
- 2
setup.sh 查看文件

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

正在加载...
取消
保存