Changeset 947Tweet

Timestamp:

Sep 11, 2011, 12:37:15 AM (12 years ago)

Author:

sam

Message:

build: add a Win64 build of libSDL. Useless for now, because SDL_Image
and SDL_Mixer are needed and are a lot harder to build.

Location:

trunk

Files:

• build/bitten.xml (modified) (1 diff)
• build/lol-build (modified) (3 diffs)
• contrib/NOTES (modified) (2 diffs)
• contrib/sdl-1.2.14/lib/i686-w64-mingw32 (added)
• contrib/sdl-1.2.14/lib/i686-w64-mingw32/SDL.dll (moved) (moved from trunk/contrib/sdl-1.2.14/lib/SDL.dll)
• contrib/sdl-1.2.14/lib/i686-w64-mingw32/SDL.lib (moved) (moved from trunk/contrib/sdl-1.2.14/lib/SDL.lib)
• contrib/sdl-1.2.14/lib/i686-w64-mingw32/SDLmain.lib (moved) (moved from trunk/contrib/sdl-1.2.14/lib/SDLmain.lib)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32 (added)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDL.dll (added)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDL.lib (added)
• contrib/sdl-1.2.14/lib/x86_64-w64-mingw32/SDLmain.lib (added)

trunk/build/bitten.xml

@@ -6 +6 @@
   </step>
   <step id="bootstrap" description="Bootstrap build system">
-    <sh:exec file="sh" args="-c ./build/lol-build bootstrap ${platform}"/>
+    <sh:exec file="./build/lol-build" args="bootstrap ${platform}"/>
   </step>
   <step id="configure" description="Configure tree">
-    <sh:exec file="sh" args="-c ./build/lol-build configure ${platform}"/>
+    <sh:exec file="./build/lol-build" args="configure ${platform}"/>
   </step>
   <step id="build" description="Build tree">
-    <sh:exec file="sh" args="-c ./build/lol-build build ${platform}"/>
+    <sh:exec file="./build/lol-build" args="build ${platform}"/>
   </step>
-  <step id="test" description="Run tests">
-    <sh:exec file="sh" args="-c ./build/lol-build test ${platform}"/>
+  <step id="check" description="Run tests">
+    <sh:exec file="./build/lol-build" args="check ${platform}"/>
   </step>
   <step id="clean" description="Clean tree">
-    <sh:exec file="sh" args="-c ./build/lol-build clean ${platform}"/>
+    <sh:exec file="./build/lol-build" args="clean ${platform}"/>
   </step>
 </build>

trunk/build/lol-build

@@ -71 +71 @@
             fi
             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
             ;;
         windows-amd64)
@@ -83 +84 @@
             fi
             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32"
             ;;
     esac
@@ -111 +113 @@
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/atk-1.0"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtkglarea-2.0.1/include"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib"

trunk/contrib/NOTES

@@ -3 +3 @@
 #####################
 
+
 Glew
 ----
 
-Download page: http://sourceforge.net/projects/glew/files/glew/1.7.0/glew-1.7.0.tgz/download
+Download page: http://sourceforge.net/projects/glew/files/glew
 
 - fix config/Makefile.linux-mingw32 and config/Makefile.linux-mingw64 to
@@ -21 +22 @@
 - copy lib/*.a in the contrib directory as *.lib
 
+
+SDL
+---
+
+Download page: http://www.libsdl.org/release/
+
+Win32:
+- just take the pre-compiled binaries from upstream
+
+Win64:
+- ./configure --host=x86_64-w64-mingw32
+- deactivate NONAMELESSUNION in src/video/windx5/directx.h
+- make -j6
+- copy build/libSDLmain.a as SDLmain.lib
+- copy build/.libs/libSDL.a as SDL.lib
+- copy build/.libs/SDL.dll as SDL.dll
+
+
+SDL_Image
+---------
+
+Download page: http://www.libsdl.org/projects/SDL_image/release/
+
+Hard to do, requires libjpeg, libtiff, libpng, zlib...
+
+
+SDL_Mixer
+---------
+
+Download page: http://www.libsdl.org/projects/SDL_mixer/release/
+
+Hard to do, requires libogg, libvorbis, mikmod, libsmpeg...
+