* Merge unified-sdl to trunk

* Bump Q3_VERSION to 1.35


git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea

3 files changed, 35 insertions, 0 deletions

diff --git a/code/libs/win32/libSDL.dll.a b/code/libs/win32/libSDL.dll.a
new file mode 100755
index 0000000..f2523fa
--- /dev/null
+++ b/code/libs/win32/libSDL.dll.a
diff --git a/code/libs/win32/libSDL.la b/code/libs/win32/libSDL.la
new file mode 100755
index 0000000..40b4192
--- /dev/null
+++ b/code/libs/win32/libSDL.la
@@ -0,0 +1,35 @@
+# libSDL.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='../bin/SDL.dll'
+
+# Names of this library.
+library_names='libSDL.dll.a'
+
+# The name of the static archive.
+old_library='libSDL.a'
+
+# Libraries that this one depends upon.
+dependency_libs=' -luser32 -lgdi32 -lwinmm -ldxguid'
+
+# Version information for libSDL.
+current=11
+age=11
+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/hercules/tmp/SDL-1.2.12/lib'
diff --git a/code/libs/win32/libSDLmain.a b/code/libs/win32/libSDLmain.a
new file mode 100644
index 0000000..a628ec4
--- /dev/null
+++ b/code/libs/win32/libSDLmain.a