1 files changed, 16 insertions, 1 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 86784140b..91df6a352 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -8,6 +8,13 @@ class Wine <Formula
 
   depends_on 'jpeg'
 
+  # This is required for using 3D applications.
+  def wine_wrapper; <<-EOS
+#!/bin/sh
+DYLD_FALLBACK_LIBRARY_PATH="/usr/X11/lib" "#{bin}/wine.bin" "$@"
+EOS
+  end
+
   def install
     fails_with_llvm
     ENV.x11
@@ -20,7 +27,7 @@ class Wine <Formula
     ENV.append "CXXFLAGS", "-D_DARWIN_NO_64_BIT_INODE"
     ENV.append "LDFLAGS", "#{build32} -framework CoreServices -lz -lGL -lGLU"
 
-    args = [ "--prefix=#{prefix}"]
+    args = ["--prefix=#{prefix}", "--x-include=/usr/X11/include/", "--x-lib=/usr/X11/lib/"]
     args << "--without-freetype" if MACOS_VERSION >= 10.6 and Hardware.is_64_bit?
     args << "--disable-win16" if MACOS_VERSION < 10.6
 
@@ -29,6 +36,11 @@ class Wine <Formula
 
     # Don't need Gnome desktop support
     rm_rf share+'applications'
+
+    # Use a wrapper script, so rename wine to wine.bin
+    # and name our startup script wine
+    mv (bin+'wine'), (bin+'wine.bin')
+    (bin+'wine').write(wine_wrapper)
   end
 
   def caveats; <<-EOS.undent
@@ -37,6 +49,9 @@ class Wine <Formula
 
     You may also want to get winetricks:
       brew install winetricks
+
+    If you plan to use 3D applications, like games, you will need
+    to check "Emulate a virtual desktop" in winecfg's "Graphics" tab.
     EOS
   end
 end