diff --git a/Makefile.glosx-clang b/Makefile.glosx-clang index 4304f87..2f961ae 100644 --- a/Makefile.glosx-clang +++ b/Makefile.glosx-clang @@ -1,7 +1,7 @@ # I personally don't care if you steal this makefile. --GM CC = clang -CFLAGS = -pg -O2 -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \ +CFLAGS = -pg -O3 -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \ -Wno-unused-variable -Wno-unused-parameter \ $(CFLAGS_EXTRA) \ -DUSE_OPENGL -DAPPLE -DCLANG \ diff --git a/README.txt b/README.txt index 1d4987c..3e38e6d 100644 --- a/README.txt +++ b/README.txt @@ -40,6 +40,7 @@ BUILDING REQUIREMENTS: - a C compiler that isn't crap (read: not MSVC++) - specifically, GCC - MinGW is a port of GCC for Windows: http://mingw.org/ + - OS X users: clang is highly recommended - if you use something else we might consider compatibility with it - learn_more has managed to get this to build with MSVC++ so uh, that could work too. - SDL 1.2 (not 1.3) - http://libsdl.org/ @@ -54,6 +55,13 @@ BUILDING REQUIREMENTS: On Windows, read Makefile.mingw for some instructions. On other OSes, some files for sackit and ENet need to be in xlibinc. +OS X readme: +- install Homebrew and XCode Command-Line Tools +- brew install lua, enet, SDL, glew +- compile sackit from git and copy .a and .so files to /usr/local/lib and sackit.h to /usr/local/include +- make -f Makefile.glosx-clang (recommended, Makefile.glosx uses GCC, Makefile.osx uses the broken software renderer) +- to package into a .app, use ./package-osx.sh (brew install dylibbundler first) + MSVC readme (wip): - create a folder 'winlibs' in the iceball dir dump all dll's + lib's in this folder (opengl,lua,zlib, sdl, glew) diff --git a/osx-package-files/Iceball.icns b/osx-package-files/Iceball.icns new file mode 100644 index 0000000..edd0bbf Binary files /dev/null and b/osx-package-files/Iceball.icns differ diff --git a/osx-package-files/Iceball.iconset/icon_128x128.png b/osx-package-files/Iceball.iconset/icon_128x128.png new file mode 100644 index 0000000..80a6186 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_128x128.png differ diff --git a/osx-package-files/Iceball.iconset/icon_128x128@2x.png b/osx-package-files/Iceball.iconset/icon_128x128@2x.png new file mode 100644 index 0000000..39a11d1 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_128x128@2x.png differ diff --git a/osx-package-files/Iceball.iconset/icon_16x16.png b/osx-package-files/Iceball.iconset/icon_16x16.png new file mode 100644 index 0000000..5d24fd6 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_16x16.png differ diff --git a/osx-package-files/Iceball.iconset/icon_16x16@2x.png b/osx-package-files/Iceball.iconset/icon_16x16@2x.png new file mode 100644 index 0000000..9f36017 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_16x16@2x.png differ diff --git a/osx-package-files/Iceball.iconset/icon_256x256.png b/osx-package-files/Iceball.iconset/icon_256x256.png new file mode 100644 index 0000000..3d63fb0 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_256x256.png differ diff --git a/osx-package-files/Iceball.iconset/icon_256x256@2x.png b/osx-package-files/Iceball.iconset/icon_256x256@2x.png new file mode 100644 index 0000000..53b6265 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_256x256@2x.png differ diff --git a/osx-package-files/Iceball.iconset/icon_32x32.png b/osx-package-files/Iceball.iconset/icon_32x32.png new file mode 100644 index 0000000..f44374c Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_32x32.png differ diff --git a/osx-package-files/Iceball.iconset/icon_32x32@2x.png b/osx-package-files/Iceball.iconset/icon_32x32@2x.png new file mode 100644 index 0000000..9051aef Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_32x32@2x.png differ diff --git a/osx-package-files/Iceball.iconset/icon_512x512.png b/osx-package-files/Iceball.iconset/icon_512x512.png new file mode 100644 index 0000000..190bb0a Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_512x512.png differ diff --git a/osx-package-files/Iceball.iconset/icon_512x512@2x.png b/osx-package-files/Iceball.iconset/icon_512x512@2x.png new file mode 100644 index 0000000..161ffb3 Binary files /dev/null and b/osx-package-files/Iceball.iconset/icon_512x512@2x.png differ diff --git a/osx-package-files/Info.plist b/osx-package-files/Info.plist new file mode 100644 index 0000000..732ef3f --- /dev/null +++ b/osx-package-files/Info.plist @@ -0,0 +1,32 @@ + +!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> + + + CFBundleGetInfoString + Iceball + CFBundleExecutable + iceball-gl + CFBundleIdentifier + me.iceballga.Iceball + CFBundleName + Iceball + CFBundleDisplayName + Iceball + CFBundleSignature + icbl + CFBundleIconFile + Iceball.icns + CFBundleShortVersionString + 0.1.2 + CFBundleVersion + 0.1.2 + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + IFMajorVersion + 0 + IFMinorVersion + 1 + + diff --git a/osx-package-files/iceball-launcher b/osx-package-files/iceball-launcher new file mode 100644 index 0000000..5c63238 --- /dev/null +++ b/osx-package-files/iceball-launcher @@ -0,0 +1,3 @@ +#!/bin/bash +cd "${0%/*}" +./iceball-gl -s 0 pkg/base pkg/maps/mesa.vxl diff --git a/package-osx.sh b/package-osx.sh new file mode 100755 index 0000000..d9674c6 --- /dev/null +++ b/package-osx.sh @@ -0,0 +1,17 @@ +#!/bin/sh +cd osx-package-files +rm -f Iceball.icns +iconutil -c icns -o Iceball.icns Iceball.iconset +cd .. +rm -rf Iceball.app +mkdir -p Iceball.app/Contents/MacOS +mkdir -p Iceball.app/Contents/libs +mkdir -p Iceball.app/Contents/Resources +cp iceball-gl Iceball.app/Contents/MacOS +cp osx-package-files/iceball-launcher Iceball.app/Contents/MacOS +cp osx-package-files/Info.plist Iceball.app/Contents +cp osx-package-files/Iceball.icns Iceball.app/Contents/Resources +cp -Rv clsave dlcache docs pkg svsave tools Iceball.app/Contents/MacOS/ +dylibbundler -x Iceball.app/Contents/MacOS/iceball-gl -b -d Iceball.app/Contents/libs +chmod -R 755 Iceball.app/Contents/MacOS/* +chmod -R 755 Iceball.app/Contents/libs/*