diff --git a/Makefile b/Makefile index ebe3b6244a..156c3df0d3 100644 --- a/Makefile +++ b/Makefile @@ -44,12 +44,6 @@ aftermath_KIND = library aftermath_DEPS = $(fileformats_TARGET) $(game_TARGET) aftermath_LIBS = $(COMMON_LIBS) $(aftermath_DEPS) -server_SRCS = $(shell find OpenRA.Server/ -iname '*.cs') -server_TARGET = OpenRA.Server.exe -server_KIND = winexe -server_DEPS = $(fileformats_TARGET) -server_LIBS = $(COMMON_LIBS) $(server_DEPS) - seqed_SRCS = $(shell find SequenceEditor/ -iname '*.cs') seqed_TARGET = SequenceEditor.exe seqed_KIND = winexe @@ -83,9 +77,8 @@ clean: @-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) -server: $(server_TARGET) seqed: $(seqed_TARGET) -all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(server_TARGET) $(seqed_TARGET) +all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(seqed_TARGET) dist-osx: packaging/osx/package.sh diff --git a/packaging/osx/package.sh b/packaging/osx/package.sh index 33c78bf8cb..e5c87eb3c8 100755 --- a/packaging/osx/package.sh +++ b/packaging/osx/package.sh @@ -54,9 +54,6 @@ export AS="as -arch i386" export CC="gcc -arch i386 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig/ -# Package the server binary -mkbundle --deps --static -z -o openra_server OpenRA.Server.exe OpenRA.FileFormats.dll thirdparty/Tao/Tao.Sdl.dll - # Package the game binary mkbundle --deps --static -z -o OpenRA OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll thirdparty/Tao/Tao.Sdl.dll diff --git a/packaging/osx/package_dmg.sh b/packaging/osx/package_dmg.sh index 40f03f699e..fefa706756 100755 --- a/packaging/osx/package_dmg.sh +++ b/packaging/osx/package_dmg.sh @@ -3,7 +3,6 @@ title=OpenRA size=70m dmgName=OpenRA.dmg -mv openra_server ${source} mv OpenRA.app ${source} hdiutil create -srcfolder "${source}" -volname "${title}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${size} temp.dmg @@ -23,7 +22,6 @@ echo ' set background picture of theViewOptions to file ".background:bg.png" make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} set position of item "OpenRA.app" of container window to {100, 90} - set position of item "openra_server" of container window to {100, 210} set position of item "Applications" of container window to {375, 150} close open @@ -38,5 +36,4 @@ sync hdiutil detach ${device} hdiutil convert "./temp.dmg" -format UDZO -imagekey zlib-level=9 -o "${dmgName}" rm -f ./temp.dmg -rm -rf ${source}OpenRA.app -rm -f ${source}openra_server \ No newline at end of file +rm -rf ${source}OpenRA.app \ No newline at end of file