Lenard Lindstrom avatar Lenard Lindstrom committed d55c9fb

Update Windows dependency build toolchain for SDL 1.2.15

Confirm msys_build_deps.py does build SDL 1.2.15. Update documentation to new
SDL version.

Reduce the amount of work the msys_build_deps.py does in building SDL. Only
build a shared library, since msvcr90.dll linked libraries are now built
directly: see changeset 1c621f6b9aac. Also, only install only those parts of
the SDL build needed in the prebuilt directory.

Comments (0)

Files changed (2)

msys_build_deps.py

 
 This program has been tested against the following libraries:
 
-SDL 1.2(.14+) hg changeset c5d651a8b679
+SDL 1.2.15
 SDL_image 1.2(.10+) hg changset 45748e6e2f81
 SDL_mixer 1.2.12 hg changeset b455bc681654
 SDL_ttf 2.0.11 hg changeset d9a600fa3c4a
   if [ ! -f "./configure" ]; then
     ./autogen.sh
   fi
-  # Prevent libtool deadlocks (maybe).
-  ./configure --disable-libtool-lock --prefix="$PREFIX" --disable-stdio-redirect \
+
+  ./configure --prefix="$PREFIX" --disable-static --disable-stdio-redirect \
               CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
   
   # check for MSYS permission errors
 fi
 
 if [ x$BDINST == x1 ]; then
-  make install
+  make install-bin install-hdrs install-lib
   # Make SDL_config_win32.h available for prebuilt and MSVC
   cp -f "$HOME/include/SDL_config_win32.h" "$PREFIX/include/SDL"
 fi

prebuilt-template/readme90.html

 The dependencies were compiled and linked with MinGW 4.6.1.
 See the wiki at <a href="http://www.pygame.org/wiki/index">pygame.org</a> for details.
 Binaries were stripped, <tt>strip --strip-all</tt>, to reduce size.
-They are linked to the Windows C runtime library msvcr90.dll which comes with Python.
+They are linked to the Windows C runtime library msvcr90.dll that is installed with Python.
 The list shows the library versions contained in prebuilt as well as links to their source bundles.
 </p>
 
 <table>
     <tr>
-        <td><a href="http://www.libsdl.org/">SDL 1.2.14+ hg changeset c5d651a8b679</a></td>
-        <td>hg clone -u c5d651a8b679 http://hg.libsdl.org/SDL SDL-1.2.14</td>
+        <td><a href="http://www.libsdl.org/">SDL 1.2.15</a></td>
+        <td><a href="http://www.libsdl.org/release/SDL-1.2.15.zip">SDL-1.2.15.zip</a></td>
     </tr>
     
     <tr>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.