X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=README.mingw_cross;h=517734ad1080559ccbc1ac8c8147684ce3e526bc;hb=ea46c9f7ece4897adb3e0f529b082cea51442cd8;hp=65d5c3feb1c3839e7686935a9aa4cd96556188b1;hpb=76169d74298feb3c4976af3f0f10376f56aec38d;p=freeglut

diff --git a/README.mingw_cross b/README.mingw_cross
index 65d5c3f..517734a 100644
--- a/README.mingw_cross
+++ b/README.mingw_cross
@@ -1,24 +1,49 @@
 Cross-compilation from GNU/Linux (static and shared DLL)
 ========================================================
 
-Install MinGW32 and prepare FreeGLUT on Debian/Ubuntu:
+Install MinGW, and specify which MinGW you're using:
 
-  apt-get install mingw32
-  ./configure --host=i586-mingw32msvc --prefix=/freeglut
+- on Debian/Ubuntu, mingw-w64, 64-bit executables:
+
+  apt-get install mingw-w64
+  GNU_HOST=x86_64-w64-mingw32
+
+- on Debian/Ubuntu, mingw-w64, 32-bit executables:
 
-Install MinGW32 and prepare FreeGLUT on Fedora:
+  apt-get install mingw-w64
+  GNU_HOST=i686-w64-mingw32
+
+- on Fedora, mingw32, 32-bit executables:
 
   yum install mingw32-gcc
-  ./configure --host=i686-pc-mingw32 --prefix=/freeglut
+  GNU_HOST=i686-pc-mingw32
+
+- on Debian/Ubuntu, mingw32 (deprecated):
 
-Cross-compile!
+  apt-get install mingw32
+  GNU_HOST=i586-mingw32msvc
+
+
+With CMake
+----------
 
-  make
+Cross-compile with:
+
+  mkdir cross-woe/ && cd cross-woe/
+  cmake \
+    -D GNU_HOST=$GNU_HOST \
+    -D CMAKE_TOOLCHAIN_FILE=mingw_cross_toolchain.cmake \
+    -D CMAKE_INSTALL_PREFIX=/freeglut \
+    ..
+  make -j4
   make install DESTDIR=$(pwd)
 
-Everything is in the new freeglut/ directory.
-The .dll is in the freeglut/bin/.
+Everything is now in the new 'freeglut/' directory.
+The .dll is in 'freeglut/lib/'.
+
 
+Compiling your code
+-------------------
 
 Compilation of your own programs is done as usual.
 See README.cygwin_mingw for details.