New SDL Headers

diff --git a/Makefile b/Makefile
index 8a814d7452260fd299f4cea89257baf6d29997e3..85f2a828b0b81dbcaf7fba7392afa07073e5b567 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 FLAGS_LINUX = -lGL                 -lSDL_image
-FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
+FLAGS_WIN32 = -lopengl32 -lmingw32 #-lSDL2_Image
 FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2
 
 all:
        @g++ src/main.cpp -o main $(FLAGS_LINUX) $(FLAGS)
 
 win32:
-       @g++ src/main.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
+       @g++ -L lib/ src/main.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
 
 clean:
        rm main*

diff --git a/SDL2.dll b/SDL2.dll
new file mode 100644 (file)
index 0000000..18d707f
Binary files /dev/null and b/SDL2.dll differ

diff --git a/lib/libSDL2.a b/lib/libSDL2.a
new file mode 100644 (file)
index 0000000..d8fe912
Binary files /dev/null and b/lib/libSDL2.a differ

diff --git a/lib/libSDL2.dll.a b/lib/libSDL2.dll.a
new file mode 100644 (file)
index 0000000..025b610
Binary files /dev/null and b/lib/libSDL2.dll.a differ

diff --git a/lib/libSDL2.la b/lib/libSDL2.la
new file mode 100644 (file)
index 0000000..bf0e051
--- /dev/null
+++ b/lib/libSDL2.la
@@ -0,0 +1,41 @@
+# libSDL2.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='../bin/SDL2.dll'
+
+# Names of this library.
+library_names='libSDL2.dll.a'
+
+# The name of the static archive.
+old_library='libSDL2.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libSDL2.
+current=2
+age=2
+revision=1
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/Users/slouken/release/SDL/SDL2-2.0.3/i686-w64-mingw32/lib'

diff --git a/lib/libSDL2_test.a b/lib/libSDL2_test.a
new file mode 100644 (file)
index 0000000..640badb
Binary files /dev/null and b/lib/libSDL2_test.a differ

diff --git a/lib/libSDL2main.a b/lib/libSDL2main.a
new file mode 100644 (file)
index 0000000..c80c99b
Binary files /dev/null and b/lib/libSDL2main.a differ

diff --git a/lib/pkgconfig/sdl2.pc b/lib/pkgconfig/sdl2.pc
new file mode 100644 (file)
index 0000000..464ed78
--- /dev/null
+++ b/lib/pkgconfig/sdl2.pc
@@ -0,0 +1,15 @@
+# sdl pkg-config source file
+
+prefix=/usr/local/cross-tools/i686-w64-mingw32
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: sdl2
+Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
+Version: 2.0.3
+Requires:
+Conflicts:
+Libs: -L${libdir}  -lmingw32 -lSDL2main -lSDL2  -mwindows
+Libs.private: -lmingw32 -lSDL2main -lSDL2  -mwindows  -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc
+Cflags: -I${includedir}/SDL2  -Dmain=SDL_main

diff --git a/main.exe b/main.exe
new file mode 100644 (file)
index 0000000..12c1298
Binary files /dev/null and b/main.exe differ