diff options
| author | Jack Nagel | 2012-03-24 20:37:39 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-03-24 20:39:22 -0500 |
| commit | 804554bc4885a5e6ec8b9869c2125e5bfecd86d1 (patch) | |
| tree | 178c7889cf80bee926ce890640ee958ddb94aa84 /Library | |
| parent | 824b0b72e333c81578a32bbe154c36e43946b398 (diff) | |
| download | homebrew-804554bc4885a5e6ec8b9869c2125e5bfecd86d1.tar.bz2 | |
Relocate game formulae to homebrew-games
https://github.com/Homebrew/homebrew-games
Just `brew tap homebrew/games` to get them back.
Closes #11189.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
26 files changed, 0 insertions, 1222 deletions
diff --git a/Library/Formula/abuse.rb b/Library/Formula/abuse.rb deleted file mode 100644 index 4c7ca579e..000000000 --- a/Library/Formula/abuse.rb +++ /dev/null @@ -1,62 +0,0 @@ -require 'formula' - -class Abuse < Formula - homepage 'http://abuse.zoy.org/' - url 'http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz' - head 'svn://svn.zoy.org/abuse/abuse/trunk' - md5 'ec678b8dc8d00e0382d8c805c6438489' - - depends_on 'pkg-config' => :build - depends_on 'sdl' - depends_on 'libvorbis' - - def startup_script; <<-EOS.undent - #!/bin/bash - #{libexec}/abuse-bin -datadir "#{share}/abuse" "$@" - EOS - end - - def install - # Add SDL.m4 to aclocal includes - inreplace 'bootstrap', 'aclocal${amvers} ${aclocalflags}', - 'aclocal${amvers} ${aclocalflags} -I/usr/local/share/aclocal' - - # undefined - inreplace 'src/net/fileman.cpp', 'ushort', 'unsigned short' - inreplace 'src/sdlport/setup.cpp', 'UInt8', 'uint8_t' - - # Re-enable OpenGL detection - inreplace 'configure.ac', - "#error\t/* Error so the compile fails on OSX */", - '#include <OpenGL/gl.h>' - - system "./bootstrap" - system "./configure", "--prefix=#{prefix}", "--disable-debug", - "--with-assetdir=#{share}/abuse", - "--disable-dependency-tracking", - "--disable-sdltest", - "--with-sdl-prefix=#{HOMEBREW_PREFIX}" - - # Use Framework OpenGL, not libGl - %w[ . src src/imlib src/lisp src/net src/sdlport ].each do |p| - inreplace "#{p}/Makefile", '-lGL', '-framework OpenGL' - end - - system "make" - - bin.install 'src/abuse-tool' - libexec.install_p 'src/abuse', 'abuse-bin' - (share+'abuse').install Dir["data/*"] - %w(data/Makefile data/Makefile.am data/Makefile.in) - # Use a startup script to find the game data - (bin+'abuse').write startup_script - end - - def caveats; <<-EOS.undent - Game settings and saves will be written to the ~/.abuse folder. - EOS - end - - def test - system("#{libexec}/abuse-bin", '--help') - end -end diff --git a/Library/Formula/angband.rb b/Library/Formula/angband.rb deleted file mode 100644 index 24601e421..000000000 --- a/Library/Formula/angband.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'formula' - -class Angband < Formula - url 'http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz' - md5 '51a24fe3119e7eff8a8395d601b2747e' - homepage 'http://rephial.org/' - - def install - system "./configure", "--prefix=#{prefix}", - "--enable-curses", - "--disable-x11", - "--disable-sdl", - "--disable-sdl-mixer", - "--with-libpath=#{libexec}" - system "make" - # Install manually; 'make install' doesn't work. - bin.install "src/angband" - libexec.install Dir['lib/*'] - end -end diff --git a/Library/Formula/c10t.rb b/Library/Formula/c10t.rb deleted file mode 100644 index 6c2345d2d..000000000 --- a/Library/Formula/c10t.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'formula' - -class C10t < Formula - homepage 'https://github.com/udoprog/c10t' - url 'https://github.com/udoprog/c10t/tarball/1.7' - md5 '8ba305e2c274469eb8e709f5c68e0c56' - - depends_on 'cmake' => :build - depends_on 'boost' - - # Needed to compile against newer boost - # Can be removed for next version of c10t after 1.7 - # See: https://github.com/udoprog/c10t/pull/153 - def patches - "https://github.com/udoprog/c10t/commit/4a392b9f06d08c70290f4c7591e84ecdbc73d902.diff" - end - - def install - inreplace 'CMakeLists.txt', 'boost_thread', 'boost_thread-mt' - inreplace 'test/CMakeLists.txt', 'boost_unit_test_framework', 'boost_unit_test_framework-mt' - system "cmake #{std_cmake_parameters} ." - system "make" - bin.install "c10t" - end -end diff --git a/Library/Formula/chocolate-doom.rb b/Library/Formula/chocolate-doom.rb deleted file mode 100644 index 5f343e460..000000000 --- a/Library/Formula/chocolate-doom.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'formula' - -class ChocolateDoom < Formula - url 'http://downloads.sourceforge.net/project/chocolate-doom/chocolate-doom/1.6.0/chocolate-doom-1.6.0.tar.gz' - homepage 'http://www.chocolate-doom.org/' - md5 'b210e115dda6ea88bfb6c4fe11ade101' - - depends_on 'sdl' - depends_on 'sdl_net' - depends_on 'sdl_mixer' - - def install - system "./configure", "--prefix=#{prefix}", - "--disable-debug", - "--disable-dependency-tracking", - "--disable-sdltest" - system "make install" - - # This project installs to 'games', but we want it in 'bin' so it symlinks in. - # Can't find a ./configure switch, so just rename it. - (prefix+"games").rename bin - end - - def caveats; <<-EOS.undent - Note that this formula only installs a Doom game engine, and no - actual levels. The original Doom levels are still under copyright, - so you can copy them over and play them if you already own them. - Otherwise, there are tons of free levels available online. - Try starting here: - #{homepage} - EOS - end -end diff --git a/Library/Formula/dosbox.rb b/Library/Formula/dosbox.rb deleted file mode 100644 index 79f6fcd88..000000000 --- a/Library/Formula/dosbox.rb +++ /dev/null @@ -1,26 +0,0 @@ -require 'formula' - -class Dosbox < Formula - url 'http://downloads.sourceforge.net/project/dosbox/dosbox/0.74/dosbox-0.74.tar.gz' - homepage 'http://www.dosbox.com/' - md5 'b9b240fa87104421962d14eee71351e8' - - depends_on 'sdl' - depends_on 'sdl_net' - depends_on 'sdl_sound' - - def install - ENV.libpng - ENV.fast - - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--mandir=#{man}", - "--disable-sdltest", - "--enable-core-inline" - system "make" - - bin.install 'src/dosbox' - man1.install gzip('docs/dosbox.1') - end -end diff --git a/Library/Formula/dwarf-fortress.rb b/Library/Formula/dwarf-fortress.rb deleted file mode 100644 index ebc6d9c46..000000000 --- a/Library/Formula/dwarf-fortress.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'formula' - -class DwarfFortress < Formula - homepage 'http://www.bay12games.com/dwarves/' - url 'http://www.bay12games.com/dwarves/df_34_05_osx.tar.bz2' - version '0.34.05' - md5 '470dd5b1f75bdc2f567a10127b3708bf' - - def install - (bin+'dwarffortress').write <<-EOS.undent - #!/bin/sh - exec #{libexec}/df - EOS - rm_rf 'sdl' # only contains a readme - libexec.install Dir['*'] - end -end diff --git a/Library/Formula/exult.rb b/Library/Formula/exult.rb deleted file mode 100644 index 7e923bcf3..000000000 --- a/Library/Formula/exult.rb +++ /dev/null @@ -1,41 +0,0 @@ -require 'formula' - -class Exult < Formula - url 'https://downloads.sourceforge.net/project/exult/exult-all-versions/1.4.9rc1/exult-1.4.9rc1.tar.gz' - md5 'c17a48cc0377aa67264aaaf441cb1bb2' - homepage 'http://exult.sourceforge.net/' - - head 'http://exult.svn.sourceforge.net/svnroot/exult/exult/trunk' - - depends_on 'sdl' - depends_on 'sdl_mixer' - depends_on 'libvorbis' - - if MacOS.xcode_version >= "4.3" - depends_on "automake" => :build - depends_on "libtool" => :build - end - - def install - inreplace "autogen.sh", "libtoolize", "glibtoolize" - - system "./autogen.sh" - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--disable-sdltest" - - system "make" - system "make bundle" - prefix.install "Exult.app" - end - - def caveats; <<-EOS.undent - Cocoa app installed to: - #{prefix} - - Note that this includes only the game engine; you will need to supply your own - own legal copy of the Ultima 7 game files. Try here (Amazon.com): - http://bit.ly/8JzovU - EOS - end -end diff --git a/Library/Formula/freeciv.rb b/Library/Formula/freeciv.rb deleted file mode 100644 index b811d23ea..000000000 --- a/Library/Formula/freeciv.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'formula' - -class Freeciv < Formula - homepage 'http://freeciv.wikia.com' - url 'http://downloads.sourceforge.net/project/freeciv/Freeciv%202.3/2.3.1/freeciv-2.3.1.tar.bz2' - md5 'efce9b2cd8b7a36017f1ebce59236dcb' - head 'svn://svn.gna.org/svn/freeciv/trunk', :using => :svn - - def options - [['--disable-nls', 'Disable NLS support.']] - end - - depends_on 'pkg-config' => :build - depends_on "gtk+" - depends_on "gettext" unless ARGV.include? "--disable-nls" - - def install - args = ["--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}"] - - unless ARGV.include? '--disable-nls' - gettext = Formula.factory('gettext') - args << "CFLAGS=-I#{gettext.include}" - args << "LDFLAGS=-L#{gettext.lib}" - end - - system "./configure", *args - system "make install" - end - - def test - system "#{bin}/freeciv-server -v" - end -end diff --git a/Library/Formula/frotz.rb b/Library/Formula/frotz.rb deleted file mode 100644 index 71c79e9b9..000000000 --- a/Library/Formula/frotz.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'formula' - -class Frotz < Formula - url 'http://downloads.sourceforge.net/project/frotz/frotz/2.43/frotz-2.43.tar.gz' - homepage 'http://frotz.sourceforge.net/' - md5 'efe51879e012b92bb8d5f4a82e982677' - - def install - inreplace "Makefile" do |s| - s.remove_make_var! %w[CC OPTS] - s.change_make_var! "PREFIX", prefix - s.change_make_var! "CONFIG_DIR", etc - s.change_make_var! "MAN_PREFIX", share - end - - system "make frotz" - system "make install" - end -end diff --git a/Library/Formula/gnu-chess.rb b/Library/Formula/gnu-chess.rb deleted file mode 100644 index f04a2e51f..000000000 --- a/Library/Formula/gnu-chess.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'formula' - -class GnuChess < Formula - homepage 'http://www.gnu.org/software/chess/' - url 'http://ftpmirror.gnu.org/chess/gnuchess-6.0.1.tar.gz' - mirror 'http://ftp.gnu.org/gnu/chess/gnuchess-6.0.1.tar.gz' - md5 '041888218f73886f146fa7fbf92190de' - - def install - # Opening book for gnuchess. This can be put in the doc directory and the - # user can optionally add the opening book. The README has details on - # adding the opening book. - book_url = "http://ftpmirror.gnu.org/chess/book_1.02.pgn.gz" - ohai "Downloading #{book_url}" - curl book_url, "-O" - - system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" - system "make" - ENV.j1 # Prevents a "file already exists" warning - system "make install" - doc.install Dir['doc/*', 'TODO', 'book_1.02.pgn.gz', 'book'] - end - - def caveats; <<-EOS.undent - The README file contains a manual for use: - #{doc}/README - - This formula also downloads the additional opening book. The opening - book is a gzipped PGN file that can be added using gnuchess commands. - The book_*.pgn.gz file is located in the same directory as the README. - See the README for using the `book add' command. - EOS - end -end diff --git a/Library/Formula/gnu-go.rb b/Library/Formula/gnu-go.rb deleted file mode 100644 index 099a73e41..000000000 --- a/Library/Formula/gnu-go.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'formula' - -class GnuGo < Formula - url 'http://ftpmirror.gnu.org/gnugo/gnugo-3.8.tar.gz' - mirror 'http://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz' - homepage 'http://www.gnu.org/software/gnugo/gnugo.html' - md5 '6db0a528df58876d2b0ef1659c374a9a' - - def install - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--with-readline=/usr/lib" - system "make install" - end -end diff --git a/Library/Formula/jnethack.rb b/Library/Formula/jnethack.rb deleted file mode 100644 index 768025011..000000000 --- a/Library/Formula/jnethack.rb +++ /dev/null @@ -1,241 +0,0 @@ -require 'formula' - -# Nethack the way God intended it to be played: from a terminal. - -# This formula is based on Nethack formula. -# The patches in DATA section are shamelessly stolen from MacPorts' jnethack portfile. - -class Jnethack < Formula - url 'http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/nethack-343-src.tgz' - homepage 'http://jnethack.sourceforge.jp/' - version '3.4.3-0.10' - md5 '21479c95990eefe7650df582426457f9' - - fails_with_llvm :build => 2334 - - # Don't remove save folder - skip_clean 'libexec/save' - - def patches - [ - 'http://iij.dl.sourceforge.jp/jnethack/30862/jnethack-3.4.3-0.10.diff.gz', - DATA - ] - end - - def install - # Build everything in-order; no multi builds. - ENV.deparallelize - - # Replace tokens introduced by the patches - %w( - sys/unix/Makefile.doc - sys/unix/Makefile.src - sys/unix/Makefile.top - sys/unix/Makefile.utl - sys/unix/nethack.sh - ).each do |f| - inreplace f, "__PREFIX__", prefix - inreplace f, "__CFLAGS__", "-Wno-format -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast" - inreplace f, "__LDFLAGS__", "" - end - - # Symlink makefiles - system 'sh sys/unix/setup.sh' - - inreplace "include/config.h", - /^#\s*define HACKDIR.*$/, - "#define HACKDIR \"#{libexec}\"" - - # Make the data first, before we munge the CFLAGS - system "cd dat;make" - - cd 'dat' do - %w(perm logfile).each do |f| - system "touch", f - libexec.install f - end - - # Stage the data - libexec.install %w(jhelp jhh jcmdhelp jhistory jopthelp jwizhelp dungeon license data jdata.base joracles options jrumors.tru jrumors.fal quest.dat jquest.txt) - libexec.install Dir['*.lev'] - end - - # Make the game - ENV.append_to_cflags "-I../include" - system 'cd src;make' - - bin.install 'src/jnethack' - (libexec+'save').mkpath - end -end - -__END__ ---- nethack/src/options.c.orig 2006-08-12 16:45:15.000000000 +0900 -+++ nethack/src/options.c 2006-08-12 16:45:43.000000000 +0900 -@@ -137,7 +137,7 @@ - #else - {"news", (boolean *)0, FALSE, SET_IN_FILE}, - #endif -- {"null", &flags.null, TRUE, SET_IN_GAME}, -+ {"null", &flags.null, FALSE, SET_IN_GAME}, - #ifdef MAC - {"page_wait", &flags.page_wait, TRUE, SET_IN_GAME}, - #else ---- nethack/sys/unix/Makefile.doc.orig 2006-07-29 05:14:04.000000000 +0900 -+++ nethack/sys/unix/Makefile.doc 2006-07-29 05:24:47.000000000 +0900 -@@ -40,8 +40,8 @@ - latex Guidebook.tex - - --GAME = nethack --MANDIR = /usr/local/man/man6 -+GAME = jnethack -+MANDIR = $(DESTDIR)__PREFIX__/share/man/man6 - MANEXT = 6 - - # manual installation for most BSD-style systems ---- nethack/sys/unix/Makefile.src.orig 2008-05-12 09:35:18.000000000 +0900 -+++ nethack/sys/unix/Makefile.src 2008-05-12 09:36:38.000000000 +0900 -@@ -36,7 +36,7 @@ - # SHELL=E:/GEMINI2/MUPFEL.TTP - - # Normally, the C compiler driver is used for linking: --LINK=$(CC) -+LINK=$(CC) __CFLAGS__ - - # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating - # system. -@@ -72,7 +72,7 @@ - # - # If you are using GCC 2.2.2 or higher on a DPX/2, just use: - # --CC = gcc -+#CC = gcc - # - # For HP/UX 10.20 with GCC: - # CC = gcc -D_POSIX_SOURCE -@@ -154,8 +154,8 @@ - # flags for debugging: - # CFLAGS = -g -I../include - --CFLAGS = -W -g -O -I../include --LFLAGS = -+CFLAGS = __CFLAGS__ -I../include -+LFLAGS = __LDFLAGS__ - - # The Qt and Be window systems are written in C++, while the rest of - # NetHack is standard C. If using Qt, uncomment the LINK line here to get ---- nethack/sys/unix/Makefile.top.orig 2006-08-11 13:30:01.000000000 +0900 -+++ nethack/sys/unix/Makefile.top 2006-08-11 13:35:41.000000000 +0900 -@@ -14,18 +14,18 @@ - # MAKE = make - - # make NetHack --PREFIX = /usr -+PREFIX = $(DESTDIR)__PREFIX__ - GAME = jnethack - # GAME = nethack.prg - GAMEUID = games --GAMEGRP = bin -+GAMEGRP = games - - # Permissions - some places use setgid instead of setuid, for instance - # See also the option "SECURE" in include/config.h --GAMEPERM = 04755 --FILEPERM = 0644 -+GAMEPERM = 02755 -+FILEPERM = 0664 - EXEPERM = 0755 --DIRPERM = 0755 -+DIRPERM = 0775 - - # GAMEDIR also appears in config.h as "HACKDIR". - # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR -@@ -35,9 +35,9 @@ - # therefore there should not be anything in GAMEDIR that you want to keep - # (if there is, you'll have to do the installation by hand or modify the - # instructions) --GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir -+GAMEDIR = $(PREFIX)/share/$(GAME)dir - VARDIR = $(GAMEDIR) --SHELLDIR = $(PREFIX)/games -+SHELLDIR = $(PREFIX)/bin - - # per discussion in Install.X11 and Install.Qt - VARDATND = ---- nethack/sys/unix/Makefile.utl.orig 2008-05-12 10:17:59.000000000 +0900 -+++ nethack/sys/unix/Makefile.utl 2008-05-12 10:19:33.000000000 +0900 -@@ -15,7 +15,7 @@ - - # if you are using gcc as your compiler, - # uncomment the CC definition below if it's not in your environment --CC = gcc -+#CC = gcc - # - # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: - # -@@ -89,8 +89,8 @@ - # flags for debugging: - # CFLAGS = -g -I../include - --CFLAGS = -O -I../include --LFLAGS = -+CFLAGS = __CFLAGS__ -I../include -+LFLAGS = __LDFLAGS__ - - LIBS = - -@@ -276,7 +276,7 @@ - # dependencies for recover - # - recover: $(RECOVOBJS) -- $(CC) $(LFLAGS) -o recover $(RECOVOBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LFLAGS) -o recover $(RECOVOBJS) $(LIBS) - - recover.o: recover.c $(CONFIG_H) ../include/date.h - ---- nethack/sys/unix/nethack.sh.orig 2006-08-24 23:23:30.000000000 +0900 -+++ nethack/sys/unix/nethack.sh 2006-08-24 23:24:35.000000000 +0900 -@@ -5,6 +5,7 @@ - export HACKDIR - HACK=$HACKDIR/nethack - MAXNROFPLAYERS=20 -+COCOT="__PREFIX__/bin/cocot -t UTF-8 -p EUC-JP" - - # JP - # set LC_ALL, NETHACKOPTIONS etc.. -@@ -26,6 +27,10 @@ - export USERFILESEARCHPATH - fi - -+if [ "X$LANG" = "Xja_JP.eucJP" ] ; then -+ COCOT="" -+fi -+ - #if [ "X$DISPLAY" ] ; then - # xset fp+ $HACKDIR - #fi -@@ -84,9 +89,9 @@ - cd $HACKDIR - case $1 in - -s*) -- exec $HACK "$@" -+ exec $COCOT $HACK "$@" - ;; - *) -- exec $HACK "$@" $MAXNROFPLAYERS -+ exec $COCOT $HACK "$@" $MAXNROFPLAYERS - ;; - esac ---- nethack/win/tty/termcap.c.orig 2006-08-09 19:55:36.000000000 +0900 -+++ nethack/win/tty/termcap.c 2006-08-09 20:05:44.000000000 +0900 -@@ -861,7 +861,7 @@ - - #include <curses.h> - --#ifndef LINUX -+#if !defined(LINUX) && !defined(__APPLE__) - extern char *tparm(); - #endif - diff --git a/Library/Formula/mednafen.rb b/Library/Formula/mednafen.rb deleted file mode 100644 index 0531edf5d..000000000 --- a/Library/Formula/mednafen.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'formula' - -class Mednafen < Formula - homepage 'http://mednafen.sourceforge.net/' - url 'http://downloads.sourceforge.net/project/mednafen/Mednafen/0.8.D.3/mednafen-0.8.D.3.tar.bz2' - md5 '57d22805071becd81858b0c088a275e5' - version '0.8.D.3' - - devel do - url 'http://forum.fobby.net/index.php?t=getfile&id=345' - md5 '64be12196aa02828539af677b0e2a66c' - version '0.9.19-WIP' - end - - depends_on 'pkg-config' => :build - depends_on 'sdl' - depends_on 'sdl_net' - depends_on 'libcdio' - depends_on 'libsndfile' - - def options - [ - ["--with-psx", "Build experimental PlayStation emulator"] - ] - end - - def patches - # see http://forum.fobby.net/index.php?t=msg&&th=701&goto=2420#msg_2420 - # will probably be fixed in the next version - DATA if ARGV.build_devel? - end - - def install - # Compiler produces code which fails math tests - # with optimizations enabled - # http://forum.fobby.net/index.php?t=msg&&th=659&goto=2254#msg_2254 - ENV.no_optimization - - args = [ "--disable-dependency-tracking", "--prefix=#{prefix}" ] - - if ARGV.include? "--with-psx" and not ARGV.build_devel? - onoe "--with-psx is only supported with --devel" \ - end - args << "--enable-psx" if ARGV.include? "--with-psx" and ARGV.build_devel? - - # Platform detection is buggy; problem reported upstream: - # http://forum.fobby.net/index.php?t=msg&&th=659&goto=2214#msg_2214 - args << "--build=x86_64-apple-darwin#{`uname -r`}" if MacOS.prefer_64_bit? - - system "./configure", *args - system "make install" - end -end - -__END__ -diff -Naur mednafen.orig/mednafen/drivers/shader.cpp mednafen.wip/mednafen/drivers/shader.cpp ---- mednafen.orig/mednafen/drivers/shader.cpp 2012-01-26 04:04:57.000000000 +0100 -+++ mednafen.wip/mednafen/drivers/shader.cpp 2012-02-08 10:34:38.000000000 +0100 -@@ -70,7 +70,7 @@ - switch(ipolate_axis & 3) - { - case 0: -- ret += std::string("gl_FragColor = texture2D(Tex0, gl_TexCoord[0]);\n"); -+ ret += std::string("gl_FragColor = texture2D(Tex0, vec2(gl_TexCoord[0]));\n"); - break; - - case 1: diff --git a/Library/Formula/moon-buggy.rb b/Library/Formula/moon-buggy.rb deleted file mode 100644 index 679377f1d..000000000 --- a/Library/Formula/moon-buggy.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'formula' - -class MoonBuggy < Formula - homepage 'http://www.seehuhn.de/pages/moon-buggy' - url 'http://m.seehuhn.de/programs/moon-buggy-1.0.tar.gz' - md5 '4da97ea40eca686f6f8b164d8b927e38' - - def install - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--mandir=#{man}", - "--infodir=#{info}" - system "make install" - end - - def test - system "moon-buggy" - end -end diff --git a/Library/Formula/nazghul.rb b/Library/Formula/nazghul.rb deleted file mode 100644 index 135f7aab9..000000000 --- a/Library/Formula/nazghul.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'formula' - -class Nazghul < Formula - url 'http://downloads.sourceforge.net/project/nazghul/nazghul/nazghul-0.7.0/nazghul-0.7.0.tar.gz' - homepage 'http://myweb.cableone.net/gmcnutt/nazghul.html' - md5 '3a3b08ee180163030bc9934d6fb40de8' - - depends_on 'sdl' - depends_on 'sdl_image' - depends_on 'sdl_mixer' - - def install - ENV.x11 # For libpng - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--disable-sdltest" - # Not sure why the ifdef is commented out in this file - inreplace "src/skill.c", "#include <malloc.h>", "" - system "make install" - end - - def caveats; <<-EOS.undent - The built-in game for this engine is called Haxima. To run: - haxima.sh - EOS - end -end diff --git a/Library/Formula/nethack.rb b/Library/Formula/nethack.rb deleted file mode 100644 index 955957541..000000000 --- a/Library/Formula/nethack.rb +++ /dev/null @@ -1,209 +0,0 @@ -require 'formula' - -# Nethack the way God intended it to be played: from a terminal. -# This build script was created referencing: -# * http://nethackwiki.com/wiki/Compiling#On_Mac_OS_X -# * http://nethackwiki.com/wiki/Pkgsrc#patch-ac_.28system.h.29 -# and copious hacking until things compiled. -# -# The patch applied incorporates the patch-ac above, the OS X -# instructions from the Wiki, and whatever else needed to be -# done. -# - @adamv - -class Nethack < Formula - homepage 'http://www.nethack.org/index.html' - url 'http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/nethack-343-src.tgz' - version '3.4.3' - md5 '21479c95990eefe7650df582426457f9' - - fails_with_llvm :build => 2334 - - # Don't remove save folder - skip_clean 'libexec/save' - - def patches - DATA - end - - def install - # Build everything in-order; no multi builds. - ENV.deparallelize - - # Symlink makefiles - system 'sh sys/unix/setup.sh' - - inreplace "include/config.h", - /^#\s*define HACKDIR.*$/, - "#define HACKDIR \"#{libexec}\"" - - # Make the data first, before we munge the CFLAGS - system "cd dat;make" - - cd 'dat' do - %w(perm logfile).each do |f| - system "touch", f - libexec.install f - end - - # Stage the data - libexec.install %w(help hh cmdhelp history opthelp wizhelp dungeon license data oracles options rumors quest.dat) - libexec.install Dir['*.lev'] - end - - # Make the game - ENV.append_to_cflags "-I../include" - system 'cd src;make' - - bin.install 'src/nethack' - (libexec+'save').mkpath - - # These need to be group-writable in multi-user situations - system "chmod", "g+w", libexec - system "chmod", "g+w", libexec+'save' - end -end - -__END__ -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..8b2ccd2 ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,2 @@ -+*.o -+*.lev -diff --git a/include/system.h b/include/system.h -index a4efff9..cfe96f1 100644 ---- a/include/system.h -+++ b/include/system.h -@@ -79,10 +79,10 @@ typedef long off_t; - # if !defined(__SC__) && !defined(LINUX) - E long NDECL(random); - # endif --# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) -+# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)) || defined(RANDOM) - E void FDECL(srandom, (unsigned int)); - # else --# if !defined(bsdi) && !defined(__FreeBSD__) -+# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__) - E int FDECL(srandom, (unsigned int)); - # endif - # endif -@@ -132,7 +132,7 @@ E void FDECL(perror, (const char *)); - E void FDECL(qsort, (genericptr_t,size_t,size_t, - int(*)(const genericptr,const genericptr))); - #else --# if defined(BSD) || defined(ULTRIX) -+# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__) - E int qsort(); - # else - # if !defined(LATTICE) && !defined(AZTEC_50) -@@ -421,7 +421,7 @@ E size_t FDECL(strlen, (const char *)); - # ifdef HPUX - E unsigned int FDECL(strlen, (char *)); - # else --# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) -+# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) - E int FDECL(strlen, (const char *)); - # endif - # endif /* HPUX */ -@@ -476,9 +476,9 @@ E char *sprintf(); - # if !defined(SVR4) && !defined(apollo) - # if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) - # if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */ --E int FDECL(vsprintf, (char *, const char *, va_list)); --E int FDECL(vfprintf, (FILE *, const char *, va_list)); --E int FDECL(vprintf, (const char *, va_list)); -+// E int FDECL(vsprintf, (char *, const char *, va_list)); -+// E int FDECL(vfprintf, (FILE *, const char *, va_list)); -+// E int FDECL(vprintf, (const char *, va_list)); - # endif - # endif - # endif -@@ -521,7 +521,7 @@ E struct tm *FDECL(localtime, (const time_t *)); - # endif - # endif - --# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) -+# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__) - E time_t FDECL(time, (time_t *)); - # else - E long FDECL(time, (time_t *)); -diff --git a/include/unixconf.h b/include/unixconf.h -index fe1b006..3a195a6 100644 ---- a/include/unixconf.h -+++ b/include/unixconf.h -@@ -19,20 +19,20 @@ - */ - - /* define exactly one of the following four choices */ --/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */ -+#define BSD 1 /* define for 4.n/Free/Open/Net BSD */ - /* also for relatives like SunOS 4.x, DG/UX, and */ - /* older versions of Linux */ - /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */ - /* Use BSD for < v3.0 */ - /* "ULTRIX" not to be confused with "ultrix" */ --#define SYSV /* define for System V, Solaris 2.x, newer versions */ -+/* #define SYSV */ /* define for System V, Solaris 2.x, newer versions */ - /* of Linux */ - /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */ - /* use SYSV for < v6.5 */ - - - /* define any of the following that are appropriate */ --#define SVR4 /* use in addition to SYSV for System V Release 4 */ -+/* #define SVR4 */ /* use in addition to SYSV for System V Release 4 */ - /* including Solaris 2+ */ - #define NETWORK /* if running on a networked system */ - /* e.g. Suns sharing a playground through NFS */ -@@ -285,8 +285,8 @@ - - #if defined(BSD) || defined(ULTRIX) - # if !defined(DGUX) && !defined(SUNOS4) --#define memcpy(d, s, n) bcopy(s, d, n) --#define memcmp(s1, s2, n) bcmp(s2, s1, n) -+// #define memcpy(d, s, n) bcopy(s, d, n) -+// #define memcmp(s1, s2, n) bcmp(s2, s1, n) - # endif - # ifdef SUNOS4 - #include <memory.h> -diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src -index 29ad99a..7842af2 100644 ---- a/sys/unix/Makefile.src -+++ b/sys/unix/Makefile.src -@@ -151,8 +151,8 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome - # flags for debugging: - # CFLAGS = -g -I../include - --CFLAGS = -O -I../include --LFLAGS = -+#CFLAGS = -O -I../include -+#LFLAGS = - - # The Qt and Be window systems are written in C++, while the rest of - # NetHack is standard C. If using Qt, uncomment the LINK line here to get -@@ -230,8 +230,8 @@ WINOBJ = $(WINTTYOBJ) - # WINTTYLIB = -ltermcap - # WINTTYLIB = -lcurses - # WINTTYLIB = -lcurses16 --# WINTTYLIB = -lncurses --WINTTYLIB = -ltermlib -+WINTTYLIB = -lncurses -+#WINTTYLIB = -ltermlib - # - # libraries for X11 - # If USE_XPM is defined in config.h, you will also need -lXpm here. -diff --git a/win/tty/termcap.c b/win/tty/termcap.c -index 706e203..dadc9a9 100644 ---- a/win/tty/termcap.c -+++ b/win/tty/termcap.c -@@ -835,7 +835,7 @@ cl_eos() /* free after Robert Viduya */ - - #include <curses.h> - --#ifndef LINUX -+#if !defined(LINUX) && !defined(__APPLE__) - extern char *tparm(); - #endif diff --git a/Library/Formula/netris.rb b/Library/Formula/netris.rb deleted file mode 100644 index 86789ecb3..000000000 --- a/Library/Formula/netris.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'formula' - -class Netris < Formula - # Official site is non-responsive - 3/19/2012 - @adamv - homepage 'http://www.netris.org/' - url 'ftp://ftp.netris.org/pub/netris/netris-0.52.tar.gz' - mirror 'http://ftp.de.debian.org/debian/pool/main/n/netris/netris_0.52.orig.tar.gz' - md5 'b55af5697175ee06f7c6e40101979c38' - - # Debian has been applying fixes and security patches, so let's re-use their work. - # Also fixes case of "TERM=xterm-color256" which otherwise segfaults. - def patches - [ - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/01_multi-games-with-scoring', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/02_line-count-patch', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/03_staircase-effect-fix', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/04_robot-close-fixup', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/05_init-static-vars', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/06_curses.c-include-term.h', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/07_curses.c-include-time.h', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/08_various-fixes', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/09_ipv6', - 'http://patch-tracker.debian.org/patch/series/dl/netris/0.52-9/10_fix-memory-leak', - ] - end - - def install - system "sh Configure" - system "make" - bin.install "netris" - end -end diff --git a/Library/Formula/open-tyrian.rb b/Library/Formula/open-tyrian.rb deleted file mode 100644 index 46804f849..000000000 --- a/Library/Formula/open-tyrian.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'formula' - -class OpenTyrianData < Formula - url 'http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip' - md5 '2a3b206a6de25ed4b771af073f8ca904' -end - -class OpenTyrian < Formula - url 'http://opentyrian.googlecode.com/hg/', :revision => '9ddcd06e48' - homepage 'http://code.google.com/p/opentyrian/' - version '20091122' - - depends_on 'sdl' - depends_on 'sdl_net' - - def install - OpenTyrianData.new.brew { libexec.install Dir['*'] } - - system "make release" - libexec.install "opentyrian" - (bin+'opentyrian').write <<-END.undent - #!/bin/bash - "#{libexec}/opentyrian" --data="#{libexec}" "$@" - END - end - - def caveats - "Save games will be put in ~/.opentyrian" - end -end diff --git a/Library/Formula/pioneers.rb b/Library/Formula/pioneers.rb deleted file mode 100644 index 703a1a5c0..000000000 --- a/Library/Formula/pioneers.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'formula' - -class Pioneers < Formula - url 'https://downloads.sourceforge.net/project/pio/Source/pioneers-0.12.5.tar.gz' - homepage 'http://pio.sourceforge.net/' - md5 'fd0c25382e7ebea0709c9464395739a2' - - depends_on 'intltool' # for NLS - depends_on 'gettext' - depends_on 'gtk+' - depends_on 'librsvg' # svg images for gdk-pixbuf - - def install - # fix usage of echo options not supported by sh - inreplace "Makefile.in", /\becho/, "/bin/echo" - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}" - system "make install" - end -end diff --git a/Library/Formula/robotfindskitten.rb b/Library/Formula/robotfindskitten.rb deleted file mode 100644 index 90351ae52..000000000 --- a/Library/Formula/robotfindskitten.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'formula' - -class Robotfindskitten < Formula - url 'http://downloads.sourceforge.net/project/rfk/robotfindskitten-POSIX/rfk%20rises%20from%20the%20dead%21%20%20braaaains.../robotfindskitten-1.7320508.406.tar.gz' - homepage 'http://robotfindskitten.org/' - md5 '6b9cf314ffee0de52ed85ac5ba11d66b' - - def install - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}" - system "make install" - - # This project installs to 'games', but we want it in 'bin' so it symlinks in. - # Can't find a ./configure switch, so just rename it. - (prefix+"games").rename bin - end -end diff --git a/Library/Formula/slashem.rb b/Library/Formula/slashem.rb deleted file mode 100644 index e041c9257..000000000 --- a/Library/Formula/slashem.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'formula' - -class Slashem < Formula - homepage 'http://slashem.sourceforge.net' - url 'http://downloads.sourceforge.net/project/slashem/slashem-source/0.0.8E0F1/se008e0f1.tar.gz' - md5 'cdfceaf7888246934dec8e256ac0a738' - version "0.0.8E0F1" - - skip_clean 'slashemdir/save' - - depends_on 'pkg-config' => :build - - # Fixes compilation error in OS X: - # http://sourceforge.net/tracker/index.php?func=detail&aid=1644971&group_id=9746&atid=109746 - def patches - DATA - end - - def install - ENV.j1 - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--with-mandir=#{man}", - "--with-group=admin", - "--with-owner=#{`echo $USER`}" - system "make install" - - man6.install 'doc/slashem.6' - man6.install 'doc/recover.6' - end -end - -__END__ -diff --git a/win/tty/termcap.c b/win/tty/termcap.c -index c3bdf26..8d00b11 100644 ---- a/win/tty/termcap.c -+++ b/win/tty/termcap.c -@@ -960,7 +960,7 @@ cl_eos() /* free after Robert Viduya */ - - #include <curses.h> - --#if !defined(LINUX) && !defined(__FreeBSD__) -+#if !defined(LINUX) && !defined(__FreeBSD__) && !defined(__APPLE__) - extern char *tparm(); - #endif diff --git a/Library/Formula/stone-soup.rb b/Library/Formula/stone-soup.rb deleted file mode 100644 index 65c305889..000000000 --- a/Library/Formula/stone-soup.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'formula' - -class StoneSoup < Formula - homepage 'http://crawl.develz.org/wordpress/' - url 'http://sourceforge.net/projects/crawl-ref/files/Stone%20Soup/0.7.2/stone_soup-0.7.2.tar.bz2' - md5 'ffb54c88d280f036a3819cba23bc4489' - - # Keep empty folders for save games and such - skip_clean :all - - def install - cd "source" do - # Hacks here by Adam V (@flangy) aided by @mistydemeo - # Arch / SDK detection is somewhat bogus: 32 vs 64-bit is detected wrong - # and the 10.4 SDK is selected too aggressively. - # Fix up what it detects - target_arch = MacOS.prefer_64_bit? ? "x86_64" : "i386" - - inreplace "makefile" do |s| - s.gsub!( - "CC = $(GCC) -arch $(ARCH) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)", - "CC = #{ENV.cc} -arch #{target_arch} -isysroot #{MacOS.xcode_prefix}/SDKs/MacOSX#{MACOS_VERSION}.sdk -mmacosx-version-min=#{MACOS_VERSION}" - ) - s.gsub!( - "CXX = $(GXX) -arch $(ARCH) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)", - "CXX = #{ENV.cxx} -arch #{target_arch} -isysroot #{MacOS.xcode_prefix}/SDKs/MacOSX#{MACOS_VERSION}.sdk -mmacosx-version-min=#{MACOS_VERSION}" - ) - end - system "make", "prefix=#{prefix}", "SAVEDIR=saves/", "DATADIR=data/", "install" - end - end -end diff --git a/Library/Formula/uggconv.rb b/Library/Formula/uggconv.rb deleted file mode 100644 index 43f7fbbed..000000000 --- a/Library/Formula/uggconv.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'formula' - -class Uggconv < Formula - url 'http://wyrmcorp.com/software/uggconv/uggconv-1.0.tar.gz' - homepage 'http://wyrmcorp.com/software/uggconv/index.shtml' - md5 '97b479b2fb761c9dbd7718b0ec71d068' - - def install - system "make" - bin.install 'uggconv' - man1.install 'uggconv.1' - end -end diff --git a/Library/Formula/unnethack.rb b/Library/Formula/unnethack.rb deleted file mode 100644 index 27c5b9a42..000000000 --- a/Library/Formula/unnethack.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'formula' - -class Unnethack < Formula - homepage 'http://sourceforge.net/apps/trac/unnethack/' - url 'https://downloads.sourceforge.net/project/unnethack/unnethack/3.6.1/unnethack-3.6.1-20120205.tar.gz' - md5 '675c00d776e513d5aedaf11f071af569' - - skip_clean "var/unnethack/bones" - skip_clean "var/unnethack/level" - skip_clean "var/unnethack/saves" - - def install - system "./configure", "--prefix=#{prefix}", - "--with-owner=#{`id -un`}", "--with-group=admin", - "--enable-wizmode=#{`id -un`}" - system "make install" - end -end diff --git a/Library/Formula/xboard.rb b/Library/Formula/xboard.rb deleted file mode 100644 index 5ee0b0e0e..000000000 --- a/Library/Formula/xboard.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'formula' - -class Xboard < Formula - url 'http://ftpmirror.gnu.org/xboard/xboard-4.6.0.tar.gz' - mirror 'http://ftp.gnu.org/gnu/xboard/xboard-4.6.0.tar.gz' - homepage 'http://www.gnu.org/software/xboard/' - md5 '80b445539bef9950cbc2df9ed8f21f0d' - - depends_on 'pkg-config' => :build - depends_on 'gettext' - - def install - args = ["--prefix=#{prefix}", - "--x-include=/usr/X11/include", - "--x-lib=/usr/X11/lib", - "--disable-zippy"] - - system "./configure", *args - system "make" - system "make install" - end -end diff --git a/Library/Formula/xu4.rb b/Library/Formula/xu4.rb deleted file mode 100644 index b287dc70a..000000000 --- a/Library/Formula/xu4.rb +++ /dev/null @@ -1,104 +0,0 @@ -require 'formula' - -class Xu4 < Formula - homepage 'http://xu4.sourceforge.net/' - url 'http://xu4.svn.sourceforge.net/svnroot/xu4/trunk/u4', - :revision => '2999' - version 'r2999' - - head 'http://xu4.svn.sourceforge.net/svnroot/xu4/trunk/u4' - - depends_on 'sdl' - depends_on 'sdl_mixer' - - def patches - DATA - end - - def install - ENV.x11 - - ultima_zips = [ - "http://www.thatfleminggent.com/ultima/ultima4.zip", - "http://downloads.sourceforge.net/project/xu4/Ultima%204%20VGA%20Upgrade/1.3/u4upgrad.zip" - ] - - ohai "Downloading support files" - ultima_zips.each { |f| curl f, "-O" } - - cd 'src' do - # Copy over SDL's ObjC main files - `cp -R #{Formula.factory('sdl').libexec}/* macosx` - - inreplace "Makefile.macosx" do |s| - s.change_make_var! "SYSROOT", "/Developer/SDKs/MacOSX#{MACOS_VERSION}.sdk" - s.remove_make_var! "WHICH_ARCH" - s.change_make_var! "PREFIX", HOMEBREW_PREFIX - s.change_make_var! "BUNDLE_CONTENTS", "xu4.app/Contents" - s.change_make_var! "CC", ENV.cc - s.change_make_var! "CXX", ENV.cxx - end - - system "make -f Makefile.macosx" - system "make -f Makefile.macosx install" - - prefix.install "xu4.app" - end - end - - def caveats - "xu4.app installed to #{prefix}" - end -end - -__END__ -diff --git a/src/Makefile.macosx b/src/Makefile.macosx -index c8e4812..1317029 100644 ---- a/src/Makefile.macosx -+++ b/src/Makefile.macosx -@@ -18,15 +18,16 @@ UI=sdl - PREFIX=/usr - UILIBS=-L/Library/Frameworks \ - -framework Cocoa \ -- -framework SDL \ -- -framework SDL_mixer \ -- -framework libpng -+ -lpng \ -+ -lSDL \ -+ -lSDL_mixer - - UIFLAGS=-F/Library/Frameworks \ -- -I/Library/Frameworks/SDL.framework/Headers \ -- -I/Library/Frameworks/SDL_mixer.framework/Headers \ - -I/Library/Frameworks/libpng.framework/Headers \ -- -I$(PREFIX)/include -+ -I$(PREFIX)/include \ -+ -I$(PREFIX)/include/SDL \ -+ -I/usr/include \ -+ -I/usr/X11/include - - FEATURES=-DHAVE_BACKTRACE=0 -DHAVE_VARIADIC_MACROS=1 - -diff --git a/src/Makefile.macosx b/src/Makefile.macosx -index c7b9a32..f721589 100644 ---- a/src/Makefile.macosx -+++ b/src/Makefile.macosx -@@ -3,8 +3,8 @@ - # - - # name and path to ultima4.zip and u4upgrad.zip --ULTIMA4=ultima4*.zip --U4UPGRADE=u4upgrad.zip -+ULTIMA4=../ultima4.zip -+U4UPGRADE=../u4upgrad.zip - - # for crosscompiling arch ppc or i386 from OS X 10.6 use - # CC=/usr/bin/gcc-4.0 -@@ -100,7 +100,7 @@ bundle: u4 - cp ../graphics/vga2/*.png $(bundle_name)/Contents/Resources/vga2 - # if you want to include the ultima4.zip in the bundle uncomment the - # following line. -- # cp $(ULTIMA4) $(bundle_name)/Contents/Resources -+ cp $(ULTIMA4) $(bundle_name)/Contents/Resources - cp $(U4UPGRADE) $(bundle_name)/Contents/Resources - cp $< $(bundle_name)/Contents/MacOS |
