diff --git a/.DISABLED-hgeol b/.DISABLED-hgeol
deleted file mode 100644
index b03b4cfb1..000000000
--- a/.DISABLED-hgeol
+++ /dev/null
@@ -1,57 +0,0 @@
-[patterns]
-.hgeol = native
-.hgignore = native
-BUGS = native
-CREDITS = native
-INSTALL = native
-NOTES = native
-TODO = native
-WhatsNew = native
-**COPYING = native
-**README = native
-**doxyfile = native
-**Doxyfile = native
-**install-sh = LF
-**mkinstalldirs = LF
-**Makefile = LF
-**Makefile.* = LF
-test/automated/rwops/read = LF
-**README.* = native
-**.S = native
-**.bmp = BIN
-**.c = native
-**.cc = native
-**.cpp = native
-**.csh = LF
-**.dat = BIN
-**.gdbinit = LF
-build-scripts/config.guess = LF
-**.h = native
-**.htm = native
-**.html = native
-**.icns = BIN
-**.in = LF
-**.java = native
-**.m = native
-**.m4 = native
-**.mk = LF
-**.nib = BIN
-**.pch = BIN
-**.pdf = BIN
-**.pl = native
-**.plist = native
-**.png = BIN
-.indent.pro = LF
-**.rc = native
-**.rtf = BIN
-**.sh = LF
-**.sln = native
-**.txt = native
-**.vcp = native
-**.vcproj = native
-**.vcw = native
-**.vcxproj = native
-**.wav = BIN
-**.xbm = BIN
-**.xml = native
-**.zip = BIN
diff --git a/.hgignore b/.hgignore
index c74c5047f..b6c427f82 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,5 @@
syntax:glob
-.svn
+aclocal.m4
autom4te*
config.cache
config.log
@@ -38,6 +38,7 @@ Release
*.user
*.ncb
*.suo
+*.sdf
# for Android
android-project/local.properties
diff --git a/.hgtags b/.hgtags
index e96564c2d..d5c2200b9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ cfcb2e1c36ebe9809577adf768b0ec53e8768af9 release-1.2.8
e044e7c70a50a2f54d14ee20d0933e904e5853b6 release-1.2.9
f14cf9d71233934811774f941d0de121d5f96ccf release-1.2.14
39c22a953456f6c9e2c8993c8ff973824104102a pre-touch-removal
+ccf5fbfa2afabab429ad911308f362201a94d810 macosx_10_4_supported
diff --git a/.indent.pro b/.indent.pro
deleted file mode 100644
index d95d15d95..000000000
--- a/.indent.pro
+++ /dev/null
@@ -1 +0,0 @@
--i4 -nut -nsc -br -ce -cdw -npcs
diff --git a/Android.mk b/Android.mk
index a344a5294..3230f9fea 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,8 @@ LOCAL_MODULE := SDL2
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
LOCAL_SRC_FILES := \
$(subst $(LOCAL_PATH)/,, \
$(wildcard $(LOCAL_PATH)/src/*.c) \
@@ -20,7 +22,7 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
- $(wildcard $(LOCAL_PATH)/src/core/android/*.cpp) \
+ $(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
$(wildcard $(LOCAL_PATH)/src/events/*.c) \
$(wildcard $(LOCAL_PATH)/src/file/*.c) \
diff --git a/BUGS b/BUGS.txt
similarity index 84%
rename from BUGS
rename to BUGS.txt
index 218bf3d15..7ef553875 100644
--- a/BUGS
+++ b/BUGS.txt
@@ -1,18 +1,16 @@
-
-Bugs are now managed in the SDL bug tracker, here:
-
- http://bugzilla.libsdl.org/
-
-You may report bugs there, and search to see if a given issue has already
- been reported, discussed, and maybe even fixed.
-
-
-
-You may also find help at the SDL mailing list. Subscription information:
-
- http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org
-
-Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
- bugs discussed on the mailing list may be forgotten or missed.
-
-
+
+Bugs are now managed in the SDL bug tracker, here:
+
+ http://bugzilla.libsdl.org/
+
+You may report bugs there, and search to see if a given issue has already
+ been reported, discussed, and maybe even fixed.
+
+
+You may also find help on the SDL mailing list. Subscription information:
+
+ http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org
+
+Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
+ bugs discussed on the mailing list may be forgotten or missed.
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf3f34a4c..925392ebb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,8 @@ set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}"
math(EXPR LT_CURRENT "${SDL_MICRO_VERSION} - ${SDL_INTERFACE_AGE}")
math(EXPR LT_AGE "${SDL_BINARY_AGE} - ${SDL_INTERFACE_AGE}")
set(LT_REVISION "${SDL_INTERFACE_AGE}")
+set(LT_RELEASE "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}")
+set(LT_VERSION "${LT_CURRENT}.${LT_REVISION}.${LT_AGE}")
# General settings & flags
set(LIBRARY_OUTPUT_DIRECTORY "build")
@@ -104,6 +106,12 @@ else()
set(UNIX_SYS OFF)
endif(UNIX AND NOT APPLE)
+if(UNIX OR APPLE)
+ set(UNIX_OR_MAC_SYS ON)
+else()
+ set(UNIX_OR_MAC_SYS OFF)
+endif(UNIX OR APPLE)
+
# Default option knobs
if(APPLE OR ARCH_64)
set(OPT_DEF_SSEMATH ON)
@@ -190,7 +198,7 @@ dep_option(FUSIONSOUND_SHARED "Dynamically load fusionsound audio support" ON "
set_option(VIDEO_DUMMY "Use dummy video driver" ON)
set_option(VIDEO_OPENGL "Include OpenGL support" ON)
set_option(VIDEO_OPENGLES "Include OpenGL ES support" ON)
-set_option(PTHREADS "Use POSIX threads for multi-threading" ${UNIX_SYS})
+set_option(PTHREADS "Use POSIX threads for multi-threading" ${UNIX_OR_MAC_SYS})
dep_option(PTHREADS_SEM "Use pthread semaphores" ON "PTHREADS" OFF)
set_option(SDL_DLOPEN "Use dlopen for shared object loading" ON)
set_option(OSS "Support the OSS audio API" ${UNIX_SYS})
@@ -203,6 +211,7 @@ dep_option(PULSEAUDIO_SHARED "Dynamically load PulseAudio support" ON "PULSEAU
set_option(ARTS "Support the Analog Real Time Synthesizer" ${UNIX_SYS})
dep_option(ARTS_SHARED "Dynamically load aRts audio support" ON "ARTS" OFF)
set_option(NAS "Support the NAS audio API" ${UNIX_SYS})
+set_option(SNDIO "Support the sndio audio API" ${UNIX_SYS})
set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF)
set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
@@ -621,6 +630,7 @@ if(UNIX AND NOT APPLE)
CheckESD()
CheckARTS()
CheckNAS()
+ CheckSNDIO()
CheckFusionSound()
endif(SDL_AUDIO)
@@ -793,6 +803,7 @@ elseif(WINDOWS)
${SDL2_SOURCE_DIR}/src/thread/windows/SDL_sysmutex.c
${SDL2_SOURCE_DIR}/src/thread/windows/SDL_syssem.c
${SDL2_SOURCE_DIR}/src/thread/windows/SDL_systhread.c
+ ${SDL2_SOURCE_DIR}/src/thread/windows/SDL_systls.c
${SDL2_SOURCE_DIR}/src/thread/generic/SDL_syscond.c)
set(HAVE_SDL_THREADS TRUE)
endif(SDL_THREADS)
@@ -1135,9 +1146,17 @@ set(_INSTALL_LIBS "SDL2main")
if(SDL_SHARED)
add_library(SDL2 SHARED ${SOURCE_FILES})
- set_target_properties(SDL2 PROPERTIES
- VERSION ${SDL_VERSION}
- SOVERSION ${LT_CURRENT})
+ if(UNIX)
+ set_target_properties(SDL2 PROPERTIES
+ VERSION ${LT_VERSION}
+ SOVERSION ${LT_CURRENT}
+ OUTPUT_NAME "SDL2-${LT_RELEASE}")
+ else(UNIX)
+ set_target_properties(SDL2 PROPERTIES
+ VERSION ${SDL_VERSION}
+ SOVERSION ${LT_CURRENT}
+ OUTPUT_NAME "SDL2")
+ endif(UNIX)
set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
endif(SDL_SHARED)
@@ -1165,6 +1184,13 @@ endforeach()
list(APPEND INCLUDE_FILES ${BIN_INCLUDE_FILES})
install(FILES ${INCLUDE_FILES} DESTINATION include/SDL2)
+if(SDL_SHARED)
+ install(CODE "
+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ \"libSDL2-2.0.so\" \"libSDL2.so\")")
+ install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}")
+endif(SDL_SHARED)
+
if(NOT WINDOWS OR CYGWIN)
if(FREEBSD)
# FreeBSD uses ${PREFIX}/libdata/pkgconfig
@@ -1175,4 +1201,5 @@ if(NOT WINDOWS OR CYGWIN)
endif(FREEBSD)
install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION bin)
# TODO: what about the .spec file? Is it only needed for RPM creation?
+ install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "share/aclocal")
endif(NOT WINDOWS OR CYGWIN)
diff --git a/COPYING b/COPYING.txt
similarity index 97%
rename from COPYING
rename to COPYING.txt
index 397e7b45d..391424f79 100644
--- a/COPYING
+++ b/COPYING.txt
@@ -1,20 +1,20 @@
-
-Simple DirectMedia Layer
-Copyright (C) 1997-2013 Sam Lantinga
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
+
+Simple DirectMedia Layer
+Copyright (C) 1997-2013 Sam Lantinga
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index 4bf1f96bf..000000000
--- a/CREDITS
+++ /dev/null
@@ -1,70 +0,0 @@
-
-Simple DirectMedia Layer CREDITS
-Thanks to everyone who made this possible, including:
-
-* Cliff Matthews, for giving me a reason to start this project. :)
- -- Executor rocks! *grin*
-
-* The Linux Fund, C Magazine, Educational Technology Resources Inc.,
- Gareth Noyce, Jesse Pavel, Keith Kitchin, Jeremy Horvath, Thomas Nicholson,
- Hans-Peter Gygax, the Eternal Lands Development Team, Lars Brubaker,
- and Phoenix Kokido for financial contributions
-
-* Edgar "bobbens" Simo for his force feedback API development during the
- Google Summer of Code 2008
-
-* Aaron Wishnick for his work on audio resampling and pitch shifting during
- the Google Summer of Code 2008
-
-* Holmes Futrell for port of SDL to the iPhone and iPod Touch during the
- Google Summer of Code 2008
-
-* Szymon "Wilku" Wilczek for adding support for multiple mice and tablets
- during the Google Summer of Code 2008
-
-* Marty Leisner, Andrew, Will, Edgar Simo, Donny Viszneki, Andrea Mazzoleni,
- Dmytro Bogovych, and Couriersud for helping find SDL 1.3 bugs in the great
- SDL Bug Hunt of January 2009!
-
-* Donny Viszneki for helping fix SDL 1.3 bugs in the great SDL Bug Hunt of
- January 2009!
-
-* Luke Benstead for OpenGL 3.0 support
-
-* Gaëtan de Menten for writing the PHP and SQL behind the SDL website
-
-* Tim Jones for the new look of the SDL website
-
-* Ryan Gordon for helping everybody out and keeping the dream alive. :)
-
-* Mattias Engdegård, for help with the Solaris port and lots of other help
-
-* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the Mac OS X port
-
-* David Carré, for the Pandora port
-
-* Couriersud for the DirectFB driver
-
-* Jon Atkins for SDL_image, SDL_mixer and SDL_net documentation
-
-* Arne Claus, for the 2004 winning SDL logo,
- and Shandy Brown, Jac, Alex Lyman, Mikkel Gjoel, #Guy, Jonas Hartmann,
- Daniel Liljeberg, Ronald Sowa, DocD, Pekka Jaervinen, Patrick Avella,
- Erkki Kontilla, Levon Gavalian, Hal Emerich, David Wiktorsson,
- S. Schury and F. Hufsky, Ciska de Ruyver, Shredweat, Tyler Montbriand,
- Martin Andersson, Merlyn Wysard, Fernando Ibanez, David Miller,
- Andre Bommele, lovesby.com, Francisco Camenforte Torres, and David Igreja
- for other logo entries.
-
-* Bob Pendleton and David Olofson for being long time contributors to
- the SDL mailing list.
-
-* Everybody at Loki Software, Inc. for their great contributions!
-
- And a big hand to everyone else who gave me appreciation, advice,
- and suggestions, especially the good folks on the SDL mailing list.
-
-THANKS! :)
-
- -- Sam Lantinga
-
diff --git a/CREDITS.txt b/CREDITS.txt
new file mode 100644
index 000000000..a1c2cdcb0
--- /dev/null
+++ b/CREDITS.txt
@@ -0,0 +1,51 @@
+
+Simple DirectMedia Layer CREDITS
+Thanks to everyone who made this possible, including:
+
+* Cliff Matthews, for giving me a reason to start this project. :)
+ -- Executor rocks! *grin*
+
+* Ryan Gordon for helping everybody out and keeping the dream alive. :)
+
+* Gabriel Jacobo for his work on the Android port and generally helping out all around.
+
+* Philipp Wiesemann for his attention to detail reviewing the entire SDL code base and proposes patches.
+
+* Andreas Schiffler for his dedication to unit tests, Visual Studio projects, and managing the Google Summer of Code.
+
+* Mike Sartain for incorporating SDL into Team Fortress 2 and cheering me on at Valve.
+
+* Alfred Reynolds for the game controller API and general (in)sanity
+
+* Jørgen Tjernø for numerous magical Mac OS X fixes.
+
+* Pierre-Loup Griffais for his deep knowledge of OpenGL drivers.
+
+* Sheena Smith for many months of great work on the SDL wiki creating the API documentation and style guides.
+
+* Paul Hunkin for his port of SDL to Android during the Google Summer of Code 2010.
+
+* Eli Gottlieb for his work on shaped windows during the Google Summer of Code 2010.
+
+* Jim Grandpre for his work on multi-touch and gesture recognition during
+ the Google Summer of Code 2010.
+
+* Edgar "bobbens" Simo for his force feedback API development during the
+ Google Summer of Code 2008.
+
+* Aaron Wishnick for his work on audio resampling and pitch shifting during
+ the Google Summer of Code 2008.
+
+* Holmes Futrell for his port of SDL to the iPhone and iPod Touch during the
+ Google Summer of Code 2008.
+
+* Jon Atkins for SDL_image, SDL_mixer and SDL_net documentation.
+
+* Everybody at Loki Software, Inc. for their great contributions!
+
+ And a big hand to everyone else who has contributed over the years.
+
+THANKS! :)
+
+ -- Sam Lantinga
+
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 66cbfdf76..000000000
--- a/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-
-To compile and install SDL:
-
- 0. If you have downloaded this from the website, skip to the next step.
- If you have checked this out from subversion, you'll need to run
- ./autogen.sh to build the configure script.
-
- 1. Run './configure; make; make install'
-
- If you are compiling for Windows using gcc, read the FAQ at:
- http://www.libsdl.org/faq.php?action=listentries&category=4#42
-
- If you are compiling using Visual C++ on Win32, you should read
- the file VisualC.html
-
- 2. Look at the example programs in ./test, and check out the online
- documentation at http://wiki.libsdl.org/
-
- 3. Join the SDL developer mailing list by sending E-mail to
- sdl-request@libsdl.org
- and put "subscribe" in the subject of the message.
-
- Or alternatively you can use the web interface:
- http://www.libsdl.org/mailing-list.php
-
-That's it!
-Sam Lantinga
diff --git a/INSTALL.txt b/INSTALL.txt
new file mode 100644
index 000000000..ce77664c9
--- /dev/null
+++ b/INSTALL.txt
@@ -0,0 +1,40 @@
+
+To compile and install SDL:
+
+ 1. Windows with Visual Studio:
+ * Read VisualC.html
+
+ Windows with gcc, either native or cross-compiling:
+ * Read the FAQ at http://wiki.libsdl.org/moin.fcg/FAQWindows
+ * Run './configure; make; make install'
+
+ Mac OS X with Xcode:
+ * Read README-macosx.txt
+
+ Mac OS X from the command line:
+ * Run './configure; make; make install'
+
+ Linux and other UNIX systems:
+ * Run './configure; make; make install'
+
+ Android:
+ * Read README-android.txt
+
+ iOS:
+ * Read README-ios.txt
+
+ Using Cmake:
+ * Read README-cmake.txt
+
+ 2. Look at the example programs in ./test, and check out the online
+ documentation at http://wiki.libsdl.org/
+
+ 3. Join the SDL developer mailing list by sending E-mail to
+ sdl-request@libsdl.org
+ and put "subscribe" in the subject of the message.
+
+ Or alternatively you can use the web interface:
+ http://www.libsdl.org/mailing-list.php
+
+That's it!
+Sam Lantinga
diff --git a/Makefile.in b/Makefile.in
index dda6692e1..ae6293e7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
SDLTEST_TARGET = libSDL2_test.a
SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
-SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS
+SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS
GEN_DIST = SDL2.spec
HDRS = \
@@ -47,7 +47,7 @@ HDRS = \
SDL_assert.h \
SDL_atomic.h \
SDL_audio.h \
- SDL_bits.h \
+ SDL_bits.h \
SDL_blendmode.h \
SDL_clipboard.h \
SDL_cpuinfo.h \
@@ -216,26 +216,3 @@ dist $(distfile):
rpm: $(distfile)
rpmbuild -ta $?
-
-# Run indent on the source to standardize coding style
-indent:
- @echo "Running indent... modified files:"
- @cd $(srcdir) && \
- find . \( \
- -name '*.h' -o \
- -name '*.c' -o \
- -name '*.cc' \) \
- -print | fgrep -v ./Xcode | \
- while read file; do \
- indent "$$file" -o "$$file.indent"; \
- if cmp "$$file" "$$file.indent" >/dev/null; then \
- rm -f "$$file.indent"; \
- else \
- echo "$$file"; \
- mv -f "$$file.indent" "$$file"; \
- fi; \
- done
-
-# Run indent and then commit modified files
-commit: indent
- hg commit
diff --git a/Makefile.psp b/Makefile.psp
index ec137806d..8bcdcb927 100644
--- a/Makefile.psp
+++ b/Makefile.psp
@@ -2,7 +2,6 @@ TARGET_LIB = libSDL2.a
OBJS= src/SDL.o \
src/SDL_assert.o \
src/SDL_error.o \
- src/SDL_fatal.o \
src/SDL_hints.o \
src/SDL_log.o \
src/atomic/SDL_atomic.o \
diff --git a/README-SDL.txt b/README-SDL.txt
index fade0b958..0630395e5 100644
--- a/README-SDL.txt
+++ b/README-SDL.txt
@@ -1,13 +1,13 @@
-
-Please distribute this file with the SDL runtime environment:
-
-The Simple DirectMedia Layer (SDL for short) is a cross-platform library
-designed to make it easy to write multi-media software, such as games and
-emulators.
-
-The Simple DirectMedia Layer library source code is available from:
-http://www.libsdl.org/
-
-This library is distributed under the terms of the zlib license:
-http://www.zlib.net/zlib_license.html
-
+
+Please distribute this file with the SDL runtime environment:
+
+The Simple DirectMedia Layer (SDL for short) is a cross-platform library
+designed to make it easy to write multi-media software, such as games and
+emulators.
+
+The Simple DirectMedia Layer library source code is available from:
+http://www.libsdl.org/
+
+This library is distributed under the terms of the zlib license:
+http://www.zlib.net/zlib_license.html
+
diff --git a/README.android b/README-android.txt
similarity index 95%
rename from README.android
rename to README-android.txt
index efc3ab302..ecd31ae1b 100644
--- a/README.android
+++ b/README-android.txt
@@ -1,384 +1,384 @@
-================================================================================
-Simple DirectMedia Layer for Android
-================================================================================
-
-Requirements:
-
-Android SDK (version 10 or later)
-http://developer.android.com/sdk/index.html
-
-Android NDK r7 or later
-http://developer.android.com/sdk/ndk/index.html
-
-Minimum API level supported by SDL: 10 (Android 2.3.3)
-
-================================================================================
- How the port works
-================================================================================
-
-- Android applications are Java-based, optionally with parts written in C
-- As SDL apps are C-based, we use a small Java shim that uses JNI to talk to
-the SDL library
-- This means that your application C code must be placed inside an Android
-Java project, along with some C support code that communicates with Java
-- This eventually produces a standard Android .apk package
-
-The Android Java code implements an "activity" and can be found in:
-android-project/src/org/libsdl/app/SDLActivity.java
-
-The Java code loads your game code, the SDL shared library, and
-dispatches to native functions implemented in the SDL library:
-src/SDL_android.cpp
-
-Your project must include some glue code that starts your main() routine:
-src/main/android/SDL_android_main.cpp
-
-
-================================================================================
- Building an app
-================================================================================
-
-Instructions:
-1. Copy the android-project directory wherever you want to keep your projects
- and rename it to the name of your project.
-2. Move or symlink this SDL directory into the /jni directory
-3. Edit /jni/src/Android.mk to include your source files
-4. Run 'ndk-build' (a script provided by the NDK). This compiles the C source
-
-If you want to use the Eclipse IDE, skip to the Eclipse section below.
-
-5. Create /local.properties and use that to point to the Android SDK directory, by writing a line with the following form:
-sdk.dir=PATH_TO_ANDROID_SDK
-6. Run 'ant debug' in android/project. This compiles the .java and eventually
- creates a .apk with the native code embedded
-7. 'ant debug install' will push the apk to the device or emulator (if connected)
-
-Here's an explanation of the files in the Android project, so you can customize them:
-
-android-project/
- AndroidManifest.xml - package manifest. Among others, it contains the class name
- of the main activity.
- build.properties - empty
- build.xml - build description file, used by ant. The actual application name
- is specified here.
- default.properties - holds the target ABI for the application, android-10 and up
- project.properties - holds the target ABI for the application, android-10 and up
- local.properties - holds the SDK path, you should change this to the path to your SDK
- jni/ - directory holding native code
- jni/Android.mk - Android makefile that can call recursively the Android.mk files
- in all subdirectories
- jni/SDL/ - (symlink to) directory holding the SDL library files
- jni/SDL/Android.mk - Android makefile for creating the SDL shared library
- jni/src/ - directory holding your C/C++ source
- jni/src/Android.mk - Android makefile that you should customize to include your
- source code and any library references
- res/ - directory holding resources for your application
- res/drawable-* - directories holding icons for different phone hardware. Could be
- one dir called "drawable".
- res/layout/main.xml - Usually contains a file main.xml, which declares the screen layout.
- We don't need it because we use the SDL video output.
- res/values/strings.xml - strings used in your application, including the application name
- shown on the phone.
- src/org/libsdl/app/SDLActivity.java - the Java class handling the initialization and binding
- to SDL. Be very careful changing this, as the SDL library relies
- on this implementation.
-
-
-================================================================================
- Customizing your application name
-================================================================================
-
-To customize your application name, edit AndroidManifest.xml and replace
-"org.libsdl.app" with an identifier for your product package.
-
-Then create a Java class extending SDLActivity and place it in a directory
-under src matching your package, e.g.
- src/com/gamemaker/game/MyGame.java
-
-Here's an example of a minimal class file:
---- MyGame.java --------------------------
-package com.gamemaker.game;
-
-import org.libsdl.app.SDLActivity;
-
-/*
- * A sample wrapper class that just calls SDLActivity
- */
-
-public class MyGame extends SDLActivity { }
-
-------------------------------------------
-
-Then replace "SDLActivity" in AndroidManifest.xml with the name of your
-class, .e.g. "MyGame"
-
-================================================================================
- Customizing your application icon
-================================================================================
-
-Conceptually changing your icon is just replacing the icon.png files in the
-drawable directories under the res directory. There are 3 directories for
-different screen sizes. These can be replaced with 1 dir called 'drawable',
-containing an icon file 'icon.png' with dimensions 48x48 or 72x72.
-
-You may need to change the name of your icon in AndroidManifest.xml to match
-this icon filename.
-
-================================================================================
- Loading assets
-================================================================================
-
-Any files you put in the "assets" directory of your android-project directory
-will get bundled into the application package and you can load them using the
-standard functions in SDL_rwops.h.
-
-There are also a few Android specific functions that allow you to get other
-useful paths for saving and loading data:
-SDL_AndroidGetInternalStoragePath()
-SDL_AndroidGetExternalStorageState()
-SDL_AndroidGetExternalStoragePath()
-
-See SDL_system.h for more details on these functions.
-
-The asset packaging system will, by default, compress certain file extensions.
-SDL includes two asset file access mechanisms, the preferred one is the so
-called "File Descriptor" method, which is faster and doesn't involve the Dalvik
-GC, but given this method does not work on compressed assets, there is also the
-"Input Stream" method, which is automatically used as a fall back by SDL. You
-may want to keep this fact in mind when building your APK, specially when large
-files are involved.
-For more information on which extensions get compressed by default and how to
-disable this behaviour, see for example:
-
-http://ponystyle.com/blog/2010/03/26/dealing-with-asset-compression-in-android-apps/
-
-================================================================================
- Pause / Resume behaviour
-================================================================================
-
-If SDL is compiled with SDL_ANDROID_BLOCK_ON_PAUSE defined (the default),
-the event loop will block itself when the app is paused (ie, when the user
-returns to the main Android dashboard). Blocking is better in terms of battery
-use, and it allows your app to spring back to life instantaneously after resume
-(versus polling for a resume message).
-
-Upon resume, SDL will attempt to restore the GL context automatically.
-In modern devices (Android 3.0 and up) this will most likely succeed and your
-app can continue to operate as it was.
-
-However, there's a chance (on older hardware, or on systems under heavy load),
-where the GL context can not be restored. In that case you have to listen for
-a specific message, (which is not yet implemented!) and restore your textures
-manually or quit the app (which is actually the kind of behaviour you'll see
-under iOS, if the OS can not restore your GL context it will just kill your app)
-
-================================================================================
- Threads and the Java VM
-================================================================================
-
-For a quick tour on how Linux native threads interoperate with the Java VM, take
-a look here: http://developer.android.com/guide/practices/jni.html
-If you want to use threads in your SDL app, it's strongly recommended that you
-do so by creating them using SDL functions. This way, the required attach/detach
-handling is managed by SDL automagically. If you have threads created by other
-means and they make calls to SDL functions, make sure that you call
-Android_JNI_SetupThread before doing anything else otherwise SDL will attach
-your thread automatically anyway (when you make an SDL call), but it'll never
-detach it.
-
-================================================================================
- Using STL
-================================================================================
-
-You can use STL in your project by creating an Application.mk file in the jni
-folder and adding the following line:
-APP_STL := stlport_static
-
-For more information check out CPLUSPLUS-SUPPORT.html in the NDK documentation.
-
-================================================================================
- Additional documentation
-================================================================================
-
-The documentation in the NDK docs directory is very helpful in understanding the
-build process and how to work with native code on the Android platform.
-
-The best place to start is with docs/OVERVIEW.TXT
-
-
-================================================================================
- Using Eclipse
-================================================================================
-
-First make sure that you've installed Eclipse and the Android extensions as described here:
- http://developer.android.com/sdk/eclipse-adt.html
-
-Once you've copied the SDL android project and customized it, you can create an Eclipse project from it:
- * File -> New -> Other
- * Select the Android -> Android Project wizard and click Next
- * Enter the name you'd like your project to have
- * Select "Create project from existing source" and browse for your project directory
- * Make sure the Build Target is set to Android 2.0
- * Click Finish
-
-
-================================================================================
- Using the emulator
-================================================================================
-
-There are some good tips and tricks for getting the most out of the
-emulator here: http://developer.android.com/tools/devices/emulator.html
-
-Especially useful is the info on setting up OpenGL ES 2.0 emulation.
-
-Notice that this software emulator is incredibly slow and needs a lot of disk space.
-Using a real device works better.
-
-================================================================================
- Troubleshooting
-================================================================================
-
-You can create and run an emulator from the Eclipse IDE:
- * Window -> Android SDK and AVD Manager
-
-You can see if adb can see any devices with the following command:
- adb devices
-
-You can see the output of log messages on the default device with:
- adb logcat
-
-You can push files to the device with:
- adb push local_file remote_path_and_file
-
-You can push files to the SD Card at /sdcard, for example:
- adb push moose.dat /sdcard/moose.dat
-
-You can see the files on the SD card with a shell command:
- adb shell ls /sdcard/
-
-You can start a command shell on the default device with:
- adb shell
-
-You can remove the library files of your project (and not the SDL lib files) with:
- ndk-build clean
-
-You can do a build with the following command:
- ndk-build
-
-You can see the complete command line that ndk-build is using by passing V=1 on the command line:
- ndk-build V=1
-
-If your application crashes in native code, you can use addr2line to convert the
-addresses in the stack trace to lines in your code.
-
-For example, if your crash looks like this:
-I/DEBUG ( 31): signal 11 (SIGSEGV), code 2 (SEGV_ACCERR), fault addr 400085d0
-I/DEBUG ( 31): r0 00000000 r1 00001000 r2 00000003 r3 400085d4
-I/DEBUG ( 31): r4 400085d0 r5 40008000 r6 afd41504 r7 436c6a7c
-I/DEBUG ( 31): r8 436c6b30 r9 435c6fb0 10 435c6f9c fp 4168d82c
-I/DEBUG ( 31): ip 8346aff0 sp 436c6a60 lr afd1c8ff pc afd1c902 cpsr 60000030
-I/DEBUG ( 31): #00 pc 0001c902 /system/lib/libc.so
-I/DEBUG ( 31): #01 pc 0001ccf6 /system/lib/libc.so
-I/DEBUG ( 31): #02 pc 000014bc /data/data/org.libsdl.app/lib/libmain.so
-I/DEBUG ( 31): #03 pc 00001506 /data/data/org.libsdl.app/lib/libmain.so
-
-You can see that there's a crash in the C library being called from the main code.
-I run addr2line with the debug version of my code:
- arm-eabi-addr2line -C -f -e obj/local/armeabi/libmain.so
-and then paste in the number after "pc" in the call stack, from the line that I care about:
-000014bc
-
-I get output from addr2line showing that it's in the quit function, in testspriteminimal.c, on line 23.
-
-You can add logging to your code to help show what's happening:
-
-#include
-
- __android_log_print(ANDROID_LOG_INFO, "foo", "Something happened! x = %d", x);
-
-If you need to build without optimization turned on, you can create a file called
-"Application.mk" in the jni directory, with the following line in it:
-APP_OPTIM := debug
-
-
-================================================================================
- Memory debugging
-================================================================================
-
-The best (and slowest) way to debug memory issues on Android is valgrind.
-Valgrind has support for Android out of the box, just grab code using:
- svn co svn://svn.valgrind.org/valgrind/trunk valgrind
-... and follow the instructions in the file README.android to build it.
-
-One thing I needed to do on Mac OS X was change the path to the toolchain,
-and add ranlib to the environment variables:
-export RANLIB=$NDKROOT/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ranlib
-
-Once valgrind is built, you can create a wrapper script to launch your
-application with it, changing org.libsdl.app to your package identifier:
---- start_valgrind_app -------------------
-#!/system/bin/sh
-export TMPDIR=/data/data/org.libsdl.app
-exec /data/local/Inst/bin/valgrind --log-file=/sdcard/valgrind.log --error-limit=no $*
-------------------------------------------
-
-Then push it to the device:
- adb push start_valgrind_app /data/local
-
-and make it executable:
- adb shell chmod 755 /data/local/start_valgrind_app
-
-and tell Android to use the script to launch your application:
- adb shell setprop wrap.org.libsdl.app "logwrapper /data/local/start_valgrind_app"
-
-If the setprop command says "could not set property", it's likely that
-your package name is too long and you should make it shorter by changing
-AndroidManifest.xml and the path to your class file in android-project/src
-
-You can then launch your application normally and waaaaaaaiiittt for it.
-You can monitor the startup process with the logcat command above, and
-when it's done (or even while it's running) you can grab the valgrind
-output file:
- adb pull /sdcard/valgrind.log
-
-When you're done instrumenting with valgrind, you can disable the wrapper:
- adb shell setprop wrap.org.libsdl.app ""
-
-================================================================================
- Why is API level 10 the minimum required?
-================================================================================
-
-API level 10 is required because SDL requires some functionality for running not
-available on older devices and some for building which is not in older NDK/SDKs.
-
-Support for native OpenGL ES and ES2 applications was introduced in the NDK for
-API level 4 and 8. EGL was made a stable API in the NDK for API level 9, which
-has since then been obsoleted, with the recommendation to developers to bump the
-required API level to 10.
-As of this writing, according to http://developer.android.com/about/dashboards/index.html
-about 90% of the Android devices accessing Google Play support API level 10 or
-higher (March 2013).
-
-================================================================================
- A note regarding the use of the "dirty rectangles" rendering technique
-================================================================================
-
-If your app uses a variation of the "dirty rectangles" rendering technique,
-where you only update a portion of the screen on each frame, you may notice a
-variety of visual glitches on Android, that are not present on other platforms.
-This is caused by SDL's use of EGL as the support system to handle OpenGL ES/ES2
-contexts, in particular the use of the eglSwapBuffers function. As stated in the
-documentation for the function "The contents of ancillary buffers are always
-undefined after calling eglSwapBuffers".
-Setting the EGL_SWAP_BEHAVIOR attribute of the surface to EGL_BUFFER_PRESERVED
-is not possible for SDL as it requires EGL 1.4, available only on the API level
-17+, so the only workaround available on this platform is to redraw the entire
-screen each frame.
-
-Reference: http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html
-
-================================================================================
- Known issues
-================================================================================
-
-- TODO. I'm sure there's a bunch more stuff I haven't thought of
+================================================================================
+Simple DirectMedia Layer for Android
+================================================================================
+
+Requirements:
+
+Android SDK (version 10 or later)
+http://developer.android.com/sdk/index.html
+
+Android NDK r7 or later
+http://developer.android.com/sdk/ndk/index.html
+
+Minimum API level supported by SDL: 10 (Android 2.3.3)
+
+================================================================================
+ How the port works
+================================================================================
+
+- Android applications are Java-based, optionally with parts written in C
+- As SDL apps are C-based, we use a small Java shim that uses JNI to talk to
+the SDL library
+- This means that your application C code must be placed inside an Android
+Java project, along with some C support code that communicates with Java
+- This eventually produces a standard Android .apk package
+
+The Android Java code implements an "Activity" and can be found in:
+android-project/src/org/libsdl/app/SDLActivity.java
+
+The Java code loads your game code, the SDL shared library, and
+dispatches to native functions implemented in the SDL library:
+src/SDL_android.c
+
+Your project must include some glue code that starts your main() routine:
+src/main/android/SDL_android_main.c
+
+
+================================================================================
+ Building an app
+================================================================================
+
+Instructions:
+1. Copy the android-project directory wherever you want to keep your projects
+ and rename it to the name of your project.
+2. Move or symlink this SDL directory into the /jni directory
+3. Edit /jni/src/Android.mk to include your source files
+4. Run 'ndk-build' (a script provided by the NDK). This compiles the C source
+
+If you want to use the Eclipse IDE, skip to the Eclipse section below.
+
+5. Create /local.properties and use that to point to the Android SDK directory, by writing a line with the following form:
+sdk.dir=PATH_TO_ANDROID_SDK
+6. Run 'ant debug' in android/project. This compiles the .java and eventually
+ creates a .apk with the native code embedded
+7. 'ant debug install' will push the apk to the device or emulator (if connected)
+
+Here's an explanation of the files in the Android project, so you can customize them:
+
+android-project/
+ AndroidManifest.xml - package manifest. Among others, it contains the class name
+ of the main Activity and the package name of the application.
+ build.properties - empty
+ build.xml - build description file, used by ant. The actual application name
+ is specified here.
+ default.properties - holds the target ABI for the application, android-10 and up
+ project.properties - holds the target ABI for the application, android-10 and up
+ local.properties - holds the SDK path, you should change this to the path to your SDK
+ jni/ - directory holding native code
+ jni/Android.mk - Android makefile that can call recursively the Android.mk files
+ in all subdirectories
+ jni/SDL/ - (symlink to) directory holding the SDL library files
+ jni/SDL/Android.mk - Android makefile for creating the SDL shared library
+ jni/src/ - directory holding your C/C++ source
+ jni/src/Android.mk - Android makefile that you should customize to include your
+ source code and any library references
+ res/ - directory holding resources for your application
+ res/drawable-* - directories holding icons for different phone hardware. Could be
+ one dir called "drawable".
+ res/layout/main.xml - Usually contains a file main.xml, which declares the screen layout.
+ We don't need it because we use the SDL video output.
+ res/values/strings.xml - strings used in your application, including the application name
+ shown on the phone.
+ src/org/libsdl/app/SDLActivity.java - the Java class handling the initialization and binding
+ to SDL. Be very careful changing this, as the SDL library relies
+ on this implementation.
+
+
+================================================================================
+ Customizing your application name
+================================================================================
+
+To customize your application name, edit AndroidManifest.xml and replace
+"org.libsdl.app" with an identifier for your product package.
+
+Then create a Java class extending SDLActivity and place it in a directory
+under src matching your package, e.g.
+ src/com/gamemaker/game/MyGame.java
+
+Here's an example of a minimal class file:
+--- MyGame.java --------------------------
+package com.gamemaker.game;
+
+import org.libsdl.app.SDLActivity;
+
+/*
+ * A sample wrapper class that just calls SDLActivity
+ */
+
+public class MyGame extends SDLActivity { }
+
+------------------------------------------
+
+Then replace "SDLActivity" in AndroidManifest.xml with the name of your
+class, .e.g. "MyGame"
+
+================================================================================
+ Customizing your application icon
+================================================================================
+
+Conceptually changing your icon is just replacing the "ic_launcher.png" files in
+the drawable directories under the res directory. There are four directories for
+different screen sizes. These can be replaced with one dir called "drawable",
+containing an icon file "ic_launcher.png" with dimensions 48x48 or 72x72.
+
+You may need to change the name of your icon in AndroidManifest.xml to match
+this icon filename.
+
+================================================================================
+ Loading assets
+================================================================================
+
+Any files you put in the "assets" directory of your android-project directory
+will get bundled into the application package and you can load them using the
+standard functions in SDL_rwops.h.
+
+There are also a few Android specific functions that allow you to get other
+useful paths for saving and loading data:
+SDL_AndroidGetInternalStoragePath()
+SDL_AndroidGetExternalStorageState()
+SDL_AndroidGetExternalStoragePath()
+
+See SDL_system.h for more details on these functions.
+
+The asset packaging system will, by default, compress certain file extensions.
+SDL includes two asset file access mechanisms, the preferred one is the so
+called "File Descriptor" method, which is faster and doesn't involve the Dalvik
+GC, but given this method does not work on compressed assets, there is also the
+"Input Stream" method, which is automatically used as a fall back by SDL. You
+may want to keep this fact in mind when building your APK, specially when large
+files are involved.
+For more information on which extensions get compressed by default and how to
+disable this behaviour, see for example:
+
+http://ponystyle.com/blog/2010/03/26/dealing-with-asset-compression-in-android-apps/
+
+================================================================================
+ Pause / Resume behaviour
+================================================================================
+
+If SDL is compiled with SDL_ANDROID_BLOCK_ON_PAUSE defined (the default),
+the event loop will block itself when the app is paused (ie, when the user
+returns to the main Android dashboard). Blocking is better in terms of battery
+use, and it allows your app to spring back to life instantaneously after resume
+(versus polling for a resume message).
+
+Upon resume, SDL will attempt to restore the GL context automatically.
+In modern devices (Android 3.0 and up) this will most likely succeed and your
+app can continue to operate as it was.
+
+However, there's a chance (on older hardware, or on systems under heavy load),
+where the GL context can not be restored. In that case you have to listen for
+a specific message, (which is not yet implemented!) and restore your textures
+manually or quit the app (which is actually the kind of behaviour you'll see
+under iOS, if the OS can not restore your GL context it will just kill your app)
+
+================================================================================
+ Threads and the Java VM
+================================================================================
+
+For a quick tour on how Linux native threads interoperate with the Java VM, take
+a look here: http://developer.android.com/guide/practices/jni.html
+If you want to use threads in your SDL app, it's strongly recommended that you
+do so by creating them using SDL functions. This way, the required attach/detach
+handling is managed by SDL automagically. If you have threads created by other
+means and they make calls to SDL functions, make sure that you call
+Android_JNI_SetupThread before doing anything else otherwise SDL will attach
+your thread automatically anyway (when you make an SDL call), but it'll never
+detach it.
+
+================================================================================
+ Using STL
+================================================================================
+
+You can use STL in your project by creating an Application.mk file in the jni
+folder and adding the following line:
+APP_STL := stlport_static
+
+For more information check out CPLUSPLUS-SUPPORT.html in the NDK documentation.
+
+================================================================================
+ Additional documentation
+================================================================================
+
+The documentation in the NDK docs directory is very helpful in understanding the
+build process and how to work with native code on the Android platform.
+
+The best place to start is with docs/OVERVIEW.TXT
+
+
+================================================================================
+ Using Eclipse
+================================================================================
+
+First make sure that you've installed Eclipse and the Android extensions as described here:
+ http://developer.android.com/sdk/eclipse-adt.html
+
+Once you've copied the SDL android project and customized it, you can create an Eclipse project from it:
+ * File -> New -> Other
+ * Select the Android -> Android Project wizard and click Next
+ * Enter the name you'd like your project to have
+ * Select "Create project from existing source" and browse for your project directory
+ * Make sure the Build Target is set to Android 2.0
+ * Click Finish
+
+
+================================================================================
+ Using the emulator
+================================================================================
+
+There are some good tips and tricks for getting the most out of the
+emulator here: http://developer.android.com/tools/devices/emulator.html
+
+Especially useful is the info on setting up OpenGL ES 2.0 emulation.
+
+Notice that this software emulator is incredibly slow and needs a lot of disk space.
+Using a real device works better.
+
+================================================================================
+ Troubleshooting
+================================================================================
+
+You can create and run an emulator from the Eclipse IDE:
+ * Window -> Android SDK and AVD Manager
+
+You can see if adb can see any devices with the following command:
+ adb devices
+
+You can see the output of log messages on the default device with:
+ adb logcat
+
+You can push files to the device with:
+ adb push local_file remote_path_and_file
+
+You can push files to the SD Card at /sdcard, for example:
+ adb push moose.dat /sdcard/moose.dat
+
+You can see the files on the SD card with a shell command:
+ adb shell ls /sdcard/
+
+You can start a command shell on the default device with:
+ adb shell
+
+You can remove the library files of your project (and not the SDL lib files) with:
+ ndk-build clean
+
+You can do a build with the following command:
+ ndk-build
+
+You can see the complete command line that ndk-build is using by passing V=1 on the command line:
+ ndk-build V=1
+
+If your application crashes in native code, you can use addr2line to convert the
+addresses in the stack trace to lines in your code.
+
+For example, if your crash looks like this:
+I/DEBUG ( 31): signal 11 (SIGSEGV), code 2 (SEGV_ACCERR), fault addr 400085d0
+I/DEBUG ( 31): r0 00000000 r1 00001000 r2 00000003 r3 400085d4
+I/DEBUG ( 31): r4 400085d0 r5 40008000 r6 afd41504 r7 436c6a7c
+I/DEBUG ( 31): r8 436c6b30 r9 435c6fb0 10 435c6f9c fp 4168d82c
+I/DEBUG ( 31): ip 8346aff0 sp 436c6a60 lr afd1c8ff pc afd1c902 cpsr 60000030
+I/DEBUG ( 31): #00 pc 0001c902 /system/lib/libc.so
+I/DEBUG ( 31): #01 pc 0001ccf6 /system/lib/libc.so
+I/DEBUG ( 31): #02 pc 000014bc /data/data/org.libsdl.app/lib/libmain.so
+I/DEBUG ( 31): #03 pc 00001506 /data/data/org.libsdl.app/lib/libmain.so
+
+You can see that there's a crash in the C library being called from the main code.
+I run addr2line with the debug version of my code:
+ arm-eabi-addr2line -C -f -e obj/local/armeabi/libmain.so
+and then paste in the number after "pc" in the call stack, from the line that I care about:
+000014bc
+
+I get output from addr2line showing that it's in the quit function, in testspriteminimal.c, on line 23.
+
+You can add logging to your code to help show what's happening:
+
+#include
+
+ __android_log_print(ANDROID_LOG_INFO, "foo", "Something happened! x = %d", x);
+
+If you need to build without optimization turned on, you can create a file called
+"Application.mk" in the jni directory, with the following line in it:
+APP_OPTIM := debug
+
+
+================================================================================
+ Memory debugging
+================================================================================
+
+The best (and slowest) way to debug memory issues on Android is valgrind.
+Valgrind has support for Android out of the box, just grab code using:
+ svn co svn://svn.valgrind.org/valgrind/trunk valgrind
+... and follow the instructions in the file README.android to build it.
+
+One thing I needed to do on Mac OS X was change the path to the toolchain,
+and add ranlib to the environment variables:
+export RANLIB=$NDKROOT/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ranlib
+
+Once valgrind is built, you can create a wrapper script to launch your
+application with it, changing org.libsdl.app to your package identifier:
+--- start_valgrind_app -------------------
+#!/system/bin/sh
+export TMPDIR=/data/data/org.libsdl.app
+exec /data/local/Inst/bin/valgrind --log-file=/sdcard/valgrind.log --error-limit=no $*
+------------------------------------------
+
+Then push it to the device:
+ adb push start_valgrind_app /data/local
+
+and make it executable:
+ adb shell chmod 755 /data/local/start_valgrind_app
+
+and tell Android to use the script to launch your application:
+ adb shell setprop wrap.org.libsdl.app "logwrapper /data/local/start_valgrind_app"
+
+If the setprop command says "could not set property", it's likely that
+your package name is too long and you should make it shorter by changing
+AndroidManifest.xml and the path to your class file in android-project/src
+
+You can then launch your application normally and waaaaaaaiiittt for it.
+You can monitor the startup process with the logcat command above, and
+when it's done (or even while it's running) you can grab the valgrind
+output file:
+ adb pull /sdcard/valgrind.log
+
+When you're done instrumenting with valgrind, you can disable the wrapper:
+ adb shell setprop wrap.org.libsdl.app ""
+
+================================================================================
+ Why is API level 10 the minimum required?
+================================================================================
+
+API level 10 is required because SDL requires some functionality for running not
+available on older devices and some for building which is not in older NDK/SDKs.
+
+Support for native OpenGL ES and ES2 applications was introduced in the NDK for
+API level 4 and 8. EGL was made a stable API in the NDK for API level 9, which
+has since then been obsoleted, with the recommendation to developers to bump the
+required API level to 10.
+As of this writing, according to http://developer.android.com/about/dashboards/index.html
+about 90% of the Android devices accessing Google Play support API level 10 or
+higher (March 2013).
+
+================================================================================
+ A note regarding the use of the "dirty rectangles" rendering technique
+================================================================================
+
+If your app uses a variation of the "dirty rectangles" rendering technique,
+where you only update a portion of the screen on each frame, you may notice a
+variety of visual glitches on Android, that are not present on other platforms.
+This is caused by SDL's use of EGL as the support system to handle OpenGL ES/ES2
+contexts, in particular the use of the eglSwapBuffers function. As stated in the
+documentation for the function "The contents of ancillary buffers are always
+undefined after calling eglSwapBuffers".
+Setting the EGL_SWAP_BEHAVIOR attribute of the surface to EGL_BUFFER_PRESERVED
+is not possible for SDL as it requires EGL 1.4, available only on the API level
+17+, so the only workaround available on this platform is to redraw the entire
+screen each frame.
+
+Reference: http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html
+
+================================================================================
+ Known issues
+================================================================================
+
+- TODO. I'm sure there's a bunch more stuff I haven't thought of
diff --git a/README.cmake b/README-cmake.txt
similarity index 97%
rename from README.cmake
rename to README-cmake.txt
index 7f5ac80dd..63c762b53 100644
--- a/README.cmake
+++ b/README-cmake.txt
@@ -1,31 +1,31 @@
-================================================================================
-CMake build system for SDL (www.cmake.org)
-================================================================================
-
-SDL's build system was traditionally based on autotools. Over time, this
-approach has suffered from several issues across the different supported
-platforms.
-To solve these problems, a new build system based on CMake is under development.
-It works in parallel to the legacy system, so users can experiment with it
-without complication.
-While still experimental, the build system should be usable on the following
-platforms:
-
- * FreeBSD
- * Linux
- * VS.NET 2010
- * MinGW and Msys
- * OS X with support for XCode
-
-================================================================================
-Usage
-================================================================================
-
-Assuming the source for SDL is located at ~/sdl
-
-cd ~
-mkdir build
-cd build
-cmake ../sdl
-
-This will build the static and dynamic versions of SDL in the ~/build directory.
+================================================================================
+CMake build system for SDL (www.cmake.org)
+================================================================================
+
+SDL's build system was traditionally based on autotools. Over time, this
+approach has suffered from several issues across the different supported
+platforms.
+To solve these problems, a new build system based on CMake is under development.
+It works in parallel to the legacy system, so users can experiment with it
+without complication.
+While still experimental, the build system should be usable on the following
+platforms:
+
+ * FreeBSD
+ * Linux
+ * VS.NET 2010
+ * MinGW and Msys
+ * OS X with support for XCode
+
+================================================================================
+Usage
+================================================================================
+
+Assuming the source for SDL is located at ~/sdl
+
+cd ~
+mkdir build
+cd build
+cmake ../sdl
+
+This will build the static and dynamic versions of SDL in the ~/build directory.
diff --git a/README.DirectFB b/README-directfb.txt
similarity index 96%
rename from README.DirectFB
rename to README-directfb.txt
index 9c16a7b67..e358278ca 100644
--- a/README.DirectFB
+++ b/README-directfb.txt
@@ -1,106 +1,106 @@
-SDL on DirectFB
-
-Supports:
-
-- Hardware YUV overlays
-- OpenGL - software only
-- 2D/3D accelerations (depends on directfb driver)
-- multiple displays
-- windows
-
-What you need:
-
-DirectFB 1.0.1, 1.2.x, 1.3.0
-Kernel-Framebuffer support: required: vesafb, radeonfb ....
-Mesa 7.0.x - optional for OpenGL
-
-/etc/directfbrc
-
-This file should contain the following lines to make
-your joystick work and avoid crashes:
-------------------------
-disable-module=joystick
-disable-module=cle266
-disable-module=cyber5k
-no-linux-input-grab
-------------------------
-
-To disable to use x11 backend when DISPLAY variable is found use
-
-export SDL_DIRECTFB_X11_CHECK=0
-
-To disable the use of linux input devices, i.e. multimice/multikeyboard support,
-use
-
-export SDL_DIRECTFB_LINUX_INPUT=0
-
-To use hardware accelerated YUV-overlays for YUV-textures, use:
-
-export SDL_DIRECTFB_YUV_DIRECT=1
-
-This is disabled by default. It will only support one
-YUV texture, namely the first. Every other YUV texture will be
-rendered in software.
-
-In addition, you may use (directfb-1.2.x)
-
-export SDL_DIRECTFB_YUV_UNDERLAY=1
-
-to make the YUV texture an underlay. This will make the cursor to
-be shown.
-
-Simple Window Manager
-=====================
-
-The driver has support for a very, very basic window manager you may
-want to use when running with "wm=default". Use
-
-export SDL_DIRECTFB_WM=1
-
-to enable basic window borders. In order to have the window title rendered,
-you need to have the following font installed:
-
-/usr/share/fonts/truetype/freefont/FreeSans.ttf
-
-OpenGL Support
-==============
-
-The following instructions will give you *software* OpenGL. However this
-works at least on all directfb supported platforms.
-
-As of this writing 20100802 you need to pull Mesa from git and do the following:
-
-------------------------
-git clone git://anongit.freedesktop.org/git/mesa/mesa
-cd mesa
-git checkout 2c9fdaf7292423c157fc79b5ce43f0f199dd753a
-------------------------
-
-Edit configs/linux-directfb so that the Directories-section looks like
-------------------------
-# Directories
-SRC_DIRS = mesa glu
-GLU_DIRS = sgi
-DRIVER_DIRS = directfb
-PROGRAM_DIRS =
-------------------------
-
-make linux-directfb
-make
-
-echo Installing - please enter sudo pw.
-
-sudo make install INSTALL_DIR=/usr/local/dfb_GL
-cd src/mesa/drivers/directfb
-make
-sudo make install INSTALL_DIR=/usr/local/dfb_GL
-------------------------
-
-To run the SDL - testprograms:
-
-export SDL_VIDEODRIVER=directfb
-export LD_LIBRARY_PATH=/usr/local/dfb_GL/lib
-export LD_PRELOAD=/usr/local/dfb_GL/libGL.so.7
-
-./testgl
-
+SDL on DirectFB
+
+Supports:
+
+- Hardware YUV overlays
+- OpenGL - software only
+- 2D/3D accelerations (depends on directfb driver)
+- multiple displays
+- windows
+
+What you need:
+
+DirectFB 1.0.1, 1.2.x, 1.3.0
+Kernel-Framebuffer support: required: vesafb, radeonfb ....
+Mesa 7.0.x - optional for OpenGL
+
+/etc/directfbrc
+
+This file should contain the following lines to make
+your joystick work and avoid crashes:
+------------------------
+disable-module=joystick
+disable-module=cle266
+disable-module=cyber5k
+no-linux-input-grab
+------------------------
+
+To disable to use x11 backend when DISPLAY variable is found use
+
+export SDL_DIRECTFB_X11_CHECK=0
+
+To disable the use of linux input devices, i.e. multimice/multikeyboard support,
+use
+
+export SDL_DIRECTFB_LINUX_INPUT=0
+
+To use hardware accelerated YUV-overlays for YUV-textures, use:
+
+export SDL_DIRECTFB_YUV_DIRECT=1
+
+This is disabled by default. It will only support one
+YUV texture, namely the first. Every other YUV texture will be
+rendered in software.
+
+In addition, you may use (directfb-1.2.x)
+
+export SDL_DIRECTFB_YUV_UNDERLAY=1
+
+to make the YUV texture an underlay. This will make the cursor to
+be shown.
+
+Simple Window Manager
+=====================
+
+The driver has support for a very, very basic window manager you may
+want to use when running with "wm=default". Use
+
+export SDL_DIRECTFB_WM=1
+
+to enable basic window borders. In order to have the window title rendered,
+you need to have the following font installed:
+
+/usr/share/fonts/truetype/freefont/FreeSans.ttf
+
+OpenGL Support
+==============
+
+The following instructions will give you *software* OpenGL. However this
+works at least on all directfb supported platforms.
+
+As of this writing 20100802 you need to pull Mesa from git and do the following:
+
+------------------------
+git clone git://anongit.freedesktop.org/git/mesa/mesa
+cd mesa
+git checkout 2c9fdaf7292423c157fc79b5ce43f0f199dd753a
+------------------------
+
+Edit configs/linux-directfb so that the Directories-section looks like
+------------------------
+# Directories
+SRC_DIRS = mesa glu
+GLU_DIRS = sgi
+DRIVER_DIRS = directfb
+PROGRAM_DIRS =
+------------------------
+
+make linux-directfb
+make
+
+echo Installing - please enter sudo pw.
+
+sudo make install INSTALL_DIR=/usr/local/dfb_GL
+cd src/mesa/drivers/directfb
+make
+sudo make install INSTALL_DIR=/usr/local/dfb_GL
+------------------------
+
+To run the SDL - testprograms:
+
+export SDL_VIDEODRIVER=directfb
+export LD_LIBRARY_PATH=/usr/local/dfb_GL/lib
+export LD_PRELOAD=/usr/local/dfb_GL/libGL.so.7
+
+./testgl
+
diff --git a/README.gesture b/README-gesture.txt
similarity index 98%
rename from README.gesture
rename to README-gesture.txt
index d52c4c5a2..4d0a8d681 100644
--- a/README.gesture
+++ b/README-gesture.txt
@@ -1,72 +1,72 @@
-===========================================================================
-Dollar Gestures
-===========================================================================
-SDL Provides an implementation of the $1 gesture recognition system. This allows for recording, saving, loading, and performing single stroke gestures.
-
-Gestures can be performed with any number of fingers (the centroid of the fingers must follow the path of the gesture), but the number of fingers must be constant (a finger cannot go down in the middle of a gesture). The path of a gesture is considered the path from the time when the final finger went down, to the first time any finger comes up.
-
-Dollar gestures are assigned an Id based on a hash function. This is guaranteed to remain constant for a given gesture. There is a (small) chance that two different gestures will be assigned the same ID. In this case, simply re-recording one of the gestures should result in a different ID.
-
-Recording:
-----------
-To begin recording on a touch device call:
-SDL_RecordGesture(SDL_TouchID touchId), where touchId is the id of the touch device you wish to record on, or -1 to record on all connected devices.
-
-Recording terminates as soon as a finger comes up. Recording is acknowledged by an SDL_DOLLARRECORD event.
-A SDL_DOLLARRECORD event is a dgesture with the following fields:
-
-event.dgesture.touchId - the Id of the touch used to record the gesture.
-event.dgesture.gestureId - the unique id of the recorded gesture.
-
-
-Performing:
------------
-As long as there is a dollar gesture assigned to a touch, every finger-up event will also cause an SDL_DOLLARGESTURE event with the following fields:
-
-event.dgesture.touchId - the Id of the touch which performed the gesture.
-event.dgesture.gestureId - the unique id of the closest gesture to the performed stroke.
-event.dgesture.error - the difference between the gesture template and the actual performed gesture. Lower error is a better match.
-event.dgesture.numFingers - the number of fingers used to draw the stroke.
-
-Most programs will want to define an appropriate error threshold and check to be sure that the error of a gesture is not abnormally high (an indicator that no gesture was performed).
-
-
-
-Saving:
--------
-To save a template, call SDL_SaveDollarTemplate(gestureId, src) where gestureId is the id of the gesture you want to save, and src is an SDL_RWops pointer to the file where the gesture will be stored.
-
-To save all currently loaded templates, call SDL_SaveAllDollarTemplates(src) where source is an SDL_RWops pointer to the file where the gesture will be stored.
-
-Both functions return the number of gestures successfully saved.
-
-
-Loading:
---------
-To load templates from a file, call SDL_LoadDollarTemplates(touchId,src) where touchId is the id of the touch to load to (or -1 to load to all touch devices), and src is an SDL_RWops pointer to a gesture save file.
-
-SDL_LoadDollarTemplates returns the number of templates successfully loaded.
-
-
-
-===========================================================================
-Multi Gestures
-===========================================================================
-SDL provides simple support for pinch/rotate/swipe gestures.
-Every time a finger is moved an SDL_MULTIGESTURE event is sent with the following fields:
-
-event.mgesture.touchId - the Id of the touch on which the gesture was performed.
-event.mgesture.x - the normalized x coordinate of the gesture. (0..1)
-event.mgesture.y - the normalized y coordinate of the gesture. (0..1)
-event.mgesture.dTheta - the amount that the fingers rotated during this motion.
-event.mgesture.dDist - the amount that the fingers pinched during this motion.
-event.mgesture.numFingers - the number of fingers used in the gesture.
-
-
-===========================================================================
-Notes
-===========================================================================
-For a complete example see test/testgesture.c
-
-Please direct questions/comments to:
- jim.tla+sdl_touch@gmail.com
+===========================================================================
+Dollar Gestures
+===========================================================================
+SDL Provides an implementation of the $1 gesture recognition system. This allows for recording, saving, loading, and performing single stroke gestures.
+
+Gestures can be performed with any number of fingers (the centroid of the fingers must follow the path of the gesture), but the number of fingers must be constant (a finger cannot go down in the middle of a gesture). The path of a gesture is considered the path from the time when the final finger went down, to the first time any finger comes up.
+
+Dollar gestures are assigned an Id based on a hash function. This is guaranteed to remain constant for a given gesture. There is a (small) chance that two different gestures will be assigned the same ID. In this case, simply re-recording one of the gestures should result in a different ID.
+
+Recording:
+----------
+To begin recording on a touch device call:
+SDL_RecordGesture(SDL_TouchID touchId), where touchId is the id of the touch device you wish to record on, or -1 to record on all connected devices.
+
+Recording terminates as soon as a finger comes up. Recording is acknowledged by an SDL_DOLLARRECORD event.
+A SDL_DOLLARRECORD event is a dgesture with the following fields:
+
+event.dgesture.touchId - the Id of the touch used to record the gesture.
+event.dgesture.gestureId - the unique id of the recorded gesture.
+
+
+Performing:
+-----------
+As long as there is a dollar gesture assigned to a touch, every finger-up event will also cause an SDL_DOLLARGESTURE event with the following fields:
+
+event.dgesture.touchId - the Id of the touch which performed the gesture.
+event.dgesture.gestureId - the unique id of the closest gesture to the performed stroke.
+event.dgesture.error - the difference between the gesture template and the actual performed gesture. Lower error is a better match.
+event.dgesture.numFingers - the number of fingers used to draw the stroke.
+
+Most programs will want to define an appropriate error threshold and check to be sure that the error of a gesture is not abnormally high (an indicator that no gesture was performed).
+
+
+
+Saving:
+-------
+To save a template, call SDL_SaveDollarTemplate(gestureId, src) where gestureId is the id of the gesture you want to save, and src is an SDL_RWops pointer to the file where the gesture will be stored.
+
+To save all currently loaded templates, call SDL_SaveAllDollarTemplates(src) where source is an SDL_RWops pointer to the file where the gesture will be stored.
+
+Both functions return the number of gestures successfully saved.
+
+
+Loading:
+--------
+To load templates from a file, call SDL_LoadDollarTemplates(touchId,src) where touchId is the id of the touch to load to (or -1 to load to all touch devices), and src is an SDL_RWops pointer to a gesture save file.
+
+SDL_LoadDollarTemplates returns the number of templates successfully loaded.
+
+
+
+===========================================================================
+Multi Gestures
+===========================================================================
+SDL provides simple support for pinch/rotate/swipe gestures.
+Every time a finger is moved an SDL_MULTIGESTURE event is sent with the following fields:
+
+event.mgesture.touchId - the Id of the touch on which the gesture was performed.
+event.mgesture.x - the normalized x coordinate of the gesture. (0..1)
+event.mgesture.y - the normalized y coordinate of the gesture. (0..1)
+event.mgesture.dTheta - the amount that the fingers rotated during this motion.
+event.mgesture.dDist - the amount that the fingers pinched during this motion.
+event.mgesture.numFingers - the number of fingers used in the gesture.
+
+
+===========================================================================
+Notes
+===========================================================================
+For a complete example see test/testgesture.c
+
+Please direct questions/comments to:
+ jim.tla+sdl_touch@gmail.com
diff --git a/README.HG b/README-hg.txt
similarity index 97%
rename from README.HG
rename to README-hg.txt
index 616307c6c..32fb8f99d 100644
--- a/README.HG
+++ b/README-hg.txt
@@ -1,23 +1,23 @@
-The latest development version of SDL is available via Mercurial.
-Mercurial allows you to get up-to-the-minute fixes and enhancements;
-as a developer works on a source tree, you can use "hg" to mirror that
-source tree instead of waiting for an official release. Please look
-at the Mercurial website ( http://mercurial.selenic.com/ ) for more
-information on using hg, where you can also download software for
-Mac OS X, Windows, and Unix systems.
-
- hg clone http://hg.libsdl.org/SDL
-
-If you are building SDL with an IDE, you will need to copy the file
-include/SDL_config.h.default to include/SDL_config.h before building.
-
-If you are building SDL via configure, you will need to run autogen.sh
-before running configure.
-
-There is a web interface to the subversion repository at:
-
- http://hg.libsdl.org/SDL/
-
-There is an RSS feed available at that URL, for those that want to
-track commits in real time.
-
+The latest development version of SDL is available via Mercurial.
+Mercurial allows you to get up-to-the-minute fixes and enhancements;
+as a developer works on a source tree, you can use "hg" to mirror that
+source tree instead of waiting for an official release. Please look
+at the Mercurial website ( http://mercurial.selenic.com/ ) for more
+information on using hg, where you can also download software for
+Mac OS X, Windows, and Unix systems.
+
+ hg clone http://hg.libsdl.org/SDL
+
+If you are building SDL with an IDE, you will need to copy the file
+include/SDL_config.h.default to include/SDL_config.h before building.
+
+If you are building SDL via configure, you will need to run autogen.sh
+before running configure.
+
+There is a web interface to the subversion repository at:
+
+ http://hg.libsdl.org/SDL/
+
+There is an RSS feed available at that URL, for those that want to
+track commits in real time.
+
diff --git a/README.iOS b/README-ios.txt
similarity index 76%
rename from README.iOS
rename to README-ios.txt
index f88c2a088..ee0a16d4a 100644
--- a/README.iOS
+++ b/README-ios.txt
@@ -1,160 +1,222 @@
-==============================================================================
-Building the Simple DirectMedia Layer for iPhone OS 2.0
-==============================================================================
-
-Requirements: Mac OS X v10.5 or later and the iPhone SDK.
-
-Instructions:
-1. Open SDL.xcodeproj (located in Xcode-iOS/SDL) in XCode.
-2. Select your desired target, and hit build.
-
-There are three build targets:
-- libSDL.a:
- Build SDL as a statically linked library
-- testsdl
- Build a test program (there are known test failures which are fine)
-- Template:
- Package a project template together with the SDL for iPhone static libraries and copies of the SDL headers. The template includes proper references to the SDL library and headers, skeleton code for a basic SDL program, and placeholder graphics for the application icon and startup screen.
-
-==============================================================================
-Build SDL for iOS from the command line
-==============================================================================
-
-1. cd (PATH WHERE THE SDL CODE IS)/build-scripts
-2. ./iosbuild.sh
-
-If everything goes fine, you should see a build/ios directory, inside there's
-two directories "lib" and "include".
-"include" contains a copy of the SDL headers that you'll need for your project,
-make sure to configure XCode to look for headers there.
-"lib" contains find two files, libSDL2.a and libSDL2main.a, you have to add both
-to your XCode project. These libraries contain three architectures in them,
-armv6 for legacy devices, armv7, and i386 (for the simulator).
-By default, iosbuild.sh will autodetect the SDK version you have installed using
-xcodebuild -showsdks, and build for iOS >= 3.0, you can override this behaviour
-by setting the MIN_OS_VERSION variable, ie:
-
-MIN_OS_VERSION=4.2 ./iosbuild.sh
-
-==============================================================================
-Using the Simple DirectMedia Layer for iOS
-==============================================================================
-
-FIXME: This needs to be updated for the latest methods
-
-Here is the easiest method:
-1. Build the SDL libraries (libSDL.a and libSDLSimulator.a) and the iPhone SDL Application template.
-1. Install the iPhone SDL Application template by copying it to one of XCode's template directories. I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/XCode/Project Templates/" and placing it there.
-2. Start a new project using the template. The project should be immediately ready for use with SDL.
-
-Here is a more manual method:
-1. Create a new iPhone view based application.
-2. Build the SDL static libraries (libSDL.a and libSDLSimulator.a) for iPhone and include them in your project. XCode will ignore the library that is not currently of the correct architecture, hence your app will work both on iPhone and in the iPhone Simulator.
-3. Include the SDL header files in your project.
-4. Remove the AppDelegate.h and AppDelegate.m files -- SDL for iPhone provides its own UIApplicationDelegate. Remove ViewController.h, ViewController.m, and ViewController.xib -- SDL for iPhone produces its user interface programmatically.
-5. Make sure your project links to the following, iOS-provided frameworks: OpenGLES.framework, AudioToolbox.framework, and QuartzCore.framework
-6. Delete the contents of main.m and program your app as a regular SDL program instead. You may replace main.m with your own main.c, but you must tell XCode not to use the project prefix file, as it includes Objective-C code.
-
-==============================================================================
-Notes -- Accelerometer as Joystick
-==============================================================================
-
-SDL for iPhone supports polling the built in accelerometer as a joystick device. For an example on how to do this, see the accelerometer.c in the demos directory.
-
-The main thing to note when using the accelerometer with SDL is that while the iPhone natively reports accelerometer as floating point values in units of g-force, SDL_JoystickGetAxis reports joystick values as signed integers. Hence, in order to convert between the two, some clamping and scaling is necessary on the part of the iPhone SDL joystick driver. To convert SDL_JoystickGetAxis reported values BACK to units of g-force, simply multiply the values by SDL_IPHONE_MAX_GFORCE / 0x7FFF.
-
-==============================================================================
-Notes -- OpenGL ES
-==============================================================================
-
-Your SDL application for iPhone uses OpenGL ES for video by default.
-
-OpenGL ES for iPhone supports several display pixel formats, such as RGBA8 and RGB565, which provide a 32 bit and 16 bit color buffer respectively. By default, the implementation uses RGB565, but you may use RGBA8 by setting each color component to 8 bits in SDL_GL_SetAttribute.
-
-If your application doesn't use OpenGL's depth buffer, you may find significant performance improvement by setting SDL_GL_DEPTH_SIZE to 0.
-
-Finally, if your application completely redraws the screen each frame, you may find significant performance improvement by setting the attribute SDL_GL_RETAINED_BACKING to 1.
-
-==============================================================================
-Notes -- Keyboard
-==============================================================================
-
-The SDL keyboard API has been extended to support on-screen keyboards:
-
-void SDL_StartTextInput()
- -- enables text events and reveals the onscreen keyboard.
-void SDL_StopTextInput()
- -- disables text events and hides the onscreen keyboard.
-SDL_bool SDL_IsTextInputActive()
- -- returns whether or not text events are enabled (and the onscreen keyboard is visible)
-
-==============================================================================
-Notes -- Reading and Writing files
-==============================================================================
-
-Each application installed on iPhone resides in a sandbox which includes its own Application Home directory. Your application may not access files outside this directory.
-
-Once your application is installed its directory tree looks like:
-
-MySDLApp Home/
- MySDLApp.app
- Documents/
- Library/
- Preferences/
- tmp/
-
-When your SDL based iPhone application starts up, it sets the working directory to the main bundle (MySDLApp Home/MySDLApp.app), where your application resources are stored. You cannot write to this directory. Instead, I advise you to write document files to "../Documents/" and preferences to "../Library/Preferences".
-
-More information on this subject is available here:
-http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/Introduction/Introduction.html
-
-==============================================================================
-Notes -- iPhone SDL limitations
-==============================================================================
-
-Windows:
- Full-size, single window applications only. You cannot create multi-window SDL applications for iPhone OS. The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).
-
-Textures:
- The optimal texture formats on iOS are SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, and SDL_PIXELFORMAT_RGB24 pixel formats.
-
-Loading Shared Objects:
- This is disabled by default since it seems to break the terms of the iPhone SDK agreement. It can be re-enabled in SDL_config_iphoneos.h.
-
-==============================================================================
-Game Center
-==============================================================================
-
-Game Center integration requires that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using:
-
-int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
-
-This will set up the given function to be called back on the animation callback, and then you have to return from main() to let the Cocoa event loop run.
-
-e.g.
-
-extern "C"
-void ShowFrame(void*)
-{
- ... do event handling, frame logic and rendering
-}
-
-int main(int argc, char *argv[])
-{
- ... initialize game ...
-
-#if __IPHONEOS__
- // Initialize the Game Center for scoring and matchmaking
- InitGameCenter();
-
- // Set up the game to run in the window animation callback on iOS
- // so that Game Center and so forth works correctly.
- SDL_iPhoneSetAnimationCallback(window, 1, ShowFrame, NULL);
-#else
- while ( running ) {
- ShowFrame(0);
- DelayFrame();
- }
-#endif
- return 0;
-}
+==============================================================================
+Building the Simple DirectMedia Layer for iPhone OS 2.0
+==============================================================================
+
+Requirements: Mac OS X v10.5 or later and the iPhone SDK.
+
+Instructions:
+1. Open SDL.xcodeproj (located in Xcode-iOS/SDL) in XCode.
+2. Select your desired target, and hit build.
+
+There are three build targets:
+- libSDL.a:
+ Build SDL as a statically linked library
+- testsdl
+ Build a test program (there are known test failures which are fine)
+- Template:
+ Package a project template together with the SDL for iPhone static libraries and copies of the SDL headers. The template includes proper references to the SDL library and headers, skeleton code for a basic SDL program, and placeholder graphics for the application icon and startup screen.
+
+==============================================================================
+Build SDL for iOS from the command line
+==============================================================================
+
+1. cd (PATH WHERE THE SDL CODE IS)/build-scripts
+2. ./iosbuild.sh
+
+If everything goes fine, you should see a build/ios directory, inside there's
+two directories "lib" and "include".
+"include" contains a copy of the SDL headers that you'll need for your project,
+make sure to configure XCode to look for headers there.
+"lib" contains find two files, libSDL2.a and libSDL2main.a, you have to add both
+to your XCode project. These libraries contain three architectures in them,
+armv6 for legacy devices, armv7, and i386 (for the simulator).
+By default, iosbuild.sh will autodetect the SDK version you have installed using
+xcodebuild -showsdks, and build for iOS >= 3.0, you can override this behaviour
+by setting the MIN_OS_VERSION variable, ie:
+
+MIN_OS_VERSION=4.2 ./iosbuild.sh
+
+==============================================================================
+Using the Simple DirectMedia Layer for iOS
+==============================================================================
+
+FIXME: This needs to be updated for the latest methods
+
+Here is the easiest method:
+1. Build the SDL libraries (libSDL.a and libSDLSimulator.a) and the iPhone SDL Application template.
+1. Install the iPhone SDL Application template by copying it to one of XCode's template directories. I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/XCode/Project Templates/" and placing it there.
+2. Start a new project using the template. The project should be immediately ready for use with SDL.
+
+Here is a more manual method:
+1. Create a new iPhone view based application.
+2. Build the SDL static libraries (libSDL.a and libSDLSimulator.a) for iPhone and include them in your project. XCode will ignore the library that is not currently of the correct architecture, hence your app will work both on iPhone and in the iPhone Simulator.
+3. Include the SDL header files in your project.
+4. Remove the ApplicationDelegate.h and ApplicationDelegate.m files -- SDL for iPhone provides its own UIApplicationDelegate. Remove MainWindow.xib -- SDL for iPhone produces its user interface programmatically.
+5. Delete the contents of main.m and program your app as a regular SDL program instead. You may replace main.m with your own main.c, but you must tell XCode not to use the project prefix file, as it includes Objective-C code.
+
+==============================================================================
+Notes -- Application events
+==============================================================================
+
+On iOS the application goes through a fixed life cycle and you will get
+notifications of state changes via application events. When these events
+are delivered you must handle them in an event callback because the OS may
+not give you any processing time after the events are delivered.
+
+e.g.
+
+int HandleAppEvents(void *userdata, SDL_Event *event)
+{
+ switch (event->type)
+ {
+ case SDL_APP_TERMINATING:
+ /* Terminate the app.
+ Shut everything down before returning from this function.
+ */
+ return 0;
+ case SDL_APP_LOWMEMORY:
+ /* You will get this when your app is paused and iOS wants more memory.
+ Release as much memory as possible.
+ */
+ return 0;
+ case SDL_APP_WILLENTERBACKGROUND:
+ /* Prepare your app to go into the background. Stop loops, etc.
+ This gets called when the user hits the home button, or gets a call.
+ */
+ return 0;
+ case SDL_APP_DIDENTERBACKGROUND:
+ /* This will get called if the user accepted whatever sent your app to the background.
+ If the user got a phone call and canceled it, you'll instead get an SDL_APP_DIDENTERFOREGROUND event and restart your loops.
+ When you get this, you have 5 seconds to save all your state or the app will be terminated.
+ Your app is NOT active at this point.
+ */
+ return 0;
+ case SDL_APP_WILLENTERFOREGROUND:
+ /* This call happens when your app is coming back to the foreground.
+ Restore all your state here.
+ */
+ return 0;
+ case SDL_APP_DIDENTERFOREGROUND:
+ /* Restart your loops here.
+ Your app is interactive and getting CPU again.
+ */
+ return 0;
+ default:
+ /* No special processing, add it to the event queue */
+ return 1;
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ SDL_SetEventFilter(HandleAppEvents, NULL);
+
+ ... run your main loop
+
+ return 0;
+}
+
+
+==============================================================================
+Notes -- Accelerometer as Joystick
+==============================================================================
+
+SDL for iPhone supports polling the built in accelerometer as a joystick device. For an example on how to do this, see the accelerometer.c in the demos directory.
+
+The main thing to note when using the accelerometer with SDL is that while the iPhone natively reports accelerometer as floating point values in units of g-force, SDL_JoystickGetAxis reports joystick values as signed integers. Hence, in order to convert between the two, some clamping and scaling is necessary on the part of the iPhone SDL joystick driver. To convert SDL_JoystickGetAxis reported values BACK to units of g-force, simply multiply the values by SDL_IPHONE_MAX_GFORCE / 0x7FFF.
+
+==============================================================================
+Notes -- OpenGL ES
+==============================================================================
+
+Your SDL application for iPhone uses OpenGL ES for video by default.
+
+OpenGL ES for iPhone supports several display pixel formats, such as RGBA8 and RGB565, which provide a 32 bit and 16 bit color buffer respectively. By default, the implementation uses RGB565, but you may use RGBA8 by setting each color component to 8 bits in SDL_GL_SetAttribute.
+
+If your application doesn't use OpenGL's depth buffer, you may find significant performance improvement by setting SDL_GL_DEPTH_SIZE to 0.
+
+Finally, if your application completely redraws the screen each frame, you may find significant performance improvement by setting the attribute SDL_GL_RETAINED_BACKING to 1.
+
+==============================================================================
+Notes -- Keyboard
+==============================================================================
+
+The SDL keyboard API has been extended to support on-screen keyboards:
+
+void SDL_StartTextInput()
+ -- enables text events and reveals the onscreen keyboard.
+void SDL_StopTextInput()
+ -- disables text events and hides the onscreen keyboard.
+SDL_bool SDL_IsTextInputActive()
+ -- returns whether or not text events are enabled (and the onscreen keyboard is visible)
+
+==============================================================================
+Notes -- Reading and Writing files
+==============================================================================
+
+Each application installed on iPhone resides in a sandbox which includes its own Application Home directory. Your application may not access files outside this directory.
+
+Once your application is installed its directory tree looks like:
+
+MySDLApp Home/
+ MySDLApp.app
+ Documents/
+ Library/
+ Preferences/
+ tmp/
+
+When your SDL based iPhone application starts up, it sets the working directory to the main bundle (MySDLApp Home/MySDLApp.app), where your application resources are stored. You cannot write to this directory. Instead, I advise you to write document files to "../Documents/" and preferences to "../Library/Preferences".
+
+More information on this subject is available here:
+http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/Introduction/Introduction.html
+
+==============================================================================
+Notes -- iPhone SDL limitations
+==============================================================================
+
+Windows:
+ Full-size, single window applications only. You cannot create multi-window SDL applications for iPhone OS. The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).
+
+Textures:
+ The optimal texture formats on iOS are SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, and SDL_PIXELFORMAT_RGB24 pixel formats.
+
+Loading Shared Objects:
+ This is disabled by default since it seems to break the terms of the iPhone SDK agreement. It can be re-enabled in SDL_config_iphoneos.h.
+
+==============================================================================
+Game Center
+==============================================================================
+
+Game Center integration requires that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using:
+
+int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+
+This will set up the given function to be called back on the animation callback, and then you have to return from main() to let the Cocoa event loop run.
+
+e.g.
+
+extern "C"
+void ShowFrame(void*)
+{
+ ... do event handling, frame logic and rendering
+}
+
+int main(int argc, char *argv[])
+{
+ ... initialize game ...
+
+#if __IPHONEOS__
+ // Initialize the Game Center for scoring and matchmaking
+ InitGameCenter();
+
+ // Set up the game to run in the window animation callback on iOS
+ // so that Game Center and so forth works correctly.
+ SDL_iPhoneSetAnimationCallback(window, 1, ShowFrame, NULL);
+#else
+ while ( running ) {
+ ShowFrame(0);
+ DelayFrame();
+ }
+#endif
+ return 0;
+}
diff --git a/README.MacOSX b/README-macosx.txt
similarity index 97%
rename from README.MacOSX
rename to README-macosx.txt
index 572a86b19..c5cc89b5b 100644
--- a/README.MacOSX
+++ b/README-macosx.txt
@@ -1,186 +1,186 @@
-==============================================================================
-Using the Simple DirectMedia Layer with Mac OS X
-==============================================================================
-
-These instructions are for people using Apple's Mac OS X (pronounced
-"ten").
-
-From the developer's point of view, OS X is a sort of hybrid Mac and
-Unix system, and you have the option of using either traditional
-command line tools or Apple's IDE Xcode.
-
-To build SDL using the command line, use the standard configure and make
-process:
-
- ./configure
- make
- sudo make install
-
-You can also build SDL as a Universal library (a single binary for both
-PowerPC and Intel architectures), on Mac OS X 10.4 and newer, by using
-the fatbuild.sh script in build-scripts:
- sh build-scripts/fatbuild.sh
- sudo build-scripts/fatbuild.sh install
-This script builds SDL with 10.2 ABI compatibility on PowerPC and 10.4
-ABI compatibility on Intel architectures. For best compatibility you
-should compile your application the same way. A script which wraps
-gcc to make this easy is provided in test/gcc-fat.sh
-
-To use the library once it's built, you essential have two possibilities:
-use the traditional autoconf/automake/make method, or use Xcode.
-
-==============================================================================
-Using the Simple DirectMedia Layer with a traditional Makefile
-==============================================================================
-
-An existing autoconf/automake build system for your SDL app has good chances
-to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary
-that you can distribute to users, you need to put the generated binary into a
-so called "bundle", which basically is a fancy folder with a name like
-"MyCoolGame.app".
-
-To get this build automatically, add something like the following rule to
-your Makefile.am:
-
-bundle_contents = APP_NAME.app/Contents
-APP_NAME_bundle: EXE_NAME
- mkdir -p $(bundle_contents)/MacOS
- mkdir -p $(bundle_contents)/Resources
- echo "APPL????" > $(bundle_contents)/PkgInfo
- $(INSTALL_PROGRAM) $< $(bundle_contents)/MacOS/
-
-You should replace EXE_NAME with the name of the executable. APP_NAME is what
-will be visible to the user in the Finder. Usually it will be the same
-as EXE_NAME but capitalized. E.g. if EXE_NAME is "testgame" then APP_NAME
-usually is "TestGame". You might also want to use @PACKAGE@ to use the package
-name as specified in your configure.in file.
-
-If your project builds more than one application, you will have to do a bit
-more. For each of your target applications, you need a separate rule.
-
-If you want the created bundles to be installed, you may want to add this
-rule to your Makefile.am:
-
-install-exec-hook: APP_NAME_bundle
- rm -rf $(DESTDIR)$(prefix)/Applications/APP_NAME.app
- mkdir -p $(DESTDIR)$(prefix)/Applications/
- cp -r $< /$(DESTDIR)$(prefix)Applications/
-
-This rule takes the Bundle created by the rule from step 3 and installs them
-into $(DESTDIR)$(prefix)/Applications/.
-
-Again, if you want to install multiple applications, you will have to augment
-the make rule accordingly.
-
-
-But beware! That is only part of the story! With the above, you end up with
-a bare bone .app bundle, which is double clickable from the Finder. But
-there are some more things you should do before shipping your product...
-
-1) The bundle right now probably is dynamically linked against SDL. That
- means that when you copy it to another computer, *it will not run*,
- unless you also install SDL on that other computer. A good solution
- for this dilemma is to static link against SDL. On OS X, you can
- achieve that by linking against the libraries listed by
- sdl-config --static-libs
- instead of those listed by
- sdl-config --libs
- Depending on how exactly SDL is integrated into your build systems, the
- way to achieve that varies, so I won't describe it here in detail
-2) Add an 'Info.plist' to your application. That is a special XML file which
- contains some meta-information about your application (like some copyright
- information, the version of your app, the name of an optional icon file,
- and other things). Part of that information is displayed by the Finder
- when you click on the .app, or if you look at the "Get Info" window.
- More information about Info.plist files can be found on Apple's homepage.
-
-
-As a final remark, let me add that I use some of the techniques (and some
-variations of them) in Exult and ScummVM; both are available in source on
-the net, so feel free to take a peek at them for inspiration!
-
-
-==============================================================================
-Using the Simple DirectMedia Layer with Xcode
-==============================================================================
-
-These instructions are for using Apple's Xcode IDE to build SDL applications.
-
-- First steps
-
-The first thing to do is to unpack the Xcode.tar.gz archive in the
-top level SDL directory (where the Xcode.tar.gz archive resides).
-Because Stuffit Expander will unpack the archive into a subdirectory,
-you should unpack the archive manually from the command line:
- cd [path_to_SDL_source]
- tar zxf Xcode.tar.gz
-This will create a new folder called Xcode, which you can browse
-normally from the Finder.
-
-- Building the Framework
-
-The SDL Library is packaged as a framework bundle, an organized
-relocatable folder hierarchy of executable code, interface headers,
-and additional resources. For practical purposes, you can think of a
-framework as a more user and system-friendly shared library, whose library
-file behaves more or less like a standard UNIX shared library.
-
-To build the framework, simply open the framework project and build it.
-By default, the framework bundle "SDL.framework" is installed in
-/Library/Frameworks. Therefore, the testers and project stationary expect
-it to be located there. However, it will function the same in any of the
-following locations:
-
- ~/Library/Frameworks
- /Local/Library/Frameworks
- /System/Library/Frameworks
-
-- Build Options
- There are two "Build Styles" (See the "Targets" tab) for SDL.
- "Deployment" should be used if you aren't tweaking the SDL library.
- "Development" should be used to debug SDL apps or the library itself.
-
-- Building the Testers
- Open the SDLTest project and build away!
-
-- Using the Project Stationary
- Copy the stationary to the indicated folders to access it from
- the "New Project" and "Add target" menus. What could be easier?
-
-- Setting up a new project by hand
- Some of you won't want to use the Stationary so I'll give some tips:
- * Create a new "Cocoa Application"
- * Add src/main/macosx/SDLMain.m , .h and .nib to your project
- * Remove "main.c" from your project
- * Remove "MainMenu.nib" from your project
- * Add "$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path
- * Add "$(HOME)/Library/Frameworks" to the frameworks search path
- * Add "-framework SDL -framework Foundation -framework AppKit" to "OTHER_LDFLAGS"
- * Set the "Main Nib File" under "Application Settings" to "SDLMain.nib"
- * Add your files
- * Clean and build
-
-- Building from command line
- Use pbxbuild in the same directory as your .pbproj file
-
-- Running your app
- You can send command line args to your app by either invoking it from
- the command line (in *.app/Contents/MacOS) or by entering them in the
- "Executables" panel of the target settings.
-
-- Implementation Notes
- Some things that may be of interest about how it all works...
- * Working directory
- As defined in the SDL_main.m file, the working directory of your SDL app
- is by default set to its parent. You may wish to change this to better
- suit your needs.
- * You have a Cocoa App!
- Your SDL app is essentially a Cocoa application. When your app
- starts up and the libraries finish loading, a Cocoa procedure is called,
- which sets up the working directory and calls your main() method.
- You are free to modify your Cocoa app with generally no consequence
- to SDL. You cannot, however, easily change the SDL window itself.
- Functionality may be added in the future to help this.
-
-
-Known bugs are listed in the file "BUGS"
+==============================================================================
+Using the Simple DirectMedia Layer with Mac OS X
+==============================================================================
+
+These instructions are for people using Apple's Mac OS X (pronounced
+"ten").
+
+From the developer's point of view, OS X is a sort of hybrid Mac and
+Unix system, and you have the option of using either traditional
+command line tools or Apple's IDE Xcode.
+
+To build SDL using the command line, use the standard configure and make
+process:
+
+ ./configure
+ make
+ sudo make install
+
+You can also build SDL as a Universal library (a single binary for both
+PowerPC and Intel architectures), on Mac OS X 10.4 and newer, by using
+the fatbuild.sh script in build-scripts:
+ sh build-scripts/fatbuild.sh
+ sudo build-scripts/fatbuild.sh install
+This script builds SDL with 10.2 ABI compatibility on PowerPC and 10.4
+ABI compatibility on Intel architectures. For best compatibility you
+should compile your application the same way. A script which wraps
+gcc to make this easy is provided in test/gcc-fat.sh
+
+To use the library once it's built, you essential have two possibilities:
+use the traditional autoconf/automake/make method, or use Xcode.
+
+==============================================================================
+Using the Simple DirectMedia Layer with a traditional Makefile
+==============================================================================
+
+An existing autoconf/automake build system for your SDL app has good chances
+to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary
+that you can distribute to users, you need to put the generated binary into a
+so called "bundle", which basically is a fancy folder with a name like
+"MyCoolGame.app".
+
+To get this build automatically, add something like the following rule to
+your Makefile.am:
+
+bundle_contents = APP_NAME.app/Contents
+APP_NAME_bundle: EXE_NAME
+ mkdir -p $(bundle_contents)/MacOS
+ mkdir -p $(bundle_contents)/Resources
+ echo "APPL????" > $(bundle_contents)/PkgInfo
+ $(INSTALL_PROGRAM) $< $(bundle_contents)/MacOS/
+
+You should replace EXE_NAME with the name of the executable. APP_NAME is what
+will be visible to the user in the Finder. Usually it will be the same
+as EXE_NAME but capitalized. E.g. if EXE_NAME is "testgame" then APP_NAME
+usually is "TestGame". You might also want to use @PACKAGE@ to use the package
+name as specified in your configure.in file.
+
+If your project builds more than one application, you will have to do a bit
+more. For each of your target applications, you need a separate rule.
+
+If you want the created bundles to be installed, you may want to add this
+rule to your Makefile.am:
+
+install-exec-hook: APP_NAME_bundle
+ rm -rf $(DESTDIR)$(prefix)/Applications/APP_NAME.app
+ mkdir -p $(DESTDIR)$(prefix)/Applications/
+ cp -r $< /$(DESTDIR)$(prefix)Applications/
+
+This rule takes the Bundle created by the rule from step 3 and installs them
+into $(DESTDIR)$(prefix)/Applications/.
+
+Again, if you want to install multiple applications, you will have to augment
+the make rule accordingly.
+
+
+But beware! That is only part of the story! With the above, you end up with
+a bare bone .app bundle, which is double clickable from the Finder. But
+there are some more things you should do before shipping your product...
+
+1) The bundle right now probably is dynamically linked against SDL. That
+ means that when you copy it to another computer, *it will not run*,
+ unless you also install SDL on that other computer. A good solution
+ for this dilemma is to static link against SDL. On OS X, you can
+ achieve that by linking against the libraries listed by
+ sdl-config --static-libs
+ instead of those listed by
+ sdl-config --libs
+ Depending on how exactly SDL is integrated into your build systems, the
+ way to achieve that varies, so I won't describe it here in detail
+2) Add an 'Info.plist' to your application. That is a special XML file which
+ contains some meta-information about your application (like some copyright
+ information, the version of your app, the name of an optional icon file,
+ and other things). Part of that information is displayed by the Finder
+ when you click on the .app, or if you look at the "Get Info" window.
+ More information about Info.plist files can be found on Apple's homepage.
+
+
+As a final remark, let me add that I use some of the techniques (and some
+variations of them) in Exult and ScummVM; both are available in source on
+the net, so feel free to take a peek at them for inspiration!
+
+
+==============================================================================
+Using the Simple DirectMedia Layer with Xcode
+==============================================================================
+
+These instructions are for using Apple's Xcode IDE to build SDL applications.
+
+- First steps
+
+The first thing to do is to unpack the Xcode.tar.gz archive in the
+top level SDL directory (where the Xcode.tar.gz archive resides).
+Because Stuffit Expander will unpack the archive into a subdirectory,
+you should unpack the archive manually from the command line:
+ cd [path_to_SDL_source]
+ tar zxf Xcode.tar.gz
+This will create a new folder called Xcode, which you can browse
+normally from the Finder.
+
+- Building the Framework
+
+The SDL Library is packaged as a framework bundle, an organized
+relocatable folder hierarchy of executable code, interface headers,
+and additional resources. For practical purposes, you can think of a
+framework as a more user and system-friendly shared library, whose library
+file behaves more or less like a standard UNIX shared library.
+
+To build the framework, simply open the framework project and build it.
+By default, the framework bundle "SDL.framework" is installed in
+/Library/Frameworks. Therefore, the testers and project stationary expect
+it to be located there. However, it will function the same in any of the
+following locations:
+
+ ~/Library/Frameworks
+ /Local/Library/Frameworks
+ /System/Library/Frameworks
+
+- Build Options
+ There are two "Build Styles" (See the "Targets" tab) for SDL.
+ "Deployment" should be used if you aren't tweaking the SDL library.
+ "Development" should be used to debug SDL apps or the library itself.
+
+- Building the Testers
+ Open the SDLTest project and build away!
+
+- Using the Project Stationary
+ Copy the stationary to the indicated folders to access it from
+ the "New Project" and "Add target" menus. What could be easier?
+
+- Setting up a new project by hand
+ Some of you won't want to use the Stationary so I'll give some tips:
+ * Create a new "Cocoa Application"
+ * Add src/main/macosx/SDLMain.m , .h and .nib to your project
+ * Remove "main.c" from your project
+ * Remove "MainMenu.nib" from your project
+ * Add "$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path
+ * Add "$(HOME)/Library/Frameworks" to the frameworks search path
+ * Add "-framework SDL -framework Foundation -framework AppKit" to "OTHER_LDFLAGS"
+ * Set the "Main Nib File" under "Application Settings" to "SDLMain.nib"
+ * Add your files
+ * Clean and build
+
+- Building from command line
+ Use pbxbuild in the same directory as your .pbproj file
+
+- Running your app
+ You can send command line args to your app by either invoking it from
+ the command line (in *.app/Contents/MacOS) or by entering them in the
+ "Executables" panel of the target settings.
+
+- Implementation Notes
+ Some things that may be of interest about how it all works...
+ * Working directory
+ As defined in the SDL_main.m file, the working directory of your SDL app
+ is by default set to its parent. You may wish to change this to better
+ suit your needs.
+ * You have a Cocoa App!
+ Your SDL app is essentially a Cocoa application. When your app
+ starts up and the libraries finish loading, a Cocoa procedure is called,
+ which sets up the working directory and calls your main() method.
+ You are free to modify your Cocoa app with generally no consequence
+ to SDL. You cannot, however, easily change the SDL window itself.
+ Functionality may be added in the future to help this.
+
+
+Known bugs are listed in the file "BUGS"
diff --git a/README.pandora b/README-pandora.txt
similarity index 97%
rename from README.pandora
rename to README-pandora.txt
index d522bc77a..f70ed6725 100644
--- a/README.pandora
+++ b/README-pandora.txt
@@ -1,16 +1,16 @@
-SDL 2.0 with open pandora console support ( http://openpandora.org/ )
-=====================================================================
-
-- A pandora specific video driver was written to allow SDL 2.0 with OpenGL ES
-support to work on the pandora under the framebuffer. This driver do not have
-input support for now, so if you use it you will have to add your own control code.
-The video driver name is "pandora" so if you have problem running it from
-the framebuffer, try to set the following variable before starting your application :
-"export SDL_VIDEODRIVER=pandora"
-
-- OpenGL ES support was added to the x11 driver, so it's working like the normal
-x11 driver one with OpenGLX support, with SDL input event's etc..
-
-
-David Carré (Cpasjuste)
-cpasjuste@gmail.com
+SDL 2.0 with open pandora console support ( http://openpandora.org/ )
+=====================================================================
+
+- A pandora specific video driver was written to allow SDL 2.0 with OpenGL ES
+support to work on the pandora under the framebuffer. This driver do not have
+input support for now, so if you use it you will have to add your own control code.
+The video driver name is "pandora" so if you have problem running it from
+the framebuffer, try to set the following variable before starting your application :
+"export SDL_VIDEODRIVER=pandora"
+
+- OpenGL ES support was added to the x11 driver, so it's working like the normal
+x11 driver one with OpenGLX support, with SDL input event's etc..
+
+
+David Carré (Cpasjuste)
+cpasjuste@gmail.com
diff --git a/README.Platforms b/README-platforms.txt
similarity index 90%
rename from README.Platforms
rename to README-platforms.txt
index 1e0e7a6aa..f30c45a8b 100644
--- a/README.Platforms
+++ b/README-platforms.txt
@@ -1,32 +1,30 @@
-
-This is a list of the platforms SDL supports, and who maintains them.
-
-Officially supported platforms
-==============================
-(code compiles, and thoroughly tested for release)
-==============================
-Windows XP
-Windows Vista
-Windows 7
-Mac OS X 10.4+
-Linux 2.6+
-iOS 3.1.3+
-Android 2.3.3+
-
-Unofficially supported platforms
-================================
-(code compiles, but not thoroughly tested)
-================================
-FreeBSD
-NetBSD
-OpenBSD
-Solaris
-
-Platforms supported by volunteers
-=================================
-Haiku - maintained by Axel Dörfler
-PSP - maintained by 527721088@qq.com
-Pandora - maintained by Scott Smith
-
-Platforms that need maintainers
-===============================
+
+This is a list of the platforms SDL supports, and who maintains them.
+
+Officially supported platforms
+==============================
+(code compiles, and thoroughly tested for release)
+==============================
+Windows XP/Vista/7/8
+Mac OS X 10.5+
+Linux 2.6+
+iOS 5.1.1+
+Android 2.3.3+
+
+Unofficially supported platforms
+================================
+(code compiles, but not thoroughly tested)
+================================
+FreeBSD
+NetBSD
+OpenBSD
+Solaris
+
+Platforms supported by volunteers
+=================================
+Haiku - maintained by Axel Dörfler
+PSP - maintained by 527721088@qq.com
+Pandora - maintained by Scott Smith
+
+Platforms that need maintainers
+===============================
diff --git a/README.Porting b/README-porting.txt
similarity index 96%
rename from README.Porting
rename to README-porting.txt
index f8540b600..bea194a4a 100644
--- a/README.Porting
+++ b/README-porting.txt
@@ -1,61 +1,61 @@
-
-* Porting To A New Platform
-
- The first thing you have to do when porting to a new platform, is look at
-include/SDL_platform.h and create an entry there for your operating system.
-The standard format is __PLATFORM__, where PLATFORM is the name of the OS.
-Ideally SDL_platform.h will be able to auto-detect the system it's building
-on based on C preprocessor symbols.
-
-There are two basic ways of building SDL at the moment:
-
-1. The "UNIX" way: ./configure; make; make install
-
- If you have a GNUish system, then you might try this. Edit configure.in,
- take a look at the large section labelled:
- "Set up the configuration based on the target platform!"
- Add a section for your platform, and then re-run autogen.sh and build!
-
-2. Using an IDE:
-
- If you're using an IDE or other non-configure build system, you'll probably
- want to create a custom SDL_config.h for your platform. Edit SDL_config.h,
- add a section for your platform, and create a custom SDL_config_{platform}.h,
- based on SDL_config.h.minimal and SDL_config.h.in
-
- Add the top level include directory to the header search path, and then add
- the following sources to the project:
- src/*.c
- src/atomic/*.c
- src/audio/*.c
- src/cpuinfo/*.c
- src/events/*.c
- src/file/*.c
- src/haptic/*.c
- src/joystick/*.c
- src/power/*.c
- src/render/*.c
- src/stdlib/*.c
- src/thread/*.c
- src/timer/*.c
- src/video/*.c
- src/audio/disk/*.c
- src/audio/dummy/*.c
- src/video/dummy/*.c
- src/haptic/dummy/*.c
- src/joystick/dummy/*.c
- src/main/dummy/*.c
- src/thread/generic/*.c
- src/timer/dummy/*.c
- src/loadso/dummy/*.c
-
-
-Once you have a working library without any drivers, you can go back to each
-of the major subsystems and start implementing drivers for your platform.
-
-If you have any questions, don't hesitate to ask on the SDL mailing list:
- http://www.libsdl.org/mailing-list.php
-
-Enjoy!
- Sam Lantinga (slouken@libsdl.org)
-
+
+* Porting To A New Platform
+
+ The first thing you have to do when porting to a new platform, is look at
+include/SDL_platform.h and create an entry there for your operating system.
+The standard format is __PLATFORM__, where PLATFORM is the name of the OS.
+Ideally SDL_platform.h will be able to auto-detect the system it's building
+on based on C preprocessor symbols.
+
+There are two basic ways of building SDL at the moment:
+
+1. The "UNIX" way: ./configure; make; make install
+
+ If you have a GNUish system, then you might try this. Edit configure.in,
+ take a look at the large section labelled:
+ "Set up the configuration based on the target platform!"
+ Add a section for your platform, and then re-run autogen.sh and build!
+
+2. Using an IDE:
+
+ If you're using an IDE or other non-configure build system, you'll probably
+ want to create a custom SDL_config.h for your platform. Edit SDL_config.h,
+ add a section for your platform, and create a custom SDL_config_{platform}.h,
+ based on SDL_config.h.minimal and SDL_config.h.in
+
+ Add the top level include directory to the header search path, and then add
+ the following sources to the project:
+ src/*.c
+ src/atomic/*.c
+ src/audio/*.c
+ src/cpuinfo/*.c
+ src/events/*.c
+ src/file/*.c
+ src/haptic/*.c
+ src/joystick/*.c
+ src/power/*.c
+ src/render/*.c
+ src/stdlib/*.c
+ src/thread/*.c
+ src/timer/*.c
+ src/video/*.c
+ src/audio/disk/*.c
+ src/audio/dummy/*.c
+ src/video/dummy/*.c
+ src/haptic/dummy/*.c
+ src/joystick/dummy/*.c
+ src/main/dummy/*.c
+ src/thread/generic/*.c
+ src/timer/dummy/*.c
+ src/loadso/dummy/*.c
+
+
+Once you have a working library without any drivers, you can go back to each
+of the major subsystems and start implementing drivers for your platform.
+
+If you have any questions, don't hesitate to ask on the SDL mailing list:
+ http://www.libsdl.org/mailing-list.php
+
+Enjoy!
+ Sam Lantinga (slouken@libsdl.org)
+
diff --git a/README.psp b/README-psp.txt
similarity index 89%
rename from README.psp
rename to README-psp.txt
index 469febb9a..e9e32ea5c 100644
--- a/README.psp
+++ b/README-psp.txt
@@ -1,17 +1,17 @@
-SDL port for the Sony PSP contributed by
- Captian Lex
-
-Credit to
- Marcus R.Brown,Jim Paris,Matthew H for the original SDL 1.2 for PSP
- Geecko for his PSP GU lib "Glib2d"
-
-Building
---------
-To build for the PSP, make sure psp-config is in the path and run:
- make -f Makefile.psp
-
-
-
-To Do
-------
-PSP Screen Keyboard
\ No newline at end of file
+SDL port for the Sony PSP contributed by
+ Captian Lex
+
+Credit to
+ Marcus R.Brown,Jim Paris,Matthew H for the original SDL 1.2 for PSP
+ Geecko for his PSP GU lib "Glib2d"
+
+Building
+--------
+To build for the PSP, make sure psp-config is in the path and run:
+ make -f Makefile.psp
+
+
+
+To Do
+------
+PSP Screen Keyboard
diff --git a/README.touch b/README-touch.txt
similarity index 93%
rename from README.touch
rename to README-touch.txt
index 9e688330f..07823c934 100644
--- a/README.touch
+++ b/README-touch.txt
@@ -1,84 +1,84 @@
-===========================================================================
-System Specific Notes
-===========================================================================
-Linux:
-The linux touch system is currently based off event streams, and proc/bus/devices. The active user must be given permissions to read /dev/input/TOUCHDEVICE, where TOUCHDEVICE is the event stream for your device. Currently only Wacom tablets are supported. If you have an unsupported tablet contact me at jim.tla+sdl_touch@gmail.com and I will help you get support for it.
-
-Mac:
-The Mac and iPhone APIs are pretty. If your touch device supports them then you'll be fine. If it doesn't, then there isn't much we can do.
-
-iPhone:
-Works out of box.
-
-Windows:
-Unfortunately there is no windows support as of yet. Support for Windows 7 is planned, but we currently have no way to test. If you have a Windows 7 WM_TOUCH supported device, and are willing to help test please contact me at jim.tla+sdl_touch@gmail.com
-
-===========================================================================
-Events
-===========================================================================
-SDL_FINGERDOWN:
-Sent when a finger (or stylus) is placed on a touch device.
-Fields:
-event.tfinger.touchId - the Id of the touch device.
-event.tfinger.fingerId - the Id of the finger which just went down.
-event.tfinger.x - the x coordinate of the touch (0..1)
-event.tfinger.y - the y coordinate of the touch (0..1)
-event.tfinger.pressure - the pressure of the touch (0..1)
-
-SDL_FINGERMOTION:
-Sent when a finger (or stylus) is moved on the touch device.
-Fields:
-Same as FINGERDOWN but with additional:
-event.tfinger.dx - change in x coordinate during this motion event.
-event.tfinger.dy - change in y coordinate during this motion event.
-
-SDL_FINGERUP:
-Sent when a finger (or stylus) is lifted from the touch device.
-Fields:
-Same as FINGERDOWN.
-
-
-===========================================================================
-Functions
-===========================================================================
-SDL provides the ability to access the underlying Finger structures.
-These structures should _never_ be modified.
-
-The following functions are included from SDL_touch.h
-
-To get a SDL_TouchID call SDL_GetTouchDevice(index).
-This returns a SDL_TouchID.
-IMPORTANT: If the touch has been removed, or there is no touch with the given ID, SDL_GetTouchID will return 0. Be sure to check for this!
-
-The number of touch devices can be queried with SDL_GetNumTouchDevices().
-
-A SDL_Touch may be used to get pointers to SDL_Finger.
-
-SDL_GetNumTouchFingers(touchID) may be used to get the number of fingers currently down on the device.
-
-The most common reason to access SDL_Finger is to query the fingers outside the event. In most cases accessing the fingers is using the event. This would be accomplished by code like the following:
-
- float x = event.tfinger.x;
- float y = event.tfinger.y;
-
-
-
-To get a SDL_Finger, call SDL_GetTouchFinger(touchID,index), where touchID is a SDL_TouchID, and index is the requested finger.
-This returns a SDL_Finger*, or NULL if the finger does not exist, or has been removed.
-A SDL_Finger is guaranteed to be persistent for the duration of a touch, but it will be de-allocated as soon as the finger is removed. This occurs when the SDL_FINGERUP event is _added_ to the event queue, and thus _before_ the FINGERUP event is polled.
-As a result, be very careful to check for NULL return values.
-
-A SDL_Finger has the following fields:
->x,y,pressure:
- The current coordinates of the touch.
->pressure:
- The pressure of the touch.
-
-===========================================================================
-Notes
-===========================================================================
-For a complete example see test/testgesture.c
-
-Please direct questions/comments to:
- jim.tla+sdl_touch@gmail.com
- (original author, API was changed since)
+===========================================================================
+System Specific Notes
+===========================================================================
+Linux:
+The linux touch system is currently based off event streams, and proc/bus/devices. The active user must be given permissions to read /dev/input/TOUCHDEVICE, where TOUCHDEVICE is the event stream for your device. Currently only Wacom tablets are supported. If you have an unsupported tablet contact me at jim.tla+sdl_touch@gmail.com and I will help you get support for it.
+
+Mac:
+The Mac and iPhone APIs are pretty. If your touch device supports them then you'll be fine. If it doesn't, then there isn't much we can do.
+
+iPhone:
+Works out of box.
+
+Windows:
+Unfortunately there is no windows support as of yet. Support for Windows 7 is planned, but we currently have no way to test. If you have a Windows 7 WM_TOUCH supported device, and are willing to help test please contact me at jim.tla+sdl_touch@gmail.com
+
+===========================================================================
+Events
+===========================================================================
+SDL_FINGERDOWN:
+Sent when a finger (or stylus) is placed on a touch device.
+Fields:
+event.tfinger.touchId - the Id of the touch device.
+event.tfinger.fingerId - the Id of the finger which just went down.
+event.tfinger.x - the x coordinate of the touch (0..1)
+event.tfinger.y - the y coordinate of the touch (0..1)
+event.tfinger.pressure - the pressure of the touch (0..1)
+
+SDL_FINGERMOTION:
+Sent when a finger (or stylus) is moved on the touch device.
+Fields:
+Same as SDL_FINGERDOWN but with additional:
+event.tfinger.dx - change in x coordinate during this motion event.
+event.tfinger.dy - change in y coordinate during this motion event.
+
+SDL_FINGERUP:
+Sent when a finger (or stylus) is lifted from the touch device.
+Fields:
+Same as SDL_FINGERDOWN.
+
+
+===========================================================================
+Functions
+===========================================================================
+SDL provides the ability to access the underlying Finger structures.
+These structures should _never_ be modified.
+
+The following functions are included from SDL_touch.h
+
+To get a SDL_TouchID call SDL_GetTouchDevice(index).
+This returns a SDL_TouchID.
+IMPORTANT: If the touch has been removed, or there is no touch with the given ID, SDL_GetTouchID will return 0. Be sure to check for this!
+
+The number of touch devices can be queried with SDL_GetNumTouchDevices().
+
+A SDL_TouchID may be used to get pointers to SDL_Finger.
+
+SDL_GetNumTouchFingers(touchID) may be used to get the number of fingers currently down on the device.
+
+The most common reason to access SDL_Finger is to query the fingers outside the event. In most cases accessing the fingers is using the event. This would be accomplished by code like the following:
+
+ float x = event.tfinger.x;
+ float y = event.tfinger.y;
+
+
+
+To get a SDL_Finger, call SDL_GetTouchFinger(touchID,index), where touchID is a SDL_TouchID, and index is the requested finger.
+This returns a SDL_Finger*, or NULL if the finger does not exist, or has been removed.
+A SDL_Finger is guaranteed to be persistent for the duration of a touch, but it will be de-allocated as soon as the finger is removed. This occurs when the SDL_FINGERUP event is _added_ to the event queue, and thus _before_ the SDL_FINGERUP event is polled.
+As a result, be very careful to check for NULL return values.
+
+A SDL_Finger has the following fields:
+>x,y,pressure:
+ The current coordinates of the touch.
+>pressure:
+ The pressure of the touch.
+
+===========================================================================
+Notes
+===========================================================================
+For a complete example see test/testgesture.c
+
+Please direct questions/comments to:
+ jim.tla+sdl_touch@gmail.com
+ (original author, API was changed since)
diff --git a/README.WinCE b/README-wince.txt
similarity index 95%
rename from README.WinCE
rename to README-wince.txt
index 8e316d35d..eaacc4982 100644
--- a/README.WinCE
+++ b/README-wince.txt
@@ -1,9 +1,9 @@
-
-Windows CE is no longer supported by SDL.
-
-We have left the CE support in SDL 1.2 for those that must have it, and we
-will accept patches that support more modern Windows Mobile platforms for
-SDL 2.0.
-
---ryan.
-
+
+Windows CE is no longer supported by SDL.
+
+We have left the CE support in SDL 1.2 for those that must have it, and we
+will accept patches that support more modern Windows Mobile platforms for
+SDL 2.0.
+
+--ryan.
+
diff --git a/README b/README.txt
similarity index 52%
rename from README
rename to README.txt
index 65a07551a..681f4a33c 100644
--- a/README
+++ b/README.txt
@@ -1,39 +1,38 @@
-
- Simple DirectMedia Layer
-
- (SDL)
-
- Version 2.0
-
----
-http://www.libsdl.org/
-
-This is the Simple DirectMedia Layer, a general API that provides low
-level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
-and 2D framebuffer across multiple platforms.
-
-The current version supports Windows, Mac OS X, Linux, FreeBSD,
-NetBSD, OpenBSD, BSD/OS, Solaris, iOS, and Android. The code contains
-support for other operating systems but those are not officially supported.
-
-SDL is written in C, but works with C++ natively, and has bindings to
-several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
-Go, Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
-Pike, Pliant, Python, Ruby, and Smalltalk.
-
-This library is distributed under the zlib license, which can be found
-in the file "COPYING".
-
-The best way to learn how to use SDL is to check out the header files in
-the "include" subdirectory and the programs in the "test" subdirectory.
-The header files and test programs are well commented and always up to date.
-More documentation and FAQs are available online at:
- http://wiki.libsdl.org/
-
-If you need help with the library, or just want to discuss SDL related
-issues, you can join the developers mailing list:
- http://www.libsdl.org/mailing-list.php
-
-Enjoy!
- Sam Lantinga (slouken@libsdl.org)
-
+
+ Simple DirectMedia Layer
+
+ (SDL)
+
+ Version 2.0
+
+---
+http://www.libsdl.org/
+
+Simple DirectMedia Layer is a cross-platform development library designed
+to provide low level access to audio, keyboard, mouse, joystick, and graphics
+hardware via OpenGL and Direct3D. It is used by video playback software,
+emulators, and popular games including Valve's award winning catalog
+and many Humble Bundle games.
+
+SDL officially supports Windows, Mac OS X, Linux, iOS, and Android.
+Support for other platforms may be found in the source code.
+
+SDL is written in C, works natively with C++, and there are bindings
+available for several other languages, including C# and Python.
+
+This library is distributed under the zlib license, which can be found
+in the file "COPYING.txt".
+
+The best way to learn how to use SDL is to check out the header files in
+the "include" subdirectory and the programs in the "test" subdirectory.
+The header files and test programs are well commented and always up to date.
+More documentation and FAQs are available online at:
+ http://wiki.libsdl.org/
+
+If you need help with the library, or just want to discuss SDL related
+issues, you can join the developers mailing list:
+ http://www.libsdl.org/mailing-list.php
+
+Enjoy!
+ Sam Lantinga (slouken@libsdl.org)
+
diff --git a/SDL2.spec.in b/SDL2.spec.in
index ad0d57f76..2a5c47924 100644
--- a/SDL2.spec.in
+++ b/SDL2.spec.in
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%{__defattr}
-%doc README-SDL.txt COPYING CREDITS BUGS
+%doc README-SDL.txt COPYING.txt CREDITS.txt BUGS.txt
%{_libdir}/lib*.%{__soext}.*
%files devel
diff --git a/TODO b/TODO.txt
similarity index 79%
rename from TODO
rename to TODO.txt
index 3db10b850..14c47d0eb 100644
--- a/TODO
+++ b/TODO.txt
@@ -1,18 +1,15 @@
-2.0 release checklist:
- * http://wiki.libsdl.org/moin.cgi/Roadmap
-
- * See why windows are being rearranged. Is the shield window not up?
- * Make sure you can create and show a fullscreen window in one step
- * Write automated test case for multi-draw APIs
- * Implement assertion code on iPhone
- * Add __WINDOWS__ in addition to __WIN32__
- * Write test for fullscreen gamma to check X11 colormap handling
-
- * Check 1.2 revisions:
- 3554 - Need to resolve semantics for locking keys on different platforms
- 4874 - Do we want screen rotation? At what level?
- 4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98
- 4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
- 4865 - See if this is still needed (mouse coordinate clamping)
- 4866 - See if this is still needed (blocking window repositioning)
-
+Future work roadmap:
+ * http://wiki.libsdl.org/moin.cgi/Roadmap
+
+ * See why windows are being rearranged. Is the shield window not up?
+ * Add __WINDOWS__ in addition to __WIN32__
+ * Write test for fullscreen gamma to check X11 colormap handling
+
+ * Check 1.2 revisions:
+ 3554 - Need to resolve semantics for locking keys on different platforms
+ 4874 - Do we want screen rotation? At what level?
+ 4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98
+ 4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
+ 4865 - See if this is still needed (mouse coordinate clamping)
+ 4866 - See if this is still needed (blocking window repositioning)
+
diff --git a/VisualC.html b/VisualC.html
index fdaeecd32..a25907bd9 100644
--- a/VisualC.html
+++ b/VisualC.html
@@ -4,25 +4,26 @@
- Using SDL with Microsoft Visual C++ 5,6 and 7
+ Using SDL with Microsoft Visual C++
- You can either use the precompiled libraries from
- the SDL Download web site , or you can build SDL yourself.
+ You can either use the precompiled libraries from the SDL Download web site , or you can build SDL yourself.
Building SDL
- Go into the VisualC directory and double-click on the VC++ file "SDL.dsw
" ("SDL.sln
") . This should open up the IDE.
+ Go into the VisualC directory and double-click on the Visual Studio solution for your version of Visual Studio, e.g. SDL_VS2008.sln
This should open up the IDE.
- You may be prompted at this point to upgrade the workspace, should you be using
- a more recent version of Visual C++. If so, allow the workspace to be upgraded.
+ There are different solution files for the various
+ versions of the IDE. Please use the appropiate version
+ 2008, 2010 or 2012; the 2010EE and 2012EE files
+ should be used with the "Express Edition" releases.
Build the .dll
and .lib
files.
@@ -31,32 +32,22 @@
This is done by right clicking on each project in turn (Projects are listed in
the Workspace panel in the FileView tab), and selecting "Build".
-
- If you get an error about SDL_config.h being missing, you should
- copy include/SDL_config.h.default to include/SDL_config.h and try again.
-
You may get a few warnings, but you should not get any errors. You do have to
- have at least the DirectX 5 SDK installed, however. The latest
- version of DirectX can be downloaded or purchased on a cheap CD (my
- recommendation) from Microsoft .
+ have at least the DirectX 9 SDK installed, however. The latest
+ version of DirectX can be downloaded from Microsoft .
Later, we will refer to the following .lib and .dll files that have just been
generated:
- SDL.dll
- SDL.lib
- SDLmain.lib
+ SDL2.dll
+ SDL2.lib
+ SDL2main.lib
- Search for these using the Windows Find (Windows-F) utility, if you don't
- already know where they should be. For those of you with a clue, look inside
- the Debug or Release directories of the subdirectories of the Project folder.
- (It might be easier to just use Windows Find if this sounds confusing. And
- don't worry about needing a clue; we all need visits from the clue fairy
- frequently.)
+ Search for these using the Windows Find (Windows-F) utility inside the VisualC directory.
Creating a Project with SDL
@@ -80,8 +71,8 @@
add the include and library directories to the list that VC7 keeps. Do this by
selecting Tools|Options|Projects|VC++ Directories and under the "Show
Directories For:" dropbox select "Include Files", and click the "New Directory
- Icon" and add the [SDLROOT]\include directory (ex. If you installed to
- c:\SDL-1.2.5\ add c:\SDL-1.2.5\include). Proceed to change the
+ Icon" and add the [SDLROOT]\include directory (e.g. If you installed to
+ c:\SDL\ add c:\SDL\include). Proceed to change the
dropbox selection to "Library Files" and add [SDLROOT]\lib.
@@ -96,15 +87,15 @@
Copy the following files into your Project directory:
Add the following files to your project (It is not necessary to copy them to
your project directory):
- SDL.lib
- SDLmain.lib
+ SDL2.lib
+ SDL2main.lib
(To add them to your project, right click on your project, and select "Add
@@ -114,7 +105,7 @@
desireable to add them to the linker options: Project|Properties|Linker|Command
Line and type the names of the libraries to link with in the "Additional
Options:" box. Note: This must be done for each build
- configuration (eg. Release,Debug).
+ configuration (e.g. Release,Debug).
SDL 101, First Day of Class
diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 8a6c37a2c..72eb2d4c9 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -53,7 +53,7 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WINDOWS"
- ExceptionHandling="2"
+ ExceptionHandling="0"
RuntimeLibrary="3"
BufferSecurityCheck="false"
WarningLevel="3"
@@ -136,13 +136,13 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WINDOWS"
- ExceptionHandling="2"
+ ExceptionHandling="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
CompileAs="0"
/>
-
-
-
-
@@ -1130,6 +1124,10 @@
RelativePath="..\..\src\thread\windows\SDL_systhread.c"
>
+
+
diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj
index 00c15332f..4fa9111d2 100644
--- a/VisualC/SDL/SDL_VS2010.vcxproj
+++ b/VisualC/SDL/SDL_VS2010.vcxproj
@@ -1,463 +1,464 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- SDL2
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- SDL
-
-
-
- DynamicLibrary
- false
-
-
- DynamicLibrary
- false
-
-
- DynamicLibrary
- false
-
-
- DynamicLibrary
- false
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
- _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
- false
-
-
- Level3
- true
- EditAndContinue
- Default
- false
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
- true
- true
- Windows
- false
- $(DXSDK_DIR)\lib\x86
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
-
-
- Disabled
- ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
- _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
- false
-
-
- Level3
- ProgramDatabase
- false
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
- true
- true
- Windows
- false
- $(DXSDK_DIR)\lib\x64
-
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- false
- ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
- NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- false
- true
-
-
- Level3
- true
- Default
- false
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
- true
- Windows
- $(DXSDK_DIR)\lib\x86
- true
- true
- true
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
-
-
- OnlyExplicitInline
- false
- ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
- NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- false
- true
-
-
- Level3
- false
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
- true
- Windows
- $(DXSDK_DIR)\lib\x64
- true
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ SDL2
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ SDL
+
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ false
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+ false
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
+ true
+ true
+ Windows
+ false
+ $(DXSDK_DIR)\lib\x86
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ X64
+
+
+ Disabled
+ ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ false
+
+
+ Level3
+ EditAndContinue
+ false
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
+ true
+ true
+ Windows
+ false
+ $(DXSDK_DIR)\lib\x64
+
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ OnlyExplicitInline
+ false
+ ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ false
+ true
+
+
+ Level3
+ true
+ Default
+ false
+ ProgramDatabase
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
+ true
+ Windows
+ $(DXSDK_DIR)\lib\x86
+ true
+ true
+ true
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ X64
+
+
+ OnlyExplicitInline
+ false
+ ..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ false
+ true
+
+
+ Level3
+ false
+ ProgramDatabase
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)
+ true
+ Windows
+ $(DXSDK_DIR)\lib\x64
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VisualC/SDL/SDL_VS2012.vcxproj b/VisualC/SDL/SDL_VS2012.vcxproj
index cdc427e66..213c10cef 100644
--- a/VisualC/SDL/SDL_VS2012.vcxproj
+++ b/VisualC/SDL/SDL_VS2012.vcxproj
@@ -19,7 +19,7 @@
- SDL
+ SDL2
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
SDL
@@ -127,7 +127,7 @@
Level3
- ProgramDatabase
+ EditAndContinue
false
@@ -166,6 +166,7 @@
true
Default
false
+ ProgramDatabase
NDEBUG;%(PreprocessorDefinitions)
@@ -201,6 +202,7 @@
Level3
false
+ ProgramDatabase
NDEBUG;%(PreprocessorDefinitions)
@@ -304,7 +306,6 @@
-
@@ -408,7 +409,6 @@
-
@@ -439,6 +439,7 @@
+
@@ -464,4 +465,4 @@
-
\ No newline at end of file
+
diff --git a/VisualC/SDL_VS2008.sln b/VisualC/SDL_VS2008.sln
index 91735bdab..3c6a38058 100644
--- a/VisualC/SDL_VS2008.sln
+++ b/VisualC/SDL_VS2008.sln
@@ -91,12 +91,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\t
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2008.vcproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_VS2008.vcproj", "{9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32
- Release_NoSTDIO|x64 = Release_NoSTDIO|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
@@ -105,9 +110,6 @@ Global
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
@@ -116,10 +118,6 @@ Global
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
@@ -127,117 +125,78 @@ Global
{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
{26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
{26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Debug|Win32.ActiveCfg = Debug|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Debug|Win32.Build.0 = Debug|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Debug|x64.ActiveCfg = Debug|Win32
- {31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release|Win32.ActiveCfg = Release|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release|Win32.Build.0 = Release|Win32
{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}.Release|x64.ActiveCfg = Release|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Debug|Win32.ActiveCfg = Debug|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Debug|Win32.Build.0 = Debug|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Debug|x64.ActiveCfg = Debug|Win32
- {79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release|Win32.ActiveCfg = Release|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release|Win32.Build.0 = Release|Win32
{79CEE57E-1BC3-4FF6-90B3-9E39763CDAFF}.Release|x64.ActiveCfg = Release|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Debug|Win32.ActiveCfg = Debug|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Debug|Win32.Build.0 = Debug|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Debug|x64.ActiveCfg = Debug|Win32
- {66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release|Win32.ActiveCfg = Release|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release|Win32.Build.0 = Release|Win32
{66B32F7E-5716-48D0-B5B9-D832FD052DD5}.Release|x64.ActiveCfg = Release|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Debug|Win32.ActiveCfg = Debug|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Debug|Win32.Build.0 = Debug|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Debug|x64.ActiveCfg = Debug|Win32
- {5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release|Win32.ActiveCfg = Release|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release|Win32.Build.0 = Release|Win32
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6}.Release|x64.ActiveCfg = Release|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Debug|Win32.ActiveCfg = Debug|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Debug|Win32.Build.0 = Debug|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Debug|x64.ActiveCfg = Debug|Win32
- {2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
- {2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
- {2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release|Win32.ActiveCfg = Release|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release|Win32.Build.0 = Release|Win32
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E}.Release|x64.ActiveCfg = Release|Win32
@@ -245,14 +204,16 @@ Global
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.Build.0 = Debug|Win32
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.ActiveCfg = Debug|x64
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.Build.0 = Debug|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.ActiveCfg = Release|Win32
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.Build.0 = Release|Win32
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.ActiveCfg = Release|x64
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.Build.0 = Release|x64
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Debug|Win32.Build.0 = Debug|Win32
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Debug|x64.ActiveCfg = Debug|Win32
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Release|Win32.ActiveCfg = Release|Win32
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Release|Win32.Build.0 = Release|Win32
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -271,5 +232,6 @@ Global
{66B32F7E-5716-48D0-B5B9-D832FD052DD5} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{5D0930C0-7C91-4ECE-9014-7B7DDE9502E6} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{2D17C1EB-1157-460E-9A99-A82BFC1F9D1E} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
EndGlobalSection
EndGlobal
diff --git a/VisualC/SDL_VS2010.sln b/VisualC/SDL_VS2010.sln
index 5b95292ab..fb5d873f2 100644
--- a/VisualC/SDL_VS2010.sln
+++ b/VisualC/SDL_VS2010.sln
@@ -29,6 +29,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2010.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2010.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2010.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testoverlay2", "tests\testoverlay2\testoverlay2_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08AAD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -141,20 +175,81 @@ Global
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{CAE4F1D0-314F-4B10-805B-0EFD670133A0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{8B5CFB38-CCBA-40A8-AD7A-89C57B070884} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{26828762-C95D-4637-9CB1-7F0979523813} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08336} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08996} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08BCC} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08AAD} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
EndGlobalSection
EndGlobal
diff --git a/VisualC/SDL_VS2010EE.sln b/VisualC/SDL_VS2010EE.sln
new file mode 100644
index 000000000..d5213da46
--- /dev/null
+++ b/VisualC/SDL_VS2010EE.sln
@@ -0,0 +1,219 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopwave", "tests\loopwave\loopwave_VS2010.vcxproj", "{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testplatform", "tests\testplatform\testplatform_VS2010.vcxproj", "{26932B24-EFC6-4E3A-B277-ED653DA37968}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "tests\testfile\testfile_VS2010.vcxproj", "{CAE4F1D0-314F-4B10-805B-0EFD670133A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "tests\testgl2\testgl2_VS2010.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "tests\checkkeys\checkkeys_VS2010.vcxproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2_VS2010.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshape\testshape_VS2010.vcxproj", "{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw2", "tests\testdraw2\testdraw2_VS2010.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpower", "tests\testpower\testpower_VS2010.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2010.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2010.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2010.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2010.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.Build.0 = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.Build.0 = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.Build.0 = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.Build.0 = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.Build.0 = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.Build.0 = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.Build.0 = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.Build.0 = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.Build.0 = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.Build.0 = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.Build.0 = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.Build.0 = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.Build.0 = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.Build.0 = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.ActiveCfg = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.Build.0 = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.ActiveCfg = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.Build.0 = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.Build.0 = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.Build.0 = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.Build.0 = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.Build.0 = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.Build.0 = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.Build.0 = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.Build.0 = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.ActiveCfg = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/VisualC/SDL_VS2012.sln b/VisualC/SDL_VS2012.sln
index f0e01b233..3ac7b68f2 100644
--- a/VisualC/SDL_VS2012.sln
+++ b/VisualC/SDL_VS2012.sln
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2012.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2012.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2012.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2012.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CE748C1F-3C21-4825-AA6A-F895A023F7E7}"
EndProject
@@ -64,7 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpower", "tests\testpowe
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLtest", "SDLtest\SDLtest_VS2012.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2012.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
ProjectSection(ProjectDependencies) = postProject
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
EndProjectSection
@@ -76,6 +76,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\tes
{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2012.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2012.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2012.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -178,6 +205,54 @@ Global
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.Build.0 = Debug|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.Build.0 = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -193,5 +268,11 @@ Global
{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08336} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08996} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08BCC} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
EndGlobalSection
EndGlobal
diff --git a/VisualC/SDL_VS2012EE.sln b/VisualC/SDL_VS2012EE.sln
new file mode 100644
index 000000000..456f69982
--- /dev/null
+++ b/VisualC/SDL_VS2012EE.sln
@@ -0,0 +1,258 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2012.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2012.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopwave", "tests\loopwave\loopwave_VS2012.vcxproj", "{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testplatform", "tests\testplatform\testplatform_VS2012.vcxproj", "{26932B24-EFC6-4E3A-B277-ED653DA37968}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "tests\testfile\testfile_VS2012.vcxproj", "{CAE4F1D0-314F-4B10-805B-0EFD670133A0}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "tests\testgl2\testgl2_VS2012.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "tests\checkkeys\checkkeys_VS2012.vcxproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2_VS2012.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshape\testshape_VS2012.vcxproj", "{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw2", "tests\testdraw2\testdraw2_VS2012.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpower", "tests\testpower\testpower_VS2012.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2012.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2012.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2012.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2012.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2012.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2012.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.Build.0 = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.Build.0 = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.Build.0 = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.Build.0 = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.Build.0 = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.Build.0 = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.Build.0 = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.Build.0 = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.ActiveCfg = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.ActiveCfg = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.Build.0 = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.Build.0 = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.Build.0 = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.Build.0 = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.Build.0 = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.ActiveCfg = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.Build.0 = Debug|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.Build.0 = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/VisualC/SDLmain/SDLmain_VS2008.vcproj b/VisualC/SDLmain/SDLmain_VS2008.vcproj
index 4e1c1e02c..9e43c5c3a 100644
--- a/VisualC/SDLmain/SDLmain_VS2008.vcproj
+++ b/VisualC/SDLmain/SDLmain_VS2008.vcproj
@@ -49,10 +49,12 @@
AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="1"
CompileAs="0"
/>
Level3
true
Default
+ false
+ OldStyle
true
@@ -106,6 +108,7 @@
Level3
true
Default
+ OldStyle
true
@@ -124,6 +127,7 @@
true
OldStyle
Default
+ false
true
diff --git a/VisualC/SDLmain/SDLmain_VS2012.vcxproj b/VisualC/SDLmain/SDLmain_VS2012.vcxproj
index d95409bca..d44ea95c1 100644
--- a/VisualC/SDLmain/SDLmain_VS2012.vcxproj
+++ b/VisualC/SDLmain/SDLmain_VS2012.vcxproj
@@ -1,162 +1,168 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- SDLmain
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
-
-
-
- StaticLibrary
- false
- v110
-
-
- StaticLibrary
- false
- v110
-
-
- StaticLibrary
- false
- MultiByte
- v110
-
-
- StaticLibrary
- false
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
-
-
-
-
- OnlyExplicitInline
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- true
-
-
-
-
- X64
-
-
- OnlyExplicitInline
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- true
-
-
-
-
-
- Disabled
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- OldStyle
- Default
-
-
- true
-
-
-
-
- X64
-
-
- Disabled
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- OldStyle
- Default
-
-
- true
-
-
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ SDL2main
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+
+
+
+ StaticLibrary
+ false
+ v110
+
+
+ StaticLibrary
+ false
+ v110
+
+
+ StaticLibrary
+ false
+ MultiByte
+ v110
+
+
+ StaticLibrary
+ false
+ v110
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+
+
+
+
+ OnlyExplicitInline
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+ OldStyle
+ false
+
+
+ true
+
+
+
+
+ X64
+
+
+ OnlyExplicitInline
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+ OldStyle
+ false
+
+
+ true
+
+
+
+
+
+ Disabled
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ OldStyle
+ Default
+ false
+
+
+ true
+
+
+
+
+ X64
+
+
+ Disabled
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ OldStyle
+ Default
+ false
+
+
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VisualC/SDLtest/SDLtest_VS2008.vcproj b/VisualC/SDLtest/SDLtest_VS2008.vcproj
index 99e55e983..4cd7e0003 100644
--- a/VisualC/SDLtest/SDLtest_VS2008.vcproj
+++ b/VisualC/SDLtest/SDLtest_VS2008.vcproj
@@ -49,10 +49,12 @@
AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="1"
CompileAs="0"
/>
Level3
true
Default
+ false
+ OldStyle
true
@@ -106,6 +108,7 @@
Level3
true
Default
+ OldStyle
true
@@ -124,6 +127,7 @@
true
OldStyle
Default
+ false
true
diff --git a/VisualC/SDLtest/SDLtest_VS2012.vcxproj b/VisualC/SDLtest/SDLtest_VS2012.vcxproj
index 762f2b5fe..a0d78c6b5 100644
--- a/VisualC/SDLtest/SDLtest_VS2012.vcxproj
+++ b/VisualC/SDLtest/SDLtest_VS2012.vcxproj
@@ -1,190 +1,196 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- SDLtest
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
-
-
-
- StaticLibrary
- false
- v110
-
-
- StaticLibrary
- false
- v110
-
-
- StaticLibrary
- false
- MultiByte
- v110
-
-
- StaticLibrary
- false
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
-
-
-
-
- OnlyExplicitInline
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- true
-
-
-
-
- X64
-
-
- OnlyExplicitInline
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- true
-
-
-
-
-
- Disabled
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- OldStyle
- Default
-
-
- true
-
-
-
-
- X64
-
-
- Disabled
- ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- OldStyle
- Default
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ SDL2test
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+
+
+
+ StaticLibrary
+ false
+ v110
+
+
+ StaticLibrary
+ false
+ v110
+
+
+ StaticLibrary
+ false
+ MultiByte
+ v110
+
+
+ StaticLibrary
+ false
+ v110
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+
+
+
+
+ OnlyExplicitInline
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+ OldStyle
+ false
+
+
+ true
+
+
+
+
+ X64
+
+
+ OnlyExplicitInline
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+ OldStyle
+ false
+
+
+ true
+
+
+
+
+
+ Disabled
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ OldStyle
+ Default
+ false
+
+
+ true
+
+
+
+
+ X64
+
+
+ Disabled
+ ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ OldStyle
+ Default
+ false
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VisualC/tests/automated/automated_VS2008.vcproj b/VisualC/tests/automated/automated_VS2008.vcproj
deleted file mode 100644
index 97eb4c71e..000000000
--- a/VisualC/tests/automated/automated_VS2008.vcproj
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/automated/automated_VS2010.vcxproj b/VisualC/tests/automated/automated_VS2010.vcxproj
deleted file mode 100644
index de7fa16fc..000000000
--- a/VisualC/tests/automated/automated_VS2010.vcxproj
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- automated
- {DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}
- automated
- Win32Proj
-
-
-
- Application
- Unicode
- true
-
-
- Application
- Unicode
- true
-
-
- Application
- Unicode
-
-
- Application
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
-
-
-
- Disabled
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
-
-
- true
- Windows
- MachineX86
-
-
-
-
- Disabled
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.d.." "$(TargetDir)\SDL2.d.."
-
-
- Copy SDL
-
-
-
-
- MaxSpeed
- true
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
- true
- true
- MachineX86
-
-
-
-
- MaxSpeed
- true
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/automated/automated_VS2012.vcxproj b/VisualC/tests/automated/automated_VS2012.vcxproj
deleted file mode 100644
index 5854da931..000000000
--- a/VisualC/tests/automated/automated_VS2012.vcxproj
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- automated
- {DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}
- automated
- Win32Proj
-
-
-
- Application
- Unicode
- true
- v110
-
-
- Application
- Unicode
- true
- v110
-
-
- Application
- Unicode
- v110
-
-
- Application
- MultiByte
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
-
-
-
- Disabled
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
-
-
- true
- Windows
- MachineX86
-
-
-
-
- Disabled
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
-
-
- Copy SDL
-
-
-
-
- MaxSpeed
- true
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
- true
- true
- MachineX86
-
-
-
-
- MaxSpeed
- true
- $(SolutionDir)..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- true
- Windows
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj b/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj
index 954e97eb5..10ac85e90 100644
--- a/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj
+++ b/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,7 +212,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -222,8 +222,8 @@
-
-
+
+
diff --git a/VisualC/tests/graywin/graywin_VS2008.vcproj b/VisualC/tests/graywin/graywin_VS2008.vcproj
deleted file mode 100644
index 97b4ccc2a..000000000
--- a/VisualC/tests/graywin/graywin_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/loopwave/loopwave_VS2012.vcxproj b/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
index 0919528a3..0a648593e 100644
--- a/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
+++ b/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,7 +212,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -222,8 +222,8 @@
-
-
+
+
diff --git a/VisualC/tests/testalpha/testalpha_VS2008.vcproj b/VisualC/tests/testalpha/testalpha_VS2008.vcproj
deleted file mode 100644
index af8314b1b..000000000
--- a/VisualC/tests/testalpha/testalpha_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testatomic/testatomic_VS2010.vcxproj b/VisualC/tests/testatomic/testatomic_VS2010.vcxproj
index bac44109f..3b7c7e100 100644
--- a/VisualC/tests/testatomic/testatomic_VS2010.vcxproj
+++ b/VisualC/tests/testatomic/testatomic_VS2010.vcxproj
@@ -1,22 +1,34 @@
-
+
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
testatomic
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}
testatomic
-
+
+ Application
+ false
+
+
Application
false
@@ -24,26 +36,45 @@
Application
false
-
+
+ Application
+ false
+ MultiByte
+
+
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- .\Debug\
- .\Debug\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
true
- .\Release\
- .\Release\
+ true
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
+ false
@@ -51,19 +82,14 @@
true
true
Win32
- .\Debug/testatomic.tlb
Disabled
..\..\..\include;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
+ MultiThreadedDebugDLL
- .\Debug/testatomic.pch
- .\Debug/
- .\Debug/
- .\Debug/
Level3
true
EditAndContinue
@@ -74,13 +100,50 @@
0x0409
- /MACHINE:I386 %(AdditionalOptions)
- .\Debug/testatomic.exe
true
true
- .\Debug/testatomic.pdb
Windows
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
@@ -88,7 +151,6 @@
true
true
Win32
- .\Release/testatomic.tlb
OnlyExplicitInline
@@ -99,10 +161,6 @@
true
- .\Release/testatomic.pch
- .\Release/
- .\Release/
- .\Release/
Level3
true
Default
@@ -112,23 +170,62 @@
0x0409
- /MACHINE:I386 %(AdditionalOptions)
- .\Release/testatomic.exe
true
- .\Release/testatomic.pdb
Windows
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
-
-
+
-
- .\Debug/testatomic.pch
-
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testalpha/testalpha_VS2010.vcxproj b/VisualC/tests/testatomic/testatomic_VS2012.vcxproj
similarity index 89%
rename from VisualC/tests/testalpha/testalpha_VS2010.vcxproj
rename to VisualC/tests/testatomic/testatomic_VS2012.vcxproj
index 2e348c00b..8e908f01b 100644
--- a/VisualC/tests/testalpha/testalpha_VS2010.vcxproj
+++ b/VisualC/tests/testatomic/testatomic_VS2012.vcxproj
@@ -19,27 +19,31 @@
- testalpha
- testalpha
- {7814D54B-65D3-4677-AD77-E0B980B4FA2D}
+ testatomic
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}
+ testatomic
Application
false
+ v110
Application
false
+ v110
Application
false
+ v110
Application
false
MultiByte
+ v110
@@ -105,11 +109,10 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- Copy SDL and data files
+ Copy SDL
@@ -140,11 +143,10 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- Copy SDL and data files
+ Copy SDL
@@ -176,11 +178,10 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- Copy SDL and data files
+ Copy SDL
@@ -211,21 +212,24 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- Copy SDL and data files
+ Copy SDL
-
-
+
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj b/VisualC/tests/testautomation/testautomation_VS2008.vcproj
old mode 100644
new mode 100755
similarity index 65%
rename from VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj
rename to VisualC/tests/testautomation/testautomation_VS2008.vcproj
index b71b54fc4..5b5ffa66f
--- a/VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj
+++ b/VisualC/tests/testautomation/testautomation_VS2008.vcproj
@@ -2,9 +2,9 @@
@@ -16,9 +16,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VisualC/tests/testautomation/testautomation_vs2010.vcxproj b/VisualC/tests/testautomation/testautomation_vs2010.vcxproj
index 66faf965a..3c4fe9d9f 100644
--- a/VisualC/tests/testautomation/testautomation_vs2010.vcxproj
+++ b/VisualC/tests/testautomation/testautomation_vs2010.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -179,19 +179,21 @@
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -210,4 +212,4 @@
-
\ No newline at end of file
+
diff --git a/VisualC/tests/testautomation/testautomation_vs2012.vcxproj b/VisualC/tests/testautomation/testautomation_vs2012.vcxproj
index 6927468f6..a026096bc 100644
--- a/VisualC/tests/testautomation/testautomation_vs2012.vcxproj
+++ b/VisualC/tests/testautomation/testautomation_vs2012.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -97,7 +97,7 @@
MachineX86
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -120,7 +120,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -147,7 +147,7 @@
MachineX86
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -173,7 +173,7 @@
true
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -183,27 +183,29 @@
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/VisualC/tests/testcursor/testcursor_VS2008.vcproj b/VisualC/tests/testcursor/testcursor_VS2008.vcproj
deleted file mode 100755
index 6f2c89733..000000000
--- a/VisualC/tests/testcursor/testcursor_VS2008.vcproj
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testcursor/testcursor_VS2010.vcxproj b/VisualC/tests/testcursor/testcursor_VS2010.vcxproj
deleted file mode 100755
index 9c3b45464..000000000
--- a/VisualC/tests/testcursor/testcursor_VS2010.vcxproj
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- testcursor
- testcursor
- {20839E82-6F23-429D-91D7-8A2601BC7EA8}
-
-
-
- Application
- false
-
-
- Application
- false
-
-
- Application
- false
-
-
- Application
- false
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDebugDLL
- Level3
- true
- EditAndContinue
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- true
- .\Debug/testcursor.bsc
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
- Level3
- true
- ProgramDatabase
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- true
- .\Debug/testcursor.bsc
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- Level3
- true
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- true
- .\Release/testcursor.bsc
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- Level3
- true
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- true
- .\Release/testcursor.bsc
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
-
-
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
-
-
-
-
diff --git a/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj b/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj
index c1003f21f..e95358feb 100644
--- a/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj
+++ b/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,7 +212,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -222,9 +222,9 @@
-
-
-
+
+
+
diff --git a/VisualC/tests/testfile/testfile_VS2012.vcxproj b/VisualC/tests/testfile/testfile_VS2012.vcxproj
index 9033fc77a..dc9f82827 100644
--- a/VisualC/tests/testfile/testfile_VS2012.vcxproj
+++ b/VisualC/tests/testfile/testfile_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,15 +212,15 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
-
-
+
+
diff --git a/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj b/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj
index 19049dc26..e2d7b6b05 100644
--- a/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj
+++ b/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj
@@ -105,7 +105,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -139,7 +139,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -174,7 +174,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -208,15 +208,15 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
-
-
+
+
diff --git a/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj b/VisualC/tests/testgamecontroller/testgamecontroller_VS2012.vcxproj
similarity index 93%
rename from VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj
rename to VisualC/tests/testgamecontroller/testgamecontroller_VS2012.vcxproj
index 574606b57..c832c5937 100644
--- a/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj
+++ b/VisualC/tests/testgamecontroller/testgamecontroller_VS2012.vcxproj
@@ -19,27 +19,31 @@
- testvidinfo
- testvidinfo
- {575FD095-EDAB-4BD4-B733-CD4A874F6FB0}
+ testgamecontroller
+ testgamecontroller
+ {55812185-D13C-4022-9C81-32E0F4A08336}
Application
false
+ v110
Application
false
MultiByte
+ v110
Application
false
+ v110
Application
false
+ v110
@@ -139,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL.dl"l
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -215,13 +219,13 @@
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testgamma/testgamma_VS2008.vcproj b/VisualC/tests/testgamma/testgamma_VS2008.vcproj
deleted file mode 100644
index c274acce5..000000000
--- a/VisualC/tests/testgamma/testgamma_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testgesture/testgesture_VS2010.vcxproj b/VisualC/tests/testgesture/testgesture_VS2010.vcxproj
index 4dc2be9ef..63adbf085 100644
--- a/VisualC/tests/testgesture/testgesture_VS2010.vcxproj
+++ b/VisualC/tests/testgesture/testgesture_VS2010.vcxproj
@@ -1,134 +1,227 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- testgesture
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}
- testgesture
-
-
-
- Application
- false
-
-
- Application
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\Debug\
- .\Debug\
- true
- .\Release\
- .\Release\
- false
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\Debug/testgesture.tlb
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDLL
-
-
- .\Debug/testgesture.pch
- .\Debug/
- .\Debug/
- .\Debug/
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- /MACHINE:I386 %(AdditionalOptions)
- .\Debug/testgesture.exe
- true
- true
- .\Debug/testgesture.pdb
- Windows
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\Release/testgesture.tlb
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- .\Release/testgesture.pch
- .\Release/
- .\Release/
- .\Release/
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- /MACHINE:I386 %(AdditionalOptions)
- .\Release/testgesture.exe
- true
- .\Release/testgesture.pdb
- Windows
-
-
-
-
-
-
-
-
- .\Debug/testgesture.pch
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ testgesture
+ testgesture
+ {55812185-D13C-4022-9C81-32E0F4A08996}
+
+
+
+ Application
+ false
+
+
+ Application
+ false
+ MultiByte
+
+
+ Application
+ false
+
+
+ Application
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ false
+ false
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ true
+ true
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VisualC/tests/testwm/testwm_VS2010.vcxproj b/VisualC/tests/testgesture/testgesture_VS2012.vcxproj
similarity index 94%
rename from VisualC/tests/testwm/testwm_VS2010.vcxproj
rename to VisualC/tests/testgesture/testgesture_VS2012.vcxproj
index b4d231650..ef7182011 100644
--- a/VisualC/tests/testwm/testwm_VS2010.vcxproj
+++ b/VisualC/tests/testgesture/testgesture_VS2012.vcxproj
@@ -19,39 +19,35 @@
- testwm
- testwm
- {6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}
+ testgesture
+ testgesture
+ {55812185-D13C-4022-9C81-32E0F4A08996}
-
- Application
- false
-
-
- Application
- false
-
Application
false
+ v110
Application
false
MultiByte
+ v110
+
+
+ Application
+ false
+ v110
+
+
+ Application
+ false
+ v110
-
-
-
-
-
-
-
-
@@ -60,91 +56,30 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
false
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ true
+ true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
NDEBUG;%(PreprocessorDefinitions)
@@ -214,14 +149,83 @@
Copy SDL
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testgl/testgl_VS2008.vcproj b/VisualC/tests/testgl/testgl_VS2008.vcproj
deleted file mode 100644
index 6d384a148..000000000
--- a/VisualC/tests/testgl/testgl_VS2008.vcproj
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testgl/testgl_VS2010.vcxproj b/VisualC/tests/testgl/testgl_VS2010.vcxproj
deleted file mode 100644
index 1665eb86e..000000000
--- a/VisualC/tests/testgl/testgl_VS2010.vcxproj
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- testgl
- testgl
- {272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}
-
-
-
- Application
- false
-
-
- Application
- false
-
-
- Application
- false
-
-
- Application
- false
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- opengl32.lib;%(AdditionalDependencies)
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- opengl32.lib;%(AdditionalDependencies)
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- opengl32.lib;%(AdditionalDependencies)
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- opengl32.lib;%(AdditionalDependencies)
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testgl2/testgl2_VS2012.vcxproj b/VisualC/tests/testgl2/testgl2_VS2012.vcxproj
index 4f4aa9552..d02101fe7 100644
--- a/VisualC/tests/testgl2/testgl2_VS2012.vcxproj
+++ b/VisualC/tests/testgl2/testgl2_VS2012.vcxproj
@@ -110,7 +110,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -145,7 +145,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -181,7 +181,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -216,7 +216,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -226,9 +226,9 @@
-
-
-
+
+
+
diff --git a/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj b/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj
index 56cff76c1..41c98e425 100644
--- a/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj
+++ b/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj
@@ -1,227 +1,227 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- testjoystick
- testjoystick
- {55812185-D13C-4022-9C81-32E0F4A08304}
-
-
-
- Application
- false
-
-
- Application
- false
- MultiByte
-
-
- Application
- false
-
-
- Application
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ testjoystick
+ testjoystick
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}
+
+
+
+ Application
+ false
+
+
+ Application
+ false
+ MultiByte
+
+
+ Application
+ false
+
+
+ Application
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ false
+ false
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ true
+ true
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VisualC/tests/graywin/graywin_VS2010.vcxproj b/VisualC/tests/testjoystick/testjoystick_VS2012.vcxproj
similarity index 93%
rename from VisualC/tests/graywin/graywin_VS2010.vcxproj
rename to VisualC/tests/testjoystick/testjoystick_VS2012.vcxproj
index 6688dc088..9730432dd 100644
--- a/VisualC/tests/graywin/graywin_VS2010.vcxproj
+++ b/VisualC/tests/testjoystick/testjoystick_VS2012.vcxproj
@@ -19,39 +19,35 @@
- graywin
- graywin
- {0BCCA0BF-073E-439E-BCE0-C9353C177487}
+ testjoystick
+ testjoystick
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}
-
- Application
- false
-
-
- Application
- false
-
Application
false
+ v110
Application
false
MultiByte
+ v110
+
+
+ Application
+ false
+ v110
+
+
+ Application
+ false
+ v110
-
-
-
-
-
-
-
-
@@ -60,91 +56,30 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
false
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ true
+ true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-
-
- Copy SDL
-
-
NDEBUG;%(PreprocessorDefinitions)
@@ -214,14 +149,83 @@
Copy SDL
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+
+
+ Copy SDL
+
+
-
+
+
-
-
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testoverlay/testoverlay_VS2008.vcproj b/VisualC/tests/testoverlay/testoverlay_VS2008.vcproj
deleted file mode 100644
index 7752c1f6e..000000000
--- a/VisualC/tests/testoverlay/testoverlay_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj b/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj
index 812c4ecc9..86a73edb9 100644
--- a/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj
+++ b/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj
@@ -21,7 +21,7 @@
testoverlay2
testoverlay2
- {B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}
@@ -105,7 +105,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
@@ -140,11 +140,11 @@ copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
- Copy SDL and data files
+ Copy SDL
@@ -176,7 +176,7 @@ copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
@@ -211,17 +211,16 @@ copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
Windows
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
Copy SDL and data files
-
-
+
+
@@ -229,4 +228,4 @@ copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testgamma/testgamma_VS2010.vcxproj b/VisualC/tests/testoverlay2/testoverlay2_VS2012.vcxproj
similarity index 90%
rename from VisualC/tests/testgamma/testgamma_VS2010.vcxproj
rename to VisualC/tests/testoverlay2/testoverlay2_VS2012.vcxproj
index db3c4e13c..d51d495e9 100644
--- a/VisualC/tests/testgamma/testgamma_VS2010.vcxproj
+++ b/VisualC/tests/testoverlay2/testoverlay2_VS2012.vcxproj
@@ -19,39 +19,35 @@
- testgamma
- testgamma
- {D974A0DF-3E2E-445C-A2EB-E899E9B582CB}
+ testoverlay2
+ testoverlay2
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}
-
- Application
- false
-
-
- Application
- false
-
Application
false
+ v110
Application
false
MultiByte
+ v110
+
+
+ Application
+ false
+ v110
+
+
+ Application
+ false
+ v110
-
-
-
-
-
-
-
-
@@ -60,93 +56,30 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
false
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ true
+ true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
NDEBUG;%(PreprocessorDefinitions)
@@ -177,10 +110,10 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
- Copy SDL and data files
+ Copy SDL
@@ -212,20 +145,91 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
- Copy SDL and data files
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
+
+
+ Copy SDL
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\moose.dat" "$(TargetDir)\moose.dat"
+
+
+ Copy SDL
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/VisualC/tests/testplatform/testplatform_VS2012.vcxproj b/VisualC/tests/testplatform/testplatform_VS2012.vcxproj
index d4f0475e9..8885fdf71 100644
--- a/VisualC/tests/testplatform/testplatform_VS2012.vcxproj
+++ b/VisualC/tests/testplatform/testplatform_VS2012.vcxproj
@@ -110,7 +110,7 @@
true
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -144,7 +144,7 @@
true
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -186,7 +186,7 @@
true
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -221,15 +221,15 @@
true
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
-
-
+
+
diff --git a/VisualC/tests/testpower/testpower_VS2012.vcxproj b/VisualC/tests/testpower/testpower_VS2012.vcxproj
index 3983a7bbb..60c8981c6 100644
--- a/VisualC/tests/testpower/testpower_VS2012.vcxproj
+++ b/VisualC/tests/testpower/testpower_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,15 +212,15 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
-
-
+
+
diff --git a/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj b/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj
index d7772e436..133366f5c 100644
--- a/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj
+++ b/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -20,10 +20,18 @@
testrendertarget
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}
testrendertarget
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}
+
+ Application
+ false
+
+
+ Application
+ false
+
Application
false
@@ -33,25 +41,9 @@
false
MultiByte
-
- Application
- false
-
-
- Application
- false
-
-
+
-
-
-
-
-
-
-
-
@@ -60,95 +52,30 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
true
true
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ false
+ false
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
_DEBUG;%(PreprocessorDefinitions)
@@ -180,7 +107,7 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -216,20 +143,99 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
-
-
-
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {da956fd3-e143-46f2-9fe5-c77bebc56b1a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
diff --git a/VisualC/tests/testwin/testwin_VS2010.vcxproj b/VisualC/tests/testrendertarget/testrendertarget_VS2012.vcxproj
similarity index 85%
rename from VisualC/tests/testwin/testwin_VS2010.vcxproj
rename to VisualC/tests/testrendertarget/testrendertarget_VS2012.vcxproj
index 679c322ea..b85c066c2 100644
--- a/VisualC/tests/testwin/testwin_VS2010.vcxproj
+++ b/VisualC/tests/testrendertarget/testrendertarget_VS2012.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -19,29 +19,32 @@
- testwin
- testwin
- {0FFD1A21-11DB-492C-A989-E4F195B0C441}
+ testrendertarget
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}
+ testrendertarget
-
+
Application
false
+ v110
Application
false
+ v110
Application
false
+ v110
Application
false
- MultiByte
+ v110
-
+
@@ -106,7 +109,8 @@
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -141,7 +145,8 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -177,7 +182,8 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -211,22 +217,29 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Windows
-
- copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll $(TargetDir)\SDL2.dll
- copy $(SolutionDir)\..\test\sample.bmp $(TargetDir)\sample.bmp
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
-
-
+
-
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {da956fd3-e143-46f2-9fe5-c77bebc56b1a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
-
+
diff --git a/VisualC/tests/testscale/testscale_VS2010.vcxproj b/VisualC/tests/testscale/testscale_VS2010.vcxproj
index 0c3d5c032..6753c1cd2 100644
--- a/VisualC/tests/testscale/testscale_VS2010.vcxproj
+++ b/VisualC/tests/testscale/testscale_VS2010.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -20,10 +20,18 @@
testscale
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}
testscale
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}
+
+ Application
+ false
+
+
+ Application
+ false
+
Application
false
@@ -33,25 +41,9 @@
false
MultiByte
-
- Application
- false
-
-
- Application
- false
-
-
+
-
-
-
-
-
-
-
-
@@ -60,95 +52,30 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
true
true
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ false
+ false
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
_DEBUG;%(PreprocessorDefinitions)
@@ -180,7 +107,7 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -216,20 +143,99 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ OnlyExplicitInline
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ true
+ Default
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
-
-
-
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {da956fd3-e143-46f2-9fe5-c77bebc56b1a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
diff --git a/VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj b/VisualC/tests/testscale/testscale_VS2012.vcxproj
similarity index 86%
rename from VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj
rename to VisualC/tests/testscale/testscale_VS2012.vcxproj
index 9c3d75be1..1419804b2 100644
--- a/VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj
+++ b/VisualC/tests/testscale/testscale_VS2012.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -19,39 +19,35 @@
- testoverlay
- testoverlay
- {9E320A14-B443-4DD7-8725-B7020DCFF730}
+ testscale
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}
+ testscale
+
+ Application
+ false
+ v110
+
+
+ Application
+ false
+ v110
+
Application
false
+ v110
Application
false
MultiByte
+ v110
-
- Application
- false
-
-
- Application
- false
-
-
+
-
-
-
-
-
-
-
-
@@ -60,29 +56,109 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
true
true
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+ false
+ false
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ EditAndContinue
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ true
+
+
+ Disabled
+ ..\..\..\include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+
+
+ Level3
+ true
+ ProgramDatabase
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ true
+ Windows
+
+
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+
+
+ Copy SDL and data files
+
+
NDEBUG;%(PreprocessorDefinitions)
true
true
Win32
- .\Release/testoverlay.tlb
OnlyExplicitInline
@@ -107,7 +183,8 @@
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
@@ -142,91 +219,28 @@ copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy $(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy" $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bm"p
+copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
+copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"
Copy SDL and data files
-
-
+
-
-
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {da956fd3-e143-46f2-9fe5-c77bebc56b1a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
-
+
diff --git a/VisualC/tests/testshape/testshape_VS2012.vcxproj b/VisualC/tests/testshape/testshape_VS2012.vcxproj
index 847dfa50a..b7c4e5e1c 100644
--- a/VisualC/tests/testshape/testshape_VS2012.vcxproj
+++ b/VisualC/tests/testshape/testshape_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -143,7 +143,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -178,7 +178,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
@@ -212,15 +212,15 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
Copy SDL
-
-
+
+
diff --git a/VisualC/tests/testsprite/testsprite_VS2008.vcproj b/VisualC/tests/testsprite/testsprite_VS2008.vcproj
deleted file mode 100644
index 256d7125e..000000000
--- a/VisualC/tests/testsprite/testsprite_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testsprite/testsprite_VS2010.vcxproj b/VisualC/tests/testsprite/testsprite_VS2010.vcxproj
deleted file mode 100644
index c1459bfc0..000000000
--- a/VisualC/tests/testsprite/testsprite_VS2010.vcxproj
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- testsprite
- testsprite
- {5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}
-
-
-
- Application
- false
-
-
- Application
- false
- MultiByte
-
-
- Application
- false
-
-
- Application
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- false
- false
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- true
- true
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- OnlyExplicitInline
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
-
-
- Level3
- true
- Default
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- EditAndContinue
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
-copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
-
-
- Disabled
- ..\..\..\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
-
-
- Level3
- true
- ProgramDatabase
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- Windows
-
-
-
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
- copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
- Copy SDL and data files
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj b/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj
index a633da983..c2ac6e0e3 100644
--- a/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj
+++ b/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj
@@ -109,7 +109,7 @@
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
@@ -144,7 +144,7 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
@@ -180,7 +180,7 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
@@ -215,7 +215,7 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
Windows
- copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
+ copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
@@ -226,9 +226,9 @@ copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
-
-
-
+
+
+
diff --git a/VisualC/tests/testwin/testwin_VS2008.vcproj b/VisualC/tests/testwin/testwin_VS2008.vcproj
deleted file mode 100644
index d1e760685..000000000
--- a/VisualC/tests/testwin/testwin_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/VisualC/tests/testwm/testwm_VS2008.vcproj b/VisualC/tests/testwm/testwm_VS2008.vcproj
deleted file mode 100644
index de3c6034a..000000000
--- a/VisualC/tests/testwm/testwm_VS2008.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WhatsNew b/WhatsNew.txt
similarity index 95%
rename from WhatsNew
rename to WhatsNew.txt
index a54ab0abb..c3784deab 100644
--- a/WhatsNew
+++ b/WhatsNew.txt
@@ -1,3 +1,3 @@
-
-This is a list of API changes in SDL's version history.
-
+
+This is a list of API changes in SDL's version history.
+
diff --git a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
index 29ebd4dde..e3eaecdae 100755
--- a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
@@ -154,13 +154,6 @@
remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
remoteInfo = libSDL;
};
- 04AB757011E563D200BE9753 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 006E982211955059001DE610;
- remoteInfo = testsdl;
- };
FD1B489D0E313154007AB34E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
@@ -374,7 +367,6 @@
isa = PBXGroup;
children = (
FD1B489E0E313154007AB34E /* libSDL2.a */,
- 04AB757111E563D200BE9753 /* testsdl.app */,
);
name = Products;
sourceTree = "";
@@ -597,13 +589,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 04AB757111E563D200BE9753 /* testsdl.app */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = testsdl.app;
- remoteRef = 04AB757011E563D200BE9753 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
FD1B489E0E313154007AB34E /* libSDL2.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
diff --git a/Xcode-iOS/Demos/Info.plist b/Xcode-iOS/Demos/Info.plist
index c0f1179d3..0398f008b 100644
--- a/Xcode-iOS/Demos/Info.plist
+++ b/Xcode-iOS/Demos/Info.plist
@@ -24,5 +24,7 @@
1.0
NSMainNibFile
+ UISupportedInterfaceOrientations
+
diff --git a/Xcode-iOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index 339febc11..115de627f 100644
--- a/Xcode-iOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
@@ -1,7 +1,7 @@
/*
- * accelerometer.c
- * written by Holmes Futrell
- * use however you want
+ * accelerometer.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -13,7 +13,7 @@
#define FRICTION 0.0008f /* coefficient of acceleration that opposes direction of motion */
#define GRAVITY_CONSTANT 0.004f /* how sensitive the ship is to the accelerometer */
-/* If we aren't on an iPhone, then this definition ought to yield reasonable behavior */
+/* If we aren't on an iPhone, then this definition ought to yield reasonable behavior */
#ifndef SDL_IPHONE_MAX_GFORCE
#define SDL_IPHONE_MAX_GFORCE 5.0f
#endif
@@ -48,7 +48,7 @@ render(SDL_Renderer *renderer)
#define SINT16_MAX ((float)(0x7FFF))
/* update velocity from accelerometer
- the factor SDL_IPHONE_MAX_G_FORCE / SINT16_MAX converts between
+ the factor SDL_IPHONE_MAX_G_FORCE / SINT16_MAX converts between
SDL's units reported from the joytick, and units of g-force, as reported by the accelerometer
*/
shipData.vx +=
@@ -159,7 +159,7 @@ main(int argc, char *argv[])
{
SDL_Window *window; /* main window */
- SDL_Renderer *renderer;
+ SDL_Renderer *renderer;
Uint32 startFrame; /* time frame began to process */
Uint32 endFrame; /* time frame ended processing */
Uint32 delay; /* time to pause waiting to draw next frame */
@@ -172,7 +172,7 @@ main(int argc, char *argv[])
/* create main window and renderer */
window = SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN |
+ SDL_WINDOW_OPENGL |
SDL_WINDOW_BORDERLESS);
renderer = SDL_CreateRenderer(window, 0, 0);
diff --git a/Xcode-iOS/Demos/src/common.c b/Xcode-iOS/Demos/src/common.c
index fd3a176db..b2d963456 100644
--- a/Xcode-iOS/Demos/src/common.c
+++ b/Xcode-iOS/Demos/src/common.c
@@ -1,7 +1,7 @@
/*
- * common.c
- * written by Holmes Futrell
- * use however you want
+ * common.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "common.h"
@@ -9,8 +9,8 @@
#include
/*
- Produces a random int x, min <= x <= max
- following a uniform distribution
+ Produces a random int x, min <= x <= max
+ following a uniform distribution
*/
int
randomInt(int min, int max)
@@ -19,8 +19,8 @@ randomInt(int min, int max)
}
/*
- Produces a random float x, min <= x <= max
- following a uniform distribution
+ Produces a random float x, min <= x <= max
+ following a uniform distribution
*/
float
randomFloat(float min, float max)
diff --git a/Xcode-iOS/Demos/src/common.h b/Xcode-iOS/Demos/src/common.h
index 9aa01a23e..3e0d94ecf 100644
--- a/Xcode-iOS/Demos/src/common.h
+++ b/Xcode-iOS/Demos/src/common.h
@@ -1,7 +1,7 @@
/*
- * common.h
- * written by Holmes Futrell
- * use however you want
+ * common.h
+ * written by Holmes Futrell
+ * use however you want
*/
#define SCREEN_WIDTH 320
diff --git a/Xcode-iOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index fa39abff5..b2a4d095d 100644
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -1,7 +1,7 @@
/*
- * fireworks.c
- * written by Holmes Futrell
- * use however you want
+ * fireworks.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -17,11 +17,11 @@
static GLuint particleTextureID; /* OpenGL particle texture id */
static SDL_bool pointSizeExtensionSupported; /* is GL_OES_point_size_array supported ? */
-/*
- used to describe what type of particle a given struct particle is.
- emitter - this particle flies up, shooting off trail particles, then finally explodes into dust particles.
- trail - shoots off, following emitter particle
- dust - radiates outwards from emitter explosion
+/*
+ used to describe what type of particle a given struct particle is.
+ emitter - this particle flies up, shooting off trail particles, then finally explodes into dust particles.
+ trail - shoots off, following emitter particle
+ dust - radiates outwards from emitter explosion
*/
enum particleType
{
@@ -30,7 +30,7 @@ enum particleType
dust
};
/*
- struct particle is used to describe each particle displayed on screen
+ struct particle is used to describe each particle displayed on screen
*/
struct particle
{
@@ -57,8 +57,8 @@ int nextPowerOfTwo(int x);
void drawParticles();
void stepParticles(void);
-/* helper function (used in texture loading)
- returns next power of two greater than or equal to x
+/* helper function (used in texture loading)
+ returns next power of two greater than or equal to x
*/
int
nextPowerOfTwo(int x)
@@ -70,8 +70,8 @@ nextPowerOfTwo(int x)
return val;
}
-/*
- steps each active particle by timestep MILLESECONDS_PER_FRAME
+/*
+ steps each active particle by timestep MILLESECONDS_PER_FRAME
*/
void
stepParticles(void)
@@ -145,13 +145,13 @@ stepParticles(void)
curr++;
}
/* the number of active particles is computed as the difference between
- old number of active particles, where slot points, and the
+ old number of active particles, where slot points, and the
new size of the array, where particles points */
num_active_particles = slot - particles;
}
/*
- This draws all the particles shown on screen
+ This draws all the particles shown on screen
*/
void
drawParticles()
@@ -177,7 +177,7 @@ drawParticles()
}
/*
- This causes an emitter to explode in a circular bloom of dust particles
+ This causes an emitter to explode in a circular bloom of dust particles
*/
void
explodeEmitter(struct particle *emitter)
@@ -219,7 +219,7 @@ explodeEmitter(struct particle *emitter)
}
/*
- This spawns a trail particle from an emitter
+ This spawns a trail particle from an emitter
*/
void
spawnTrailFromEmitter(struct particle *emitter)
@@ -254,7 +254,7 @@ spawnTrailFromEmitter(struct particle *emitter)
}
/*
- spawns a new emitter particle at the bottom of the screen
+ spawns a new emitter particle at the bottom of the screen
destined for the point (x,y).
*/
void
@@ -313,7 +313,7 @@ initializeParticles(void)
}
/*
- loads the particle texture
+ loads the particle texture
*/
void
initializeTexture()
@@ -375,7 +375,7 @@ main(int argc, char *argv[])
}
/* seed the random number generator */
srand(time(NULL));
- /*
+ /*
request some OpenGL parameters
that may speed drawing
*/
@@ -389,7 +389,7 @@ main(int argc, char *argv[])
/* create main window and renderer */
window = SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN |
+ SDL_WINDOW_OPENGL |
SDL_WINDOW_BORDERLESS);
context = SDL_GL_CreateContext(window);
diff --git a/Xcode-iOS/Demos/src/happy.c b/Xcode-iOS/Demos/src/happy.c
index c1731b879..ce661d958 100644
--- a/Xcode-iOS/Demos/src/happy.c
+++ b/Xcode-iOS/Demos/src/happy.c
@@ -1,7 +1,7 @@
/*
- * happy.c
- * written by Holmes Futrell
- * use however you want
+ * happy.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -20,8 +20,8 @@ static struct
} faces[NUM_HAPPY_FACES];
/*
- Sets initial positions and velocities of happyfaces
- units of velocity are pixels per millesecond
+ Sets initial positions and velocities of happyfaces
+ units of velocity are pixels per millesecond
*/
void
initializeHappyFaces()
@@ -94,7 +94,7 @@ render(SDL_Renderer *renderer)
}
/*
- loads the happyface graphic into a texture
+ loads the happyface graphic into a texture
*/
void
initializeTexture(SDL_Renderer *renderer)
@@ -125,7 +125,7 @@ main(int argc, char *argv[])
{
SDL_Window *window;
- SDL_Renderer *renderer;
+ SDL_Renderer *renderer;
Uint32 startFrame;
Uint32 endFrame;
Uint32 delay;
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
fatalError("Could not initialize SDL");
}
window = SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN |
+ SDL_WINDOW_OPENGL |
SDL_WINDOW_BORDERLESS);
renderer = SDL_CreateRenderer(window, -1, 0);
diff --git a/Xcode-iOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index 3e2bc5459..fd903ff86 100644
--- a/Xcode-iOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
@@ -1,7 +1,7 @@
/*
- * keyboard.c
- * written by Holmes Futrell
- * use however you want
+ * keyboard.c
+ * written by Holmes Futrell
+ * use however you want
*/
#import "SDL.h"
@@ -97,14 +97,14 @@ fontMapping map[TABLE_SIZE] = {
};
/*
- This function maps an SDL_KeySym to an index in the bitmap font.
- It does so by scanning through the font mapping table one entry
- at a time.
-
- If a match is found (scancode and allowed modifiers), the proper
- index is returned.
-
- If there is no entry for the key, -1 is returned
+ This function maps an SDL_KeySym to an index in the bitmap font.
+ It does so by scanning through the font mapping table one entry
+ at a time.
+
+ If a match is found (scancode and allowed modifiers), the proper
+ index is returned.
+
+ If there is no entry for the key, -1 is returned
*/
int
keyToIndex(SDL_Keysym key)
@@ -125,8 +125,8 @@ keyToIndex(SDL_Keysym key)
return index;
}
-/*
- This function returns and x,y position for a given character number.
+/*
+ This function returns and x,y position for a given character number.
It is used for positioning each character of text
*/
void
@@ -168,8 +168,7 @@ void
drawBlank(int x, int y)
{
SDL_Rect rect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
- SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b,
- bg_color.unused);
+ SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
SDL_RenderFillRect(renderer, &rect);
}
@@ -248,8 +247,7 @@ main(int argc, char *argv[])
loadFont();
/* draw the background, we'll just paint over it */
- SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b,
- bg_color.unused);
+ SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
SDL_RenderFillRect(renderer, NULL);
SDL_RenderPresent(renderer);
diff --git a/Xcode-iOS/Demos/src/mixer.c b/Xcode-iOS/Demos/src/mixer.c
index 893361f9a..bd0cfb1df 100644
--- a/Xcode-iOS/Demos/src/mixer.c
+++ b/Xcode-iOS/Demos/src/mixer.c
@@ -1,7 +1,7 @@
/*
- * mixer.c
- * written by Holmes Futrell
- * use however you want
+ * mixer.c
+ * written by Holmes Futrell
+ * use however you want
*/
#import "SDL.h"
@@ -100,7 +100,7 @@ loadSound(const char *file, struct sound *s)
if (result == -1) {
fatalError("could not build audio CVT");
} else if (result != 0) {
- /*
+ /*
this happens when the .wav format differs from the output format.
we convert the .wav buffer here
*/
@@ -171,7 +171,7 @@ render(SDL_Renderer *renderer)
for (i = 0; i < NUM_DRUMS; i++) {
SDL_Color color =
buttons[i].isPressed ? buttons[i].downColor : buttons[i].upColor;
- SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, color.unused);
+ SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, color.a);
SDL_RenderFillRect(renderer, &buttons[i].rect);
}
/* update the screen */
@@ -179,8 +179,8 @@ render(SDL_Renderer *renderer)
}
/*
- finds a sound channel in the mixer for a sound
- and sets it up to start playing
+ finds a sound channel in the mixer for a sound
+ and sets it up to start playing
*/
int
playSound(struct sound *s)
@@ -225,9 +225,9 @@ playSound(struct sound *s)
return selected_channel;
}
-/*
- Called from SDL's audio system. Supplies sound input with data by mixing together all
- currently playing sound effects.
+/*
+ Called from SDL's audio system. Supplies sound input with data by mixing together all
+ currently playing sound effects.
*/
void
audioCallback(void *userdata, Uint8 * stream, int len)
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
int done; /* has user tried to quit ? */
SDL_Window *window; /* main window */
- SDL_Renderer *renderer;
+ SDL_Renderer *renderer;
SDL_Event event;
Uint32 startFrame; /* holds when frame started processing */
Uint32 endFrame; /* holds when frame ended processing */
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 4dcb32035..035e4f982 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -1,7 +1,7 @@
/*
- * rectangles.c
- * written by Holmes Futrell
- * use however you want
+ * rectangles.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -37,50 +37,45 @@ render(SDL_Renderer *renderer)
int
main(int argc, char *argv[])
{
-
- SDL_Window *window;
- SDL_Renderer *renderer;
- int done;
- SDL_Event event;
-
- /* initialize SDL */
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fatalError("Could not initialize SDL");
+ if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO*/) < 0)
+ {
+ printf("Unable to initialize SDL");
}
-
- /* seed random number generator */
- srand(time(NULL));
-
- /* create window and renderer */
- window =
- SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_SHOWN);
- if (window == 0) {
- fatalError("Could not initialize Window");
- }
- renderer = SDL_CreateRenderer(window, -1, 0);
- if (!renderer) {
- fatalError("Could not create renderer");
- }
-
- /* Fill screen with black */
- SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
- SDL_RenderClear(renderer);
-
- /* Enter render loop, waiting for user to quit */
- done = 0;
- while (!done) {
- while (SDL_PollEvent(&event)) {
- if (event.type == SDL_QUIT) {
- done = 1;
- }
+
+ SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+ int landscape = 1;
+ int modes = SDL_GetNumDisplayModes(0);
+ int sx = 0, sy = 0;
+ for (int i = 0; i < modes; i++)
+ {
+ SDL_DisplayMode mode;
+ SDL_GetDisplayMode(0, i, &mode);
+ if (landscape ? mode.w > sx : mode.h > sy)
+ {
+ sx = mode.w;
+ sy = mode.h;
}
- render(renderer);
- SDL_Delay(1);
}
-
- /* shutdown SDL */
- SDL_Quit();
+
+ printf("picked: %d %d\n", sx, sy);
+
+ SDL_Window *_sdl_window = NULL;
+ SDL_GLContext _sdl_context = NULL;
+
+ _sdl_window = SDL_CreateWindow("fred",
+ 0, 0,
+ sx, sy,
+ SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
+
+ SDL_SetHint("SDL_HINT_ORIENTATIONS", "LandscapeLeft LandscapeRight");
+
+ int ax = 0, ay = 0;
+ SDL_GetWindowSize(_sdl_window, &ax, &ay);
+
+ printf("given: %d %d\n", ax, ay);
return 0;
}
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index 8ce8006a0..e811967b1 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -1,7 +1,7 @@
/*
- * touch.c
- * written by Holmes Futrell
- * use however you want
+ * touch.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -14,8 +14,8 @@
static SDL_Texture *brush = 0; /* texture for the brush */
/*
- draws a line from (startx, starty) to (startx + dx, starty + dy)
- this is accomplished by drawing several blots spaced PIXELS_PER_ITERATION apart
+ draws a line from (startx, starty) to (startx + dx, starty + dy)
+ this is accomplished by drawing several blots spaced PIXELS_PER_ITERATION apart
*/
void
drawLine(SDL_Renderer *renderer, float startx, float starty, float dx, float dy)
@@ -48,7 +48,7 @@ drawLine(SDL_Renderer *renderer, float startx, float starty, float dx, float dy)
}
/*
- loads the brush texture
+ loads the brush texture
*/
void
initializeTexture(SDL_Renderer *renderer)
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
Uint8 state; /* mouse (touch) state */
SDL_Event event;
SDL_Window *window; /* main window */
- SDL_Renderer *renderer;
+ SDL_Renderer *renderer;
int done; /* does user want to quit? */
/* initialize SDL */
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
/* create main window and renderer */
window = SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN |
+ SDL_WINDOW_OPENGL |
SDL_WINDOW_BORDERLESS);
renderer = SDL_CreateRenderer(window, 0, 0);
diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 5fcc8c932..4d349d28a 100755
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -21,32 +21,8 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
- 001E39A71196EE6F00A3F5B8 /* TestSupportRWops_Cocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = 001E39A51196EE6F00A3F5B8 /* TestSupportRWops_Cocoa.m */; };
- 006E9852119550FB001DE610 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9831119550FB001DE610 /* audio.c */; };
- 006E9853119550FB001DE610 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9834119550FB001DE610 /* common.c */; };
- 006E9859119550FB001DE610 /* platform.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E983D119550FB001DE610 /* platform.c */; };
- 006E985A119550FB001DE610 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 006E983F119550FB001DE610 /* README */; };
- 006E985B119550FB001DE610 /* rect.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9841119550FB001DE610 /* rect.c */; };
- 006E985C119550FB001DE610 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9844119550FB001DE610 /* render.c */; };
- 006E985D119550FB001DE610 /* read in Copy rwops */ = {isa = PBXBuildFile; fileRef = 006E9847119550FB001DE610 /* read */; };
- 006E985E119550FB001DE610 /* rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9848119550FB001DE610 /* rwops.c */; };
- 006E9860119550FB001DE610 /* SDL_at.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E984C119550FB001DE610 /* SDL_at.c */; };
- 006E9861119550FB001DE610 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E984F119550FB001DE610 /* surface.c */; };
- 006E9862119550FB001DE610 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 006E9851119550FB001DE610 /* testsdl.c */; };
- 006E986A1195513D001DE610 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 006E98631195513D001DE610 /* icon.bmp */; };
- 006E986B1195513D001DE610 /* moose.dat in Resources */ = {isa = PBXBuildFile; fileRef = 006E98641195513D001DE610 /* moose.dat */; };
- 006E986C1195513D001DE610 /* picture.xbm in Resources */ = {isa = PBXBuildFile; fileRef = 006E98651195513D001DE610 /* picture.xbm */; };
- 006E986E1195513D001DE610 /* sample.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 006E98671195513D001DE610 /* sample.bmp */; };
- 006E986F1195513D001DE610 /* sample.wav in Resources */ = {isa = PBXBuildFile; fileRef = 006E98681195513D001DE610 /* sample.wav */; };
- 006E98701195513D001DE610 /* utf8.txt in Resources */ = {isa = PBXBuildFile; fileRef = 006E98691195513D001DE610 /* utf8.txt */; };
006E9888119552DD001DE610 /* SDL_rwopsbundlesupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 006E9886119552DD001DE610 /* SDL_rwopsbundlesupport.h */; };
006E9889119552DD001DE610 /* SDL_rwopsbundlesupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 006E9887119552DD001DE610 /* SDL_rwopsbundlesupport.m */; };
- 0098A55B1195B4D900343137 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A55A1195B4D900343137 /* AudioToolbox.framework */; };
- 0098A55F1195B4D900343137 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A55E1195B4D900343137 /* CoreAudio.framework */; };
- 0098A5611195B4D900343137 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A5601195B4D900343137 /* CoreGraphics.framework */; };
- 0098A5631195B4D900343137 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A5621195B4D900343137 /* OpenGLES.framework */; };
- 0098A5651195B4D900343137 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A5641195B4D900343137 /* UIKit.framework */; };
- 0098A5851195B5E200343137 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0098A5841195B5E200343137 /* QuartzCore.framework */; };
0402A85812FE70C600CECEE3 /* SDL_render_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85512FE70C600CECEE3 /* SDL_render_gles2.c */; };
0402A85912FE70C600CECEE3 /* SDL_shaders_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */; };
0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */; };
@@ -91,7 +67,6 @@
04F7808512FB753F00FC43C0 /* SDL_nullframebuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7808312FB753F00FC43C0 /* SDL_nullframebuffer.c */; };
04FFAB8B12E23B8D00BA343D /* SDL_atomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04FFAB8912E23B8D00BA343D /* SDL_atomic.c */; };
04FFAB8C12E23B8D00BA343D /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */; };
- 22C905CD13A22646003FE4E4 /* SDL_hints_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C905CC13A22646003FE4E4 /* SDL_hints_c.h */; };
56EA86FB13E9EC2B002E47EB /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 56EA86F913E9EC2B002E47EB /* SDL_coreaudio.c */; };
56EA86FC13E9EC2B002E47EB /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 56EA86FA13E9EC2B002E47EB /* SDL_coreaudio.h */; };
56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; };
@@ -100,6 +75,7 @@
93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */; };
AA0AD06216647BBB00CE5896 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0AD06116647BBB00CE5896 /* SDL_gamecontroller.c */; };
AA0AD06516647BD400CE5896 /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0AD06416647BD400CE5896 /* SDL_gamecontroller.h */; };
+ AA0F8495178D5F1A00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8494178D5F1A00823F9D /* SDL_systls.c */; };
AA126AD41617C5E7005ABC8F /* SDL_uikitmodes.h in Headers */ = {isa = PBXBuildFile; fileRef = AA126AD21617C5E6005ABC8F /* SDL_uikitmodes.h */; };
AA126AD51617C5E7005ABC8F /* SDL_uikitmodes.m in Sources */ = {isa = PBXBuildFile; fileRef = AA126AD31617C5E6005ABC8F /* SDL_uikitmodes.m */; };
AA628ADB159369E3005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AD9159369E3005138DD /* SDL_rotate.c */; };
@@ -156,7 +132,6 @@
AA7558C81595D55500BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558951595D55500BBD41B /* SDL_version.h */; };
AA7558C91595D55500BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558961595D55500BBD41B /* SDL_video.h */; };
AA7558CA1595D55500BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558971595D55500BBD41B /* SDL.h */; };
- AA9781C91576A7FA00472542 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6526630DE8FCCB002AD96B /* libSDL2.a */; };
AA9FF9511637C6E5000DF050 /* SDL_messagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FF9501637C6E5000DF050 /* SDL_messagebox.h */; };
AABCC3941640643D00AB8930 /* SDL_uikitmessagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AABCC3921640643D00AB8930 /* SDL_uikitmessagebox.h */; };
AABCC3951640643D00AB8930 /* SDL_uikitmessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC3931640643D00AB8930 /* SDL_uikitmessagebox.m */; };
@@ -184,7 +159,6 @@
FD6526750DE8FCDD002AD96B /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B99B0DD52EDC00FB1D6B /* SDL_windowevents.c */; };
FD6526760DE8FCDD002AD96B /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B99E0DD52EDC00FB1D6B /* SDL_rwops.c */; };
FD6526780DE8FCDD002AD96B /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */; };
- FD6526790DE8FCDD002AD96B /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */; };
FD65267A0DE8FCDD002AD96B /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D80DD52EDC00FB1D6B /* SDL.c */; };
FD65267B0DE8FCDD002AD96B /* SDL_syscond.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA070DD52EDC00FB1D6B /* SDL_syscond.c */; };
FD65267C0DE8FCDD002AD96B /* SDL_sysmutex.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA080DD52EDC00FB1D6B /* SDL_sysmutex.c */; };
@@ -235,78 +209,11 @@
FDA685FC0DF244C800F98A1A /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA685F60DF244C800F98A1A /* SDL_nullevents_c.h */; };
FDA685FF0DF244C800F98A1A /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA685F90DF244C800F98A1A /* SDL_nullvideo.c */; };
FDA686000DF244C800F98A1A /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA685FA0DF244C800F98A1A /* SDL_nullvideo.h */; };
- FDC656480E560DF800311C8E /* jumphack.c in Sources */ = {isa = PBXBuildFile; fileRef = FDC656440E560DF800311C8E /* jumphack.c */; };
- FDC656490E560DF800311C8E /* jumphack.h in Headers */ = {isa = PBXBuildFile; fileRef = FDC656450E560DF800311C8E /* jumphack.h */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 006E982A11955065001DE610 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
- remoteInfo = StaticLib;
- };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 006E9881119551D0001DE610 /* Copy rwops */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = rwops;
- dstSubfolderSpec = 7;
- files = (
- 006E985D119550FB001DE610 /* read in Copy rwops */,
- );
- name = "Copy rwops";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
/* Begin PBXFileReference section */
- 001E39A51196EE6F00A3F5B8 /* TestSupportRWops_Cocoa.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestSupportRWops_Cocoa.m; sourceTree = ""; };
- 001E39A61196EE6F00A3F5B8 /* TestSupportRWops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestSupportRWops.h; sourceTree = ""; };
- 006E982211955059001DE610 /* testsdl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testsdl.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 006E982411955059001DE610 /* testsdl-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "testsdl-Info.plist"; sourceTree = ""; };
- 006E9831119550FB001DE610 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio.c; sourceTree = ""; };
- 006E9832119550FB001DE610 /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio.h; sourceTree = ""; };
- 006E9834119550FB001DE610 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = ""; };
- 006E9835119550FB001DE610 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; };
- 006E9836119550FB001DE610 /* images.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = images.h; sourceTree = ""; };
- 006E9837119550FB001DE610 /* img_blit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_blit.c; sourceTree = ""; };
- 006E9838119550FB001DE610 /* img_blitblend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_blitblend.c; sourceTree = ""; };
- 006E9839119550FB001DE610 /* img_face.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_face.c; sourceTree = ""; };
- 006E983A119550FB001DE610 /* img_primitives.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_primitives.c; sourceTree = ""; };
- 006E983B119550FB001DE610 /* img_primitivesblend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_primitivesblend.c; sourceTree = ""; };
- 006E983D119550FB001DE610 /* platform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = platform.c; sourceTree = ""; };
- 006E983E119550FB001DE610 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = ""; };
- 006E983F119550FB001DE610 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../../test/automated/README; sourceTree = SOURCE_ROOT; };
- 006E9841119550FB001DE610 /* rect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rect.c; sourceTree = ""; };
- 006E9842119550FB001DE610 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = ""; };
- 006E9844119550FB001DE610 /* render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = render.c; sourceTree = ""; };
- 006E9845119550FB001DE610 /* render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render.h; sourceTree = ""; };
- 006E9847119550FB001DE610 /* read */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = read; sourceTree = ""; };
- 006E9848119550FB001DE610 /* rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rwops.c; sourceTree = ""; };
- 006E9849119550FB001DE610 /* rwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rwops.h; sourceTree = ""; };
- 006E984C119550FB001DE610 /* SDL_at.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_at.c; path = ../../test/automated/SDL_at.c; sourceTree = SOURCE_ROOT; };
- 006E984D119550FB001DE610 /* SDL_at.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_at.h; path = ../../test/automated/SDL_at.h; sourceTree = SOURCE_ROOT; };
- 006E984F119550FB001DE610 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = surface.c; sourceTree = ""; };
- 006E9850119550FB001DE610 /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = ""; };
- 006E9851119550FB001DE610 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; };
- 006E98631195513D001DE610 /* icon.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = icon.bmp; path = ../../test/icon.bmp; sourceTree = SOURCE_ROOT; };
- 006E98641195513D001DE610 /* moose.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = moose.dat; path = ../../test/moose.dat; sourceTree = SOURCE_ROOT; };
- 006E98651195513D001DE610 /* picture.xbm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = picture.xbm; path = ../../test/picture.xbm; sourceTree = SOURCE_ROOT; };
- 006E98671195513D001DE610 /* sample.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = sample.bmp; path = ../../test/sample.bmp; sourceTree = SOURCE_ROOT; };
- 006E98681195513D001DE610 /* sample.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = sample.wav; path = ../../test/sample.wav; sourceTree = SOURCE_ROOT; };
- 006E98691195513D001DE610 /* utf8.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = utf8.txt; path = ../../test/utf8.txt; sourceTree = SOURCE_ROOT; };
006E9886119552DD001DE610 /* SDL_rwopsbundlesupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rwopsbundlesupport.h; sourceTree = ""; };
006E9887119552DD001DE610 /* SDL_rwopsbundlesupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_rwopsbundlesupport.m; sourceTree = ""; };
- 0098A55A1195B4D900343137 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
- 0098A55E1195B4D900343137 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
- 0098A5601195B4D900343137 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- 0098A5621195B4D900343137 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
- 0098A5641195B4D900343137 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
- 0098A5841195B5E200343137 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
0402A85512FE70C600CECEE3 /* SDL_render_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render_gles2.c; sourceTree = ""; };
0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_shaders_gles2.c; sourceTree = ""; };
0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shaders_gles2.h; sourceTree = ""; };
@@ -351,7 +258,6 @@
04F7808312FB753F00FC43C0 /* SDL_nullframebuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_nullframebuffer.c; sourceTree = ""; };
04FFAB8912E23B8D00BA343D /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = ""; };
04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = ""; };
- 22C905CC13A22646003FE4E4 /* SDL_hints_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_hints_c.h; path = ../../src/SDL_hints_c.h; sourceTree = ""; };
56EA86F913E9EC2B002E47EB /* SDL_coreaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_coreaudio.c; path = coreaudio/SDL_coreaudio.c; sourceTree = ""; };
56EA86FA13E9EC2B002E47EB /* SDL_coreaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_coreaudio.h; path = coreaudio/SDL_coreaudio.h; sourceTree = ""; };
56ED04E0118A8EE200A56AA6 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_power.c; path = ../../src/power/SDL_power.c; sourceTree = SOURCE_ROOT; };
@@ -360,6 +266,7 @@
93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitviewcontroller.m; sourceTree = ""; };
AA0AD06116647BBB00CE5896 /* SDL_gamecontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gamecontroller.c; sourceTree = ""; };
AA0AD06416647BD400CE5896 /* SDL_gamecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = ""; };
+ AA0F8494178D5F1A00823F9D /* SDL_systls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_systls.c; sourceTree = ""; };
AA126AD21617C5E6005ABC8F /* SDL_uikitmodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitmodes.h; sourceTree = ""; };
AA126AD31617C5E6005ABC8F /* SDL_uikitmodes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitmodes.m; sourceTree = ""; };
AA628AD9159369E3005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = ""; };
@@ -478,8 +385,6 @@
FD99B99E0DD52EDC00FB1D6B /* SDL_rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rwops.c; sourceTree = ""; };
FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_error_c.h; path = ../../src/SDL_error_c.h; sourceTree = ""; };
FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = ""; };
- FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_fatal.c; path = ../../src/SDL_fatal.c; sourceTree = ""; };
- FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_fatal.h; path = ../../src/SDL_fatal.h; sourceTree = ""; };
FD99B9D80DD52EDC00FB1D6B /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL.c; path = ../../src/SDL.c; sourceTree = ""; };
FD99BA070DD52EDC00FB1D6B /* SDL_syscond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syscond.c; sourceTree = ""; };
FD99BA080DD52EDC00FB1D6B /* SDL_sysmutex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysmutex.c; sourceTree = ""; };
@@ -519,138 +424,9 @@
FDA685F90DF244C800F98A1A /* SDL_nullvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_nullvideo.c; sourceTree = ""; };
FDA685FA0DF244C800F98A1A /* SDL_nullvideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_nullvideo.h; sourceTree = ""; };
FDC261780E3A3FC8001C4554 /* keyinfotable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyinfotable.h; sourceTree = ""; };
- FDC656440E560DF800311C8E /* jumphack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jumphack.c; sourceTree = ""; };
- FDC656450E560DF800311C8E /* jumphack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jumphack.h; sourceTree = ""; };
/* End PBXFileReference section */
-/* Begin PBXFrameworksBuildPhase section */
- 006E982011955059001DE610 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 0098A55B1195B4D900343137 /* AudioToolbox.framework in Frameworks */,
- 0098A55F1195B4D900343137 /* CoreAudio.framework in Frameworks */,
- 0098A5611195B4D900343137 /* CoreGraphics.framework in Frameworks */,
- 0098A5631195B4D900343137 /* OpenGLES.framework in Frameworks */,
- 0098A5651195B4D900343137 /* UIKit.framework in Frameworks */,
- 0098A5851195B5E200343137 /* QuartzCore.framework in Frameworks */,
- AA9781C91576A7FA00472542 /* libSDL2.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
/* Begin PBXGroup section */
- 006E982E119550D8001DE610 /* AutomatedTests */ = {
- isa = PBXGroup;
- children = (
- 006E9830119550FB001DE610 /* audio */,
- 006E9833119550FB001DE610 /* common */,
- 006E983C119550FB001DE610 /* platform */,
- 006E983F119550FB001DE610 /* README */,
- 006E9840119550FB001DE610 /* rect */,
- 006E9843119550FB001DE610 /* render */,
- 006E9846119550FB001DE610 /* rwops */,
- 006E984C119550FB001DE610 /* SDL_at.c */,
- 006E984D119550FB001DE610 /* SDL_at.h */,
- 006E984E119550FB001DE610 /* surface */,
- 006E9851119550FB001DE610 /* testsdl.c */,
- );
- name = AutomatedTests;
- sourceTree = "";
- };
- 006E982F119550E4001DE610 /* TestResources */ = {
- isa = PBXGroup;
- children = (
- 006E98631195513D001DE610 /* icon.bmp */,
- 006E98641195513D001DE610 /* moose.dat */,
- 006E98651195513D001DE610 /* picture.xbm */,
- 006E98671195513D001DE610 /* sample.bmp */,
- 006E98681195513D001DE610 /* sample.wav */,
- 006E98691195513D001DE610 /* utf8.txt */,
- );
- name = TestResources;
- sourceTree = "";
- };
- 006E9830119550FB001DE610 /* audio */ = {
- isa = PBXGroup;
- children = (
- 006E9831119550FB001DE610 /* audio.c */,
- 006E9832119550FB001DE610 /* audio.h */,
- );
- name = audio;
- path = ../../test/automated/audio;
- sourceTree = SOURCE_ROOT;
- };
- 006E9833119550FB001DE610 /* common */ = {
- isa = PBXGroup;
- children = (
- 006E9834119550FB001DE610 /* common.c */,
- 006E9835119550FB001DE610 /* common.h */,
- 006E9836119550FB001DE610 /* images.h */,
- 006E9837119550FB001DE610 /* img_blit.c */,
- 006E9838119550FB001DE610 /* img_blitblend.c */,
- 006E9839119550FB001DE610 /* img_face.c */,
- 006E983A119550FB001DE610 /* img_primitives.c */,
- 006E983B119550FB001DE610 /* img_primitivesblend.c */,
- );
- name = common;
- path = ../../test/automated/common;
- sourceTree = SOURCE_ROOT;
- };
- 006E983C119550FB001DE610 /* platform */ = {
- isa = PBXGroup;
- children = (
- 006E983D119550FB001DE610 /* platform.c */,
- 006E983E119550FB001DE610 /* platform.h */,
- );
- name = platform;
- path = ../../test/automated/platform;
- sourceTree = SOURCE_ROOT;
- };
- 006E9840119550FB001DE610 /* rect */ = {
- isa = PBXGroup;
- children = (
- 006E9841119550FB001DE610 /* rect.c */,
- 006E9842119550FB001DE610 /* rect.h */,
- );
- name = rect;
- path = ../../test/automated/rect;
- sourceTree = SOURCE_ROOT;
- };
- 006E9843119550FB001DE610 /* render */ = {
- isa = PBXGroup;
- children = (
- 006E9844119550FB001DE610 /* render.c */,
- 006E9845119550FB001DE610 /* render.h */,
- );
- name = render;
- path = ../../test/automated/render;
- sourceTree = SOURCE_ROOT;
- };
- 006E9846119550FB001DE610 /* rwops */ = {
- isa = PBXGroup;
- children = (
- 001E39A51196EE6F00A3F5B8 /* TestSupportRWops_Cocoa.m */,
- 001E39A61196EE6F00A3F5B8 /* TestSupportRWops.h */,
- 006E9847119550FB001DE610 /* read */,
- 006E9848119550FB001DE610 /* rwops.c */,
- 006E9849119550FB001DE610 /* rwops.h */,
- );
- name = rwops;
- path = ../../test/automated/rwops;
- sourceTree = SOURCE_ROOT;
- };
- 006E984E119550FB001DE610 /* surface */ = {
- isa = PBXGroup;
- children = (
- 006E984F119550FB001DE610 /* surface.c */,
- 006E9850119550FB001DE610 /* surface.h */,
- );
- name = surface;
- path = ../../test/automated/surface;
- sourceTree = SOURCE_ROOT;
- };
006E9885119552DD001DE610 /* cocoa */ = {
isa = PBXGroup;
children = (
@@ -758,7 +534,6 @@
isa = PBXGroup;
children = (
FD6526630DE8FCCB002AD96B /* libSDL2.a */,
- 006E982211955059001DE610 /* testsdl.app */,
);
name = Products;
sourceTree = "";
@@ -768,29 +543,12 @@
children = (
FD99B8BC0DD52E5C00FB1D6B /* Public Headers */,
FD99B8BD0DD52E6D00FB1D6B /* Library Source */,
- 006E982E119550D8001DE610 /* AutomatedTests */,
- 006E982F119550E4001DE610 /* TestResources */,
- 29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
- 006E982411955059001DE610 /* testsdl-Info.plist */,
- 0098A5841195B5E200343137 /* QuartzCore.framework */,
);
name = CustomTemplate;
sourceTree = "";
usesTabs = 0;
};
- 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 0098A55A1195B4D900343137 /* AudioToolbox.framework */,
- 0098A55E1195B4D900343137 /* CoreAudio.framework */,
- 0098A5601195B4D900343137 /* CoreGraphics.framework */,
- 0098A5621195B4D900343137 /* OpenGLES.framework */,
- 0098A5641195B4D900343137 /* UIKit.framework */,
- );
- name = Frameworks;
- sourceTree = "";
- };
56EA86F813E9EBF9002E47EB /* coreaudio */ = {
isa = PBXGroup;
children = (
@@ -857,8 +615,6 @@
FD689F090E26E5D900F90B21 /* uikit */ = {
isa = PBXGroup;
children = (
- FDC656440E560DF800311C8E /* jumphack.c */,
- FDC656450E560DF800311C8E /* jumphack.h */,
FDC261780E3A3FC8001C4554 /* keyinfotable.h */,
FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */,
FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */,
@@ -984,10 +740,7 @@
04BAC09A1300C1290055DE28 /* SDL_assert_c.h */,
FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */,
FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */,
- FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */,
- FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */,
0442EC5412FE1C3F004C9285 /* SDL_hints.c */,
- 22C905CC13A22646003FE4E4 /* SDL_hints_c.h */,
04BAC09B1300C1290055DE28 /* SDL_log.c */,
FD99B9D80DD52EDC00FB1D6B /* SDL.c */,
);
@@ -1093,6 +846,7 @@
FD99BA0A0DD52EDC00FB1D6B /* SDL_syssem.c */,
FD99BA0B0DD52EDC00FB1D6B /* SDL_systhread.c */,
FD99BA0C0DD52EDC00FB1D6B /* SDL_systhread_c.h */,
+ AA0F8494178D5F1A00823F9D /* SDL_systls.c */,
);
path = pthread;
sourceTree = "";
@@ -1187,7 +941,6 @@
FD689F240E26E5D900F90B21 /* SDL_uikitwindow.h in Headers */,
FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */,
FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */,
- FDC656490E560DF800311C8E /* jumphack.h in Headers */,
047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */,
046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */,
006E9888119552DD001DE610 /* SDL_rwopsbundlesupport.h in Headers */,
@@ -1207,7 +960,6 @@
0442EC5012FE1C1E004C9285 /* SDL_render_sw_c.h in Headers */,
0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */,
04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */,
- 22C905CD13A22646003FE4E4 /* SDL_hints_c.h in Headers */,
56EA86FC13E9EC2B002E47EB /* SDL_coreaudio.h in Headers */,
93CB792313FC5E5200BD3E05 /* SDL_uikitviewcontroller.h in Headers */,
AA628ADC159369E3005138DD /* SDL_rotate.h in Headers */,
@@ -1273,25 +1025,6 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 006E982111955059001DE610 /* testsdl */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 006E98271195505B001DE610 /* Build configuration list for PBXNativeTarget "testsdl" */;
- buildPhases = (
- 006E981E11955059001DE610 /* Resources */,
- 006E981F11955059001DE610 /* Sources */,
- 006E982011955059001DE610 /* Frameworks */,
- 006E9881119551D0001DE610 /* Copy rwops */,
- );
- buildRules = (
- );
- dependencies = (
- 006E982B11955065001DE610 /* PBXTargetDependency */,
- );
- name = testsdl;
- productName = testsdl;
- productReference = 006E982211955059001DE610 /* testsdl.app */;
- productType = "com.apple.product-type.application";
- };
FD6526620DE8FCCB002AD96B /* libSDL */ = {
isa = PBXNativeTarget;
buildConfigurationList = FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "libSDL" */;
@@ -1331,29 +1064,11 @@
projectRoot = ../..;
targets = (
FD6526620DE8FCCB002AD96B /* libSDL */,
- 006E982111955059001DE610 /* testsdl */,
00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */,
);
};
/* End PBXProject section */
-/* Begin PBXResourcesBuildPhase section */
- 006E981E11955059001DE610 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 006E985A119550FB001DE610 /* README in Resources */,
- 006E986A1195513D001DE610 /* icon.bmp in Resources */,
- 006E986B1195513D001DE610 /* moose.dat in Resources */,
- 006E986C1195513D001DE610 /* picture.xbm in Resources */,
- 006E986E1195513D001DE610 /* sample.bmp in Resources */,
- 006E986F1195513D001DE610 /* sample.wav in Resources */,
- 006E98701195513D001DE610 /* utf8.txt in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
/* Begin PBXShellScriptBuildPhase section */
00B4F48A12F6A69C0084EC00 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1372,23 +1087,6 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 006E981F11955059001DE610 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 006E9852119550FB001DE610 /* audio.c in Sources */,
- 006E9853119550FB001DE610 /* common.c in Sources */,
- 006E9859119550FB001DE610 /* platform.c in Sources */,
- 006E985B119550FB001DE610 /* rect.c in Sources */,
- 006E985C119550FB001DE610 /* render.c in Sources */,
- 006E985E119550FB001DE610 /* rwops.c in Sources */,
- 006E9860119550FB001DE610 /* SDL_at.c in Sources */,
- 006E9861119550FB001DE610 /* surface.c in Sources */,
- 006E9862119550FB001DE610 /* testsdl.c in Sources */,
- 001E39A71196EE6F00A3F5B8 /* TestSupportRWops_Cocoa.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
FD6526600DE8FCCB002AD96B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -1410,7 +1108,6 @@
FD6526750DE8FCDD002AD96B /* SDL_windowevents.c in Sources */,
FD6526760DE8FCDD002AD96B /* SDL_rwops.c in Sources */,
FD6526780DE8FCDD002AD96B /* SDL_error.c in Sources */,
- FD6526790DE8FCDD002AD96B /* SDL_fatal.c in Sources */,
FD65267A0DE8FCDD002AD96B /* SDL.c in Sources */,
FD65267B0DE8FCDD002AD96B /* SDL_syscond.c in Sources */,
FD65267C0DE8FCDD002AD96B /* SDL_sysmutex.c in Sources */,
@@ -1450,7 +1147,6 @@
FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */,
FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */,
FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */,
- FDC656480E560DF800311C8E /* jumphack.c in Sources */,
047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */,
047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */,
047AF1B30EA98D6C00811173 /* SDL_sysloadso.c in Sources */,
@@ -1487,54 +1183,13 @@
AA704DD7162AA90A0076D1C1 /* SDL_dropevents.c in Sources */,
AABCC3951640643D00AB8930 /* SDL_uikitmessagebox.m in Sources */,
AA0AD06216647BBB00CE5896 /* SDL_gamecontroller.c in Sources */,
+ AA0F8495178D5F1A00823F9D /* SDL_systls.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 006E982B11955065001DE610 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = FD6526620DE8FCCB002AD96B /* libSDL */;
- targetProxy = 006E982A11955065001DE610 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
- 006E98251195505B001DE610 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_IDENTITY = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- INFOPLIST_FILE = "testsdl-Info.plist";
- INSTALL_PATH = "$(HOME)/Applications";
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- UIKit,
- );
- PRODUCT_NAME = testsdl;
- };
- name = Debug;
- };
- 006E98261195505B001DE610 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- CODE_SIGN_IDENTITY = "iPhone Developer";
- COPY_PHASE_STRIP = YES;
- INFOPLIST_FILE = "testsdl-Info.plist";
- INSTALL_PATH = "$(HOME)/Applications";
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- UIKit,
- );
- PRODUCT_NAME = testsdl;
- };
- name = Release;
- };
00B4F48C12F6A69C0084EC00 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1603,15 +1258,6 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 006E98271195505B001DE610 /* Build configuration list for PBXNativeTarget "testsdl" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 006E98251195505B001DE610 /* Debug */,
- 006E98261195505B001DE610 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
00B4F48E12F6A6BA0084EC00 /* Build configuration list for PBXAggregateTarget "PrepareXcodeProjectTemplate" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/Xcode-iOS/SDL/testsdl-Info.plist b/Xcode-iOS/SDL/testsdl-Info.plist
deleted file mode 100644
index af9a1cadb..000000000
--- a/Xcode-iOS/SDL/testsdl-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIdentifier
- com.yourcompany.${PRODUCT_NAME:identifier}
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
-
-
diff --git a/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj b/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..0995735e9
--- /dev/null
+++ b/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj
@@ -0,0 +1,272 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ AA1EE462176059AB0029C7A5 /* SDL_test_common.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE454176059AB0029C7A5 /* SDL_test_common.c */; };
+ AA1EE463176059AB0029C7A5 /* SDL_test_compare.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE455176059AB0029C7A5 /* SDL_test_compare.c */; };
+ AA1EE464176059AB0029C7A5 /* SDL_test_crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE456176059AB0029C7A5 /* SDL_test_crc32.c */; };
+ AA1EE465176059AB0029C7A5 /* SDL_test_font.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE457176059AB0029C7A5 /* SDL_test_font.c */; };
+ AA1EE466176059AB0029C7A5 /* SDL_test_fuzzer.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE458176059AB0029C7A5 /* SDL_test_fuzzer.c */; };
+ AA1EE467176059AB0029C7A5 /* SDL_test_harness.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE459176059AB0029C7A5 /* SDL_test_harness.c */; };
+ AA1EE468176059AB0029C7A5 /* SDL_test_imageBlit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45A176059AB0029C7A5 /* SDL_test_imageBlit.c */; };
+ AA1EE469176059AB0029C7A5 /* SDL_test_imageBlitBlend.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45B176059AB0029C7A5 /* SDL_test_imageBlitBlend.c */; };
+ AA1EE46A176059AB0029C7A5 /* SDL_test_imageFace.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45C176059AB0029C7A5 /* SDL_test_imageFace.c */; };
+ AA1EE46B176059AB0029C7A5 /* SDL_test_imagePrimitives.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45D176059AB0029C7A5 /* SDL_test_imagePrimitives.c */; };
+ AA1EE46C176059AB0029C7A5 /* SDL_test_imagePrimitivesBlend.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45E176059AB0029C7A5 /* SDL_test_imagePrimitivesBlend.c */; };
+ AA1EE46D176059AB0029C7A5 /* SDL_test_log.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE45F176059AB0029C7A5 /* SDL_test_log.c */; };
+ AA1EE46E176059AB0029C7A5 /* SDL_test_md5.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE460176059AB0029C7A5 /* SDL_test_md5.c */; };
+ AA1EE46F176059AB0029C7A5 /* SDL_test_random.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1EE461176059AB0029C7A5 /* SDL_test_random.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ AA1EE4461760589B0029C7A5 /* libSDL2test.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2test.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ AA1EE454176059AB0029C7A5 /* SDL_test_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_common.c; path = ../../src/test/SDL_test_common.c; sourceTree = ""; };
+ AA1EE455176059AB0029C7A5 /* SDL_test_compare.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_compare.c; path = ../../src/test/SDL_test_compare.c; sourceTree = ""; };
+ AA1EE456176059AB0029C7A5 /* SDL_test_crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_crc32.c; path = ../../src/test/SDL_test_crc32.c; sourceTree = ""; };
+ AA1EE457176059AB0029C7A5 /* SDL_test_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_font.c; path = ../../src/test/SDL_test_font.c; sourceTree = ""; };
+ AA1EE458176059AB0029C7A5 /* SDL_test_fuzzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_fuzzer.c; path = ../../src/test/SDL_test_fuzzer.c; sourceTree = ""; };
+ AA1EE459176059AB0029C7A5 /* SDL_test_harness.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_harness.c; path = ../../src/test/SDL_test_harness.c; sourceTree = ""; };
+ AA1EE45A176059AB0029C7A5 /* SDL_test_imageBlit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageBlit.c; path = ../../src/test/SDL_test_imageBlit.c; sourceTree = ""; };
+ AA1EE45B176059AB0029C7A5 /* SDL_test_imageBlitBlend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageBlitBlend.c; path = ../../src/test/SDL_test_imageBlitBlend.c; sourceTree = ""; };
+ AA1EE45C176059AB0029C7A5 /* SDL_test_imageFace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imageFace.c; path = ../../src/test/SDL_test_imageFace.c; sourceTree = ""; };
+ AA1EE45D176059AB0029C7A5 /* SDL_test_imagePrimitives.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imagePrimitives.c; path = ../../src/test/SDL_test_imagePrimitives.c; sourceTree = ""; };
+ AA1EE45E176059AB0029C7A5 /* SDL_test_imagePrimitivesBlend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_imagePrimitivesBlend.c; path = ../../src/test/SDL_test_imagePrimitivesBlend.c; sourceTree = ""; };
+ AA1EE45F176059AB0029C7A5 /* SDL_test_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_log.c; path = ../../src/test/SDL_test_log.c; sourceTree = ""; };
+ AA1EE460176059AB0029C7A5 /* SDL_test_md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_md5.c; path = ../../src/test/SDL_test_md5.c; sourceTree = ""; };
+ AA1EE461176059AB0029C7A5 /* SDL_test_random.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_test_random.c; path = ../../src/test/SDL_test_random.c; sourceTree = ""; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ AA1EE4431760589B0029C7A5 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ AA1EE43D1760589B0029C7A5 = {
+ isa = PBXGroup;
+ children = (
+ AA1EE453176059770029C7A5 /* Library Source */,
+ AA1EE4471760589B0029C7A5 /* Products */,
+ );
+ sourceTree = "";
+ };
+ AA1EE4471760589B0029C7A5 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ AA1EE4461760589B0029C7A5 /* libSDL2test.a */,
+ );
+ name = Products;
+ sourceTree = "";
+ };
+ AA1EE453176059770029C7A5 /* Library Source */ = {
+ isa = PBXGroup;
+ children = (
+ AA1EE454176059AB0029C7A5 /* SDL_test_common.c */,
+ AA1EE455176059AB0029C7A5 /* SDL_test_compare.c */,
+ AA1EE456176059AB0029C7A5 /* SDL_test_crc32.c */,
+ AA1EE457176059AB0029C7A5 /* SDL_test_font.c */,
+ AA1EE458176059AB0029C7A5 /* SDL_test_fuzzer.c */,
+ AA1EE459176059AB0029C7A5 /* SDL_test_harness.c */,
+ AA1EE45A176059AB0029C7A5 /* SDL_test_imageBlit.c */,
+ AA1EE45B176059AB0029C7A5 /* SDL_test_imageBlitBlend.c */,
+ AA1EE45C176059AB0029C7A5 /* SDL_test_imageFace.c */,
+ AA1EE45D176059AB0029C7A5 /* SDL_test_imagePrimitives.c */,
+ AA1EE45E176059AB0029C7A5 /* SDL_test_imagePrimitivesBlend.c */,
+ AA1EE45F176059AB0029C7A5 /* SDL_test_log.c */,
+ AA1EE460176059AB0029C7A5 /* SDL_test_md5.c */,
+ AA1EE461176059AB0029C7A5 /* SDL_test_random.c */,
+ );
+ name = "Library Source";
+ sourceTree = "";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+ AA1EE4441760589B0029C7A5 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+ AA1EE4451760589B0029C7A5 /* SDL2test */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = AA1EE44A1760589B0029C7A5 /* Build configuration list for PBXNativeTarget "SDL2test" */;
+ buildPhases = (
+ AA1EE4421760589B0029C7A5 /* Sources */,
+ AA1EE4431760589B0029C7A5 /* Frameworks */,
+ AA1EE4441760589B0029C7A5 /* Headers */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = SDL2test;
+ productName = SDL2test;
+ productReference = AA1EE4461760589B0029C7A5 /* libSDL2test.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ AA1EE43E1760589B0029C7A5 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0460;
+ ORGANIZATIONNAME = "Sam Lantinga";
+ };
+ buildConfigurationList = AA1EE4411760589B0029C7A5 /* Build configuration list for PBXProject "SDL2test" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = AA1EE43D1760589B0029C7A5;
+ productRefGroup = AA1EE4471760589B0029C7A5 /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ AA1EE4451760589B0029C7A5 /* SDL2test */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+ AA1EE4421760589B0029C7A5 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AA1EE462176059AB0029C7A5 /* SDL_test_common.c in Sources */,
+ AA1EE463176059AB0029C7A5 /* SDL_test_compare.c in Sources */,
+ AA1EE464176059AB0029C7A5 /* SDL_test_crc32.c in Sources */,
+ AA1EE465176059AB0029C7A5 /* SDL_test_font.c in Sources */,
+ AA1EE466176059AB0029C7A5 /* SDL_test_fuzzer.c in Sources */,
+ AA1EE467176059AB0029C7A5 /* SDL_test_harness.c in Sources */,
+ AA1EE468176059AB0029C7A5 /* SDL_test_imageBlit.c in Sources */,
+ AA1EE469176059AB0029C7A5 /* SDL_test_imageBlitBlend.c in Sources */,
+ AA1EE46A176059AB0029C7A5 /* SDL_test_imageFace.c in Sources */,
+ AA1EE46B176059AB0029C7A5 /* SDL_test_imagePrimitives.c in Sources */,
+ AA1EE46C176059AB0029C7A5 /* SDL_test_imagePrimitivesBlend.c in Sources */,
+ AA1EE46D176059AB0029C7A5 /* SDL_test_log.c in Sources */,
+ AA1EE46E176059AB0029C7A5 /* SDL_test_md5.c in Sources */,
+ AA1EE46F176059AB0029C7A5 /* SDL_test_random.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ AA1EE4481760589B0029C7A5 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ AA1EE4491760589B0029C7A5 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = iphoneos;
+ };
+ name = Release;
+ };
+ AA1EE44B1760589B0029C7A5 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ EXECUTABLE_PREFIX = lib;
+ HEADER_SEARCH_PATHS = ../../include;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ AA1EE44C1760589B0029C7A5 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ EXECUTABLE_PREFIX = lib;
+ HEADER_SEARCH_PATHS = ../../include;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ AA1EE4411760589B0029C7A5 /* Build configuration list for PBXProject "SDL2test" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ AA1EE4481760589B0029C7A5 /* Debug */,
+ AA1EE4491760589B0029C7A5 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ AA1EE44A1760589B0029C7A5 /* Build configuration list for PBXNativeTarget "SDL2test" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ AA1EE44B1760589B0029C7A5 /* Debug */,
+ AA1EE44C1760589B0029C7A5 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = AA1EE43E1760589B0029C7A5 /* Project object */;
+}
diff --git a/Xcode-iOS/Template/SDL iOS Application/main.c b/Xcode-iOS/Template/SDL iOS Application/main.c
index 2a5d3f2ac..8dc00706f 100644
--- a/Xcode-iOS/Template/SDL iOS Application/main.c
+++ b/Xcode-iOS/Template/SDL iOS Application/main.c
@@ -1,7 +1,7 @@
/*
- * rectangles.c
- * written by Holmes Futrell
- * use however you want
+ * rectangles.c
+ * written by Holmes Futrell
+ * use however you want
*/
#include "SDL.h"
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
/* create window and renderer */
window =
SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
- SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
+ SDL_WINDOW_OPENGL);
if (!window) {
printf("Could not initialize Window\n");
return 1;
diff --git a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
index 1993661b1..0b35c22cf 100755
--- a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
@@ -36,8 +36,14 @@
56ED0508118A8FE400A56AA6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; };
56ED0509118A8FE400A56AA6 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
56ED0511118A904200A56AA6 /* testpower.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED0510118A904200A56AA6 /* testpower.c */; };
+ AA1EE470176059D00029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47117605A7F0029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47417605B5C0029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47517605B930029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47617605B9E0029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47717605BAB0029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
+ AA1EE47817605BF60029C7A5 /* libSDL2test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1EE452176059230029C7A5 /* libSDL2test.a */; };
AAE7DEDC14CBB1E100DF1A0E /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
- AAE7DEDE14CBB1E100DF1A0E /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
AAE7DEE314CBB1E100DF1A0E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
@@ -50,7 +56,6 @@
AAE7DF4714CBB45000DF1A0E /* sample.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AADE0E2D33C100EA573E /* sample.bmp */; };
AAE7DFA014CBB54E00DF1A0E /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
AAE7DFA114CBB54E00DF1A0E /* sample.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AADE0E2D33C100EA573E /* sample.bmp */; };
- AAE7DFA314CBB54E00DF1A0E /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
AAE7DFA814CBB54E00DF1A0E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
@@ -60,7 +65,6 @@
AAE7DFAC14CBB54E00DF1A0E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; };
AAE7DFAD14CBB54E00DF1A0E /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
AAE7DFB514CBB5F700DF1A0E /* testrendertarget.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7DFB414CBB5F700DF1A0E /* testrendertarget.c */; };
- FDA8A79B0E2D0F8B00EA573E /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
FDA8A79C0E2D0F9300EA573E /* testwm2.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A75F0E2D0F1600EA573E /* testwm2.c */; };
FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
@@ -111,7 +115,6 @@
FDAAC6220E2D5914001DB1D8 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
FDAAC62A0E2D5960001DB1D8 /* testgles.c in Sources */ = {isa = PBXBuildFile; fileRef = FDAAC6290E2D5960001DB1D8 /* testgles.c */; };
FDAAC6390E2D59BE001DB1D8 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
- FDAAC7780E2D7024001DB1D8 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
FDBDE5850E313495006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
@@ -138,7 +141,6 @@
FDC42FFB0F0D866D009C87E1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; };
FDC42FFC0F0D866D009C87E1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
FDC4300A0F0D86BF009C87E1 /* testdraw2.c in Sources */ = {isa = PBXBuildFile; fileRef = FDC430090F0D86BF009C87E1 /* testdraw2.c */; };
- FDC4301F0F0D8702009C87E1 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
FDD2C1000E2E4F4B00B7A85F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
FDD2C1010E2E4F4B00B7A85F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
FDD2C1020E2E4F4B00B7A85F /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
@@ -205,7 +207,6 @@
FDD2C54A0E2E80E400B7A85F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
FDD2C5510E2E80F400B7A85F /* testsprite2.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7590E2D0F1600EA573E /* testsprite2.c */; };
FDD2C5520E2E812C00B7A85F /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
- FDD2C5630E2E815C00B7A85F /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
FDD2C5760E2E8C7400B7A85F /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
FDD2C57D0E2E8C7400B7A85F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
FDD2C57E0E2E8C7400B7A85F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
@@ -242,6 +243,13 @@
remoteGlobalIDString = 006E982211955059001DE610;
remoteInfo = testsdl;
};
+ AA1EE451176059230029C7A5 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = AA1EE44D176059220029C7A5 /* SDL2test.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = AA1EE4461760589B0029C7A5;
+ remoteInfo = SDL2test;
+ };
FD1B48B70E3131CA007AB34E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FD1B48AC0E3131CA007AB34E /* SDL.xcodeproj */;
@@ -259,6 +267,7 @@
1D6058910D05DD3D006BFB54 /* testwm2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testwm2.app; sourceTree = BUILT_PRODUCTS_DIR; };
56ED050D118A8FE400A56AA6 /* testpower.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testpower.app; sourceTree = BUILT_PRODUCTS_DIR; };
56ED0510118A904200A56AA6 /* testpower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testpower.c; path = ../../test/testpower.c; sourceTree = SOURCE_ROOT; };
+ AA1EE44D176059220029C7A5 /* SDL2test.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL2test.xcodeproj; path = ../SDLtest/SDL2test.xcodeproj; sourceTree = ""; };
AAE7DEEC14CBB1E100DF1A0E /* testscale.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testscale.app; sourceTree = BUILT_PRODUCTS_DIR; };
AAE7DF4514CBB43900DF1A0E /* testscale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testscale.c; path = ../../test/testscale.c; sourceTree = ""; };
AAE7DFB114CBB54E00DF1A0E /* testrendertarget.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testrendertarget.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -280,8 +289,6 @@
FDA8A75B0E2D0F1600EA573E /* testver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testver.c; path = ../../test/testver.c; sourceTree = SOURCE_ROOT; };
FDA8A75F0E2D0F1600EA573E /* testwm2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testwm2.c; path = ../../test/testwm2.c; sourceTree = SOURCE_ROOT; };
FDA8A7610E2D0F1600EA573E /* torturethread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = torturethread.c; path = ../../test/torturethread.c; sourceTree = SOURCE_ROOT; };
- FDA8A7840E2D0F1F00EA573E /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../test/common.c; sourceTree = SOURCE_ROOT; };
- FDA8A7850E2D0F1F00EA573E /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = ../../test/common.h; sourceTree = SOURCE_ROOT; };
FDA8A78B0E2D0F3D00EA573E /* loopwave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loopwave.c; path = ../../test/loopwave.c; sourceTree = SOURCE_ROOT; };
FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
FDA8A8990E2D111A00EA573E /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -337,6 +344,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE470176059D00029C7A5 /* libSDL2test.a in Frameworks */,
047A63E213285C3200CD7973 /* libSDL2.a in Frameworks */,
047A63E313285C3200CD7973 /* AudioToolbox.framework in Frameworks */,
047A63E413285C3200CD7973 /* QuartzCore.framework in Frameworks */,
@@ -352,6 +360,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47817605BF60029C7A5 /* libSDL2test.a in Frameworks */,
FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */,
FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */,
FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */,
@@ -382,6 +391,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47617605B9E0029C7A5 /* libSDL2test.a in Frameworks */,
AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */,
AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */,
AAE7DEE314CBB1E100DF1A0E /* QuartzCore.framework in Frameworks */,
@@ -397,6 +407,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47517605B930029C7A5 /* libSDL2test.a in Frameworks */,
AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */,
AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */,
AAE7DFA814CBB54E00DF1A0E /* QuartzCore.framework in Frameworks */,
@@ -472,6 +483,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47417605B5C0029C7A5 /* libSDL2test.a in Frameworks */,
FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */,
FDAAC61C0E2D5914001DB1D8 /* AudioToolbox.framework in Frameworks */,
FDAAC61D0E2D5914001DB1D8 /* QuartzCore.framework in Frameworks */,
@@ -487,6 +499,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47117605A7F0029C7A5 /* libSDL2test.a in Frameworks */,
FDC42FF40F0D866D009C87E1 /* libSDL2.a in Frameworks */,
FDC42FF60F0D866D009C87E1 /* AudioToolbox.framework in Frameworks */,
FDC42FF70F0D866D009C87E1 /* QuartzCore.framework in Frameworks */,
@@ -607,6 +620,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA1EE47717605BAB0029C7A5 /* libSDL2test.a in Frameworks */,
FDBDE5CA0E313712006BAC0B /* libSDL2.a in Frameworks */,
FDD2C5440E2E80E400B7A85F /* AudioToolbox.framework in Frameworks */,
FDD2C5450E2E80E400B7A85F /* QuartzCore.framework in Frameworks */,
@@ -699,6 +713,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
+ AA1EE44D176059220029C7A5 /* SDL2test.xcodeproj */,
FD1B48AC0E3131CA007AB34E /* SDL.xcodeproj */,
FDA8AAD60E2D339A00EA573E /* Resources */,
FDA8A7C30E2D10FA00EA573E /* Linked Frameworks */,
@@ -708,6 +723,14 @@
name = CustomTemplate;
sourceTree = "";
};
+ AA1EE44E176059220029C7A5 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ AA1EE452176059230029C7A5 /* libSDL2test.a */,
+ );
+ name = Products;
+ sourceTree = "";
+ };
FD1B48AD0E3131CA007AB34E /* Products */ = {
isa = PBXGroup;
children = (
@@ -721,8 +744,6 @@
isa = PBXGroup;
children = (
047A63F013285CD100CD7973 /* checkkeys.c */,
- FDA8A7840E2D0F1F00EA573E /* common.c */,
- FDA8A7850E2D0F1F00EA573E /* common.h */,
FDA8A78B0E2D0F3D00EA573E /* loopwave.c */,
FDA8A7410E2D0F1600EA573E /* testaudioinfo.c */,
FDC430090F0D86BF009C87E1 /* testdraw2.c */,
@@ -1196,6 +1217,10 @@
ProductGroup = FD1B48AD0E3131CA007AB34E /* Products */;
ProjectRef = FD1B48AC0E3131CA007AB34E /* SDL.xcodeproj */;
},
+ {
+ ProductGroup = AA1EE44E176059220029C7A5 /* Products */;
+ ProjectRef = AA1EE44D176059220029C7A5 /* SDL2test.xcodeproj */;
+ },
);
projectRoot = "";
targets = (
@@ -1234,6 +1259,13 @@
remoteRef = 0466EE6F11E565E4000198A4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
+ AA1EE452176059230029C7A5 /* libSDL2test.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libSDL2test.a;
+ remoteRef = AA1EE451176059230029C7A5 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
FD1B48B80E3131CA007AB34E /* libSDL2.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1440,7 +1472,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- FDA8A79B0E2D0F8B00EA573E /* common.c in Sources */,
FDA8A79C0E2D0F9300EA573E /* testwm2.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1457,7 +1488,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AAE7DEDE14CBB1E100DF1A0E /* common.c in Sources */,
AAE7DF4614CBB43900DF1A0E /* testscale.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1466,7 +1496,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AAE7DFA314CBB54E00DF1A0E /* common.c in Sources */,
AAE7DFB514CBB5F700DF1A0E /* testrendertarget.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1508,7 +1537,6 @@
buildActionMask = 2147483647;
files = (
FDAAC62A0E2D5960001DB1D8 /* testgles.c in Sources */,
- FDAAC7780E2D7024001DB1D8 /* common.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1516,7 +1544,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- FDC4301F0F0D8702009C87E1 /* common.c in Sources */,
FDC4300A0F0D86BF009C87E1 /* testdraw2.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1581,7 +1608,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- FDD2C5630E2E815C00B7A85F /* common.c in Sources */,
FDD2C5510E2E80F400B7A85F /* testsprite2.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index 544baa635..0ab4b25e3 100644
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -22,5 +22,7 @@
SDLX
CFBundleVersion
2.0.0
+ CFBundleExecutable
+ ${EXECUTABLE_NAME}
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 370e4de6d..3757efde0 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -6,31 +6,7 @@
objectVersion = 46;
objects = {
-/* Begin PBXAggregateTarget section */
- 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = 008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */;
- buildPhases = (
- 0083103E1072EA5700A531F1 /* ShellScript */,
- );
- dependencies = (
- );
- name = "Generate Doxygen DocSet";
- productName = "Generate Doxygen DocSet";
- };
-/* End PBXAggregateTarget section */
-
/* Begin PBXBuildFile section */
- 001E39EE1196F75000A3F5B8 /* TestSupportRWops_Cocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = 001E39EC1196F75000A3F5B8 /* TestSupportRWops_Cocoa.m */; };
- 006E94A3119511A1001DE610 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 006E949C119511A1001DE610 /* icon.bmp */; };
- 006E94A4119511A1001DE610 /* moose.dat in Resources */ = {isa = PBXBuildFile; fileRef = 006E949D119511A1001DE610 /* moose.dat */; };
- 006E94A5119511A1001DE610 /* picture.xbm in Resources */ = {isa = PBXBuildFile; fileRef = 006E949E119511A1001DE610 /* picture.xbm */; };
- 006E94A7119511A1001DE610 /* sample.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 006E94A0119511A1001DE610 /* sample.bmp */; };
- 006E94A8119511A1001DE610 /* sample.wav in Resources */ = {isa = PBXBuildFile; fileRef = 006E94A1119511A1001DE610 /* sample.wav */; };
- 006E94A9119511A1001DE610 /* utf8.txt in Resources */ = {isa = PBXBuildFile; fileRef = 006E94A2119511A1001DE610 /* utf8.txt */; };
- 006E94BC11951217001DE610 /* read in Copy rwops */ = {isa = PBXBuildFile; fileRef = 00D8DA121195093100638393 /* read */; };
- 006E94EF11951255001DE610 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL2.framework */; };
- 006E94F01195125B001DE610 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL2.framework */; };
007317A20858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
007317A30858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; };
@@ -47,15 +23,6 @@
00CFA89D106B4BA100758660 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; };
00D0D08410675DD9004B05EF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D0D08310675DD9004B05EF /* CoreFoundation.framework */; };
00D0D0D810675E46004B05EF /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
- 00D8DA1B1195093100638393 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8D9FC1195093100638393 /* audio.c */; };
- 00D8DA1C1195093100638393 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8D9FF1195093100638393 /* common.c */; };
- 00D8DA221195093100638393 /* platform.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA081195093100638393 /* platform.c */; };
- 00D8DA241195093100638393 /* rect.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA0C1195093100638393 /* rect.c */; };
- 00D8DA251195093100638393 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA0F1195093100638393 /* render.c */; };
- 00D8DA271195093100638393 /* rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA131195093100638393 /* rwops.c */; };
- 00D8DA281195093100638393 /* SDL_at.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA151195093100638393 /* SDL_at.c */; };
- 00D8DA291195093100638393 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA181195093100638393 /* surface.c */; };
- 00D8DA2A1195093100638393 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA1A1195093100638393 /* testsdl.c */; };
04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
041B2CA512FA0D680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2C9E12FA0D680087D585 /* SDL_render.c */; };
@@ -146,8 +113,6 @@
04BD009C12E6671800899322 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; };
04BD009E12E6671800899322 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; };
04BD009F12E6671800899322 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; };
- 04BD00A012E6671800899322 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5A12E6671700899322 /* SDL_fatal.c */; };
- 04BD00A112E6671800899322 /* SDL_fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5B12E6671700899322 /* SDL_fatal.h */; };
04BD00A212E6671800899322 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; };
04BD00A312E6671800899322 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; };
04BD00A412E6671800899322 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; };
@@ -302,8 +267,6 @@
04BD02B612E6671800899322 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; };
04BD02B812E6671800899322 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; };
04BD02B912E6671800899322 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; };
- 04BD02BA12E6671800899322 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5A12E6671700899322 /* SDL_fatal.c */; };
- 04BD02BB12E6671800899322 /* SDL_fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5B12E6671700899322 /* SDL_fatal.h */; };
04BD02BC12E6671800899322 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; };
04BD02BD12E6671800899322 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; };
04BD02BE12E6671800899322 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; };
@@ -431,6 +394,9 @@
A77E6EB4167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; };
A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; };
AA0AD09D16648D1700CE5896 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; };
+ AA0F8491178D5ECC00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8490178D5ECC00823F9D /* SDL_systls.c */; };
+ AA0F8492178D5ECC00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8490178D5ECC00823F9D /* SDL_systls.c */; };
+ AA0F8493178D5ECC00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8490178D5ECC00823F9D /* SDL_systls.c */; };
AA41F88014B8F1F500993C4F /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */; };
AA628ACA159367B7005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AC8159367B7005138DD /* SDL_rotate.c */; };
AA628ACB159367B7005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AC8159367B7005138DD /* SDL_rotate.c */; };
@@ -550,23 +516,268 @@
AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
BBFC088D164C6647003E6A99 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; };
+ D55A1B81179F262300625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
+ D55A1B82179F262300625D7C /* SDL_cocoamousetap.m in Sources */ = {isa = PBXBuildFile; fileRef = D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */; };
+ D55A1B83179F263500625D7C /* SDL_cocoamousetap.m in Sources */ = {isa = PBXBuildFile; fileRef = D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */; };
+ D55A1B84179F263600625D7C /* SDL_cocoamousetap.m in Sources */ = {isa = PBXBuildFile; fileRef = D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */; };
+ D55A1B85179F278E00625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
+ D55A1B86179F278F00625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
+ DB313F7417554B71006C0E22 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; };
+ DB313F7517554B71006C0E22 /* SDL_dummyaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD9512E6671700899322 /* SDL_dummyaudio.h */; };
+ DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; };
+ DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; };
+ DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
+ DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
+ DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
+ DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
+ DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD612E6671700899322 /* blank_cursor.h */; };
+ DB313F7D17554B71006C0E22 /* default_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD712E6671700899322 /* default_cursor.h */; };
+ DB313F7E17554B71006C0E22 /* scancodes_darwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD812E6671700899322 /* scancodes_darwin.h */; };
+ DB313F7F17554B71006C0E22 /* scancodes_linux.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD912E6671700899322 /* scancodes_linux.h */; };
+ DB313F8017554B71006C0E22 /* scancodes_xfree86.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDDB12E6671700899322 /* scancodes_xfree86.h */; };
+ DB313F8117554B71006C0E22 /* SDL_clipboardevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDDD12E6671700899322 /* SDL_clipboardevents_c.h */; };
+ DB313F8217554B71006C0E22 /* SDL_events_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDDF12E6671700899322 /* SDL_events_c.h */; };
+ DB313F8317554B71006C0E22 /* SDL_gesture_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDE112E6671700899322 /* SDL_gesture_c.h */; };
+ DB313F8417554B71006C0E22 /* SDL_keyboard_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDE312E6671700899322 /* SDL_keyboard_c.h */; };
+ DB313F8517554B71006C0E22 /* SDL_mouse_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDE512E6671700899322 /* SDL_mouse_c.h */; };
+ DB313F8617554B71006C0E22 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDE712E6671700899322 /* SDL_sysevents.h */; };
+ DB313F8717554B71006C0E22 /* SDL_touch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDE912E6671700899322 /* SDL_touch_c.h */; };
+ DB313F8817554B71006C0E22 /* SDL_windowevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDEB12E6671700899322 /* SDL_windowevents_c.h */; };
+ DB313F8917554B71006C0E22 /* SDL_rwopsbundlesupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDEE12E6671700899322 /* SDL_rwopsbundlesupport.h */; };
+ DB313F8A17554B71006C0E22 /* SDL_haptic_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDFB12E6671700899322 /* SDL_haptic_c.h */; };
+ DB313F8B17554B71006C0E22 /* SDL_syshaptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDFC12E6671700899322 /* SDL_syshaptic.h */; };
+ DB313F8C17554B71006C0E22 /* SDL_sysjoystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE0812E6671700899322 /* SDL_sysjoystick_c.h */; };
+ DB313F8D17554B71006C0E22 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1712E6671700899322 /* SDL_joystick_c.h */; };
+ DB313F8E17554B71006C0E22 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; };
+ DB313F8F17554B71006C0E22 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; };
+ DB313F9017554B71006C0E22 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; };
+ DB313F9217554B71006C0E22 /* SDL_sysmutex_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8012E6671800899322 /* SDL_sysmutex_c.h */; };
+ DB313F9317554B71006C0E22 /* SDL_systhread_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8312E6671800899322 /* SDL_systhread_c.h */; };
+ DB313F9417554B71006C0E22 /* SDL_systhread.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8B12E6671800899322 /* SDL_systhread.h */; };
+ DB313F9517554B71006C0E22 /* SDL_thread_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8D12E6671800899322 /* SDL_thread_c.h */; };
+ DB313F9617554B71006C0E22 /* SDL_timer_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEA012E6671800899322 /* SDL_timer_c.h */; };
+ DB313F9717554B71006C0E22 /* SDL_cocoaclipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEC212E6671800899322 /* SDL_cocoaclipboard.h */; };
+ DB313F9817554B71006C0E22 /* SDL_cocoaevents.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEC412E6671800899322 /* SDL_cocoaevents.h */; };
+ DB313F9917554B71006C0E22 /* SDL_cocoakeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEC612E6671800899322 /* SDL_cocoakeyboard.h */; };
+ DB313F9A17554B71006C0E22 /* SDL_cocoamodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEC812E6671800899322 /* SDL_cocoamodes.h */; };
+ DB313F9B17554B71006C0E22 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFECA12E6671800899322 /* SDL_cocoamouse.h */; };
+ DB313F9C17554B71006C0E22 /* SDL_cocoaopengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFECC12E6671800899322 /* SDL_cocoaopengl.h */; };
+ DB313F9D17554B71006C0E22 /* SDL_cocoashape.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFECE12E6671800899322 /* SDL_cocoashape.h */; };
+ DB313F9E17554B71006C0E22 /* SDL_cocoavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFED012E6671800899322 /* SDL_cocoavideo.h */; };
+ DB313F9F17554B71006C0E22 /* SDL_cocoawindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFED212E6671800899322 /* SDL_cocoawindow.h */; };
+ DB313FA017554B71006C0E22 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEE912E6671800899322 /* SDL_nullevents_c.h */; };
+ DB313FA117554B71006C0E22 /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFEED12E6671800899322 /* SDL_nullvideo.h */; };
+ DB313FA217554B71006C0E22 /* SDL_blit.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF4F12E6671800899322 /* SDL_blit.h */; };
+ DB313FA317554B71006C0E22 /* SDL_blit_auto.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF5412E6671800899322 /* SDL_blit_auto.h */; };
+ DB313FA417554B71006C0E22 /* SDL_blit_copy.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF5612E6671800899322 /* SDL_blit_copy.h */; };
+ DB313FA517554B71006C0E22 /* SDL_blit_slow.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF5912E6671800899322 /* SDL_blit_slow.h */; };
+ DB313FA617554B71006C0E22 /* SDL_pixels_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF6612E6671800899322 /* SDL_pixels_c.h */; };
+ DB313FA717554B71006C0E22 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF7012E6671800899322 /* SDL_RLEaccel_c.h */; };
+ DB313FA817554B71006C0E22 /* SDL_shape_internals.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF7212E6671800899322 /* SDL_shape_internals.h */; };
+ DB313FA917554B71006C0E22 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFF7512E6671800899322 /* SDL_sysvideo.h */; };
+ DB313FAA17554B71006C0E22 /* imKStoUCS.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFB912E6671800899322 /* imKStoUCS.h */; };
+ DB313FAB17554B71006C0E22 /* SDL_x11clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFBB12E6671800899322 /* SDL_x11clipboard.h */; };
+ DB313FAC17554B71006C0E22 /* SDL_x11dyn.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFBD12E6671800899322 /* SDL_x11dyn.h */; };
+ DB313FAD17554B71006C0E22 /* SDL_x11events.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFBF12E6671800899322 /* SDL_x11events.h */; };
+ DB313FAE17554B71006C0E22 /* SDL_x11keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFC312E6671800899322 /* SDL_x11keyboard.h */; };
+ DB313FAF17554B71006C0E22 /* SDL_x11modes.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFC512E6671800899322 /* SDL_x11modes.h */; };
+ DB313FB017554B71006C0E22 /* SDL_x11mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFC712E6671800899322 /* SDL_x11mouse.h */; };
+ DB313FB117554B71006C0E22 /* SDL_x11opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFC912E6671800899322 /* SDL_x11opengl.h */; };
+ DB313FB217554B71006C0E22 /* SDL_x11opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFCB12E6671800899322 /* SDL_x11opengles.h */; };
+ DB313FB317554B71006C0E22 /* SDL_x11shape.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFCF12E6671800899322 /* SDL_x11shape.h */; };
+ DB313FB417554B71006C0E22 /* SDL_x11sym.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFD012E6671800899322 /* SDL_x11sym.h */; };
+ DB313FB517554B71006C0E22 /* SDL_x11touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFD212E6671800899322 /* SDL_x11touch.h */; };
+ DB313FB617554B71006C0E22 /* SDL_x11video.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFD412E6671800899322 /* SDL_x11video.h */; };
+ DB313FB717554B71006C0E22 /* SDL_x11window.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFFD612E6671800899322 /* SDL_x11window.h */; };
+ DB313FB817554B71006C0E22 /* SDL_sysrender.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2C9F12FA0D680087D585 /* SDL_sysrender.h */; };
+ DB313FB917554B71006C0E22 /* mmx.h in Headers */ = {isa = PBXBuildFile; fileRef = 04409B8D12FA97ED00FB9AA8 /* mmx.h */; };
+ DB313FBA17554B71006C0E22 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04409B8F12FA97ED00FB9AA8 /* SDL_yuv_sw_c.h */; };
+ DB313FBB17554B71006C0E22 /* SDL_nullframebuffer_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7803712FB748500FC43C0 /* SDL_nullframebuffer_c.h */; };
+ DB313FBC17554B71006C0E22 /* SDL_blendfillrect.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7803E12FB74A200FC43C0 /* SDL_blendfillrect.h */; };
+ DB313FBD17554B71006C0E22 /* SDL_blendline.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804012FB74A200FC43C0 /* SDL_blendline.h */; };
+ DB313FBE17554B71006C0E22 /* SDL_blendpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804212FB74A200FC43C0 /* SDL_blendpoint.h */; };
+ DB313FBF17554B71006C0E22 /* SDL_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804312FB74A200FC43C0 /* SDL_draw.h */; };
+ DB313FC017554B71006C0E22 /* SDL_drawline.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804512FB74A200FC43C0 /* SDL_drawline.h */; };
+ DB313FC117554B71006C0E22 /* SDL_drawpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804712FB74A200FC43C0 /* SDL_drawpoint.h */; };
+ DB313FC217554B71006C0E22 /* SDL_render_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0442EC1A12FE1BCB004C9285 /* SDL_render_sw_c.h */; };
+ DB313FC317554B71006C0E22 /* SDL_x11framebuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0442EC5912FE1C60004C9285 /* SDL_x11framebuffer.h */; };
+ DB313FC417554B71006C0E22 /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
+ DB313FC517554B71006C0E22 /* SDL_shaders_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0435673D1303160F00BA5428 /* SDL_shaders_gl.h */; };
+ DB313FC617554B71006C0E22 /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AC9159367B7005138DD /* SDL_rotate.h */; };
+ DB313FC717554B71006C0E22 /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
+ DB313FC817554B71006C0E22 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; };
+ DB313FC917554B71006C0E22 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; };
+ DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; };
+ DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; };
+ DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; };
+ DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; };
+ DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; };
+ DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; };
+ DB313FD017554B71006C0E22 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; };
+ DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; };
+ DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; };
+ DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; };
+ DB313FD417554B71006C0E22 /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; };
+ DB313FD517554B71006C0E22 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; };
+ DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; };
+ DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; };
+ DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; };
+ DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; };
+ DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; };
+ DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; };
+ DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; };
+ DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; };
+ DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; };
+ DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; };
+ DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; };
+ DB313FE117554B71006C0E22 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; };
+ DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; };
+ DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; };
+ DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; };
+ DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; };
+ DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; };
+ DB313FE717554B71006C0E22 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; };
+ DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; };
+ DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; };
+ DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; };
+ DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; };
+ DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; };
+ DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; };
+ DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; };
+ DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; };
+ DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; };
+ DB313FF117554B71006C0E22 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; };
+ DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; };
+ DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
+ DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
+ DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
+ DB313FF617554B71006C0E22 /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
+ DB313FF717554B71006C0E22 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
+ DB313FF817554B71006C0E22 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
+ DB313FF917554B71006C0E22 /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
+ DB313FFA17554B71006C0E22 /* SDL_cocoamessagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AABCC38B164063D200AB8930 /* SDL_cocoamessagebox.h */; };
+ DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; };
+ DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
+ DB313FFE17554B71006C0E22 /* SDL_atomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD7412E6671700899322 /* SDL_atomic.c */; };
+ DB313FFF17554B71006C0E22 /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD7512E6671700899322 /* SDL_spinlock.c */; };
+ DB31400017554B71006C0E22 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; };
+ DB31400117554B71006C0E22 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; };
+ DB31400217554B71006C0E22 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDA012E6671700899322 /* SDL_coreaudio.c */; };
+ DB31400317554B71006C0E22 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB412E6671700899322 /* SDL_audio.c */; };
+ DB31400417554B71006C0E22 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; };
+ DB31400517554B71006C0E22 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; };
+ DB31400617554B71006C0E22 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
+ DB31400717554B71006C0E22 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
+ DB31400817554B71006C0E22 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC312E6671700899322 /* SDL_wave.c */; };
+ DB31400917554B71006C0E22 /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDD412E6671700899322 /* SDL_cpuinfo.c */; };
+ DB31400A17554B71006C0E22 /* SDL_clipboardevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDDC12E6671700899322 /* SDL_clipboardevents.c */; };
+ DB31400B17554B71006C0E22 /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDDE12E6671700899322 /* SDL_events.c */; };
+ DB31400C17554B71006C0E22 /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */; };
+ DB31400D17554B71006C0E22 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDE012E6671700899322 /* SDL_gesture.c */; };
+ DB31400E17554B71006C0E22 /* SDL_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDE212E6671700899322 /* SDL_keyboard.c */; };
+ DB31400F17554B71006C0E22 /* SDL_mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDE412E6671700899322 /* SDL_mouse.c */; };
+ DB31401017554B71006C0E22 /* SDL_quit.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDE612E6671700899322 /* SDL_quit.c */; };
+ DB31401117554B71006C0E22 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDE812E6671700899322 /* SDL_touch.c */; };
+ DB31401217554B71006C0E22 /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDEA12E6671700899322 /* SDL_windowevents.c */; };
+ DB31401317554B71006C0E22 /* SDL_rwopsbundlesupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDEF12E6671700899322 /* SDL_rwopsbundlesupport.m */; };
+ DB31401417554B71006C0E22 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDF012E6671700899322 /* SDL_rwops.c */; };
+ DB31401517554B71006C0E22 /* SDL_syshaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDF312E6671700899322 /* SDL_syshaptic.c */; };
+ DB31401617554B71006C0E22 /* SDL_haptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDFA12E6671700899322 /* SDL_haptic.c */; };
+ DB31401717554B71006C0E22 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE0712E6671700899322 /* SDL_sysjoystick.c */; };
+ DB31401817554B71006C0E22 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; };
+ DB31401917554B71006C0E22 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE1612E6671700899322 /* SDL_joystick.c */; };
+ DB31401A17554B71006C0E22 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3312E6671700899322 /* SDL_sysloadso.c */; };
+ DB31401B17554B71006C0E22 /* SDL_syspower.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4B12E6671700899322 /* SDL_syspower.c */; };
+ DB31401C17554B71006C0E22 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; };
+ DB31401D17554B71006C0E22 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; };
+ DB31401E17554B71006C0E22 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; };
+ DB31402017554B71006C0E22 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; };
+ DB31402117554B71006C0E22 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; };
+ DB31402217554B71006C0E22 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; };
+ DB31402317554B71006C0E22 /* SDL_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE6012E6671700899322 /* SDL_malloc.c */; };
+ DB31402417554B71006C0E22 /* SDL_qsort.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE6112E6671700899322 /* SDL_qsort.c */; };
+ DB31402517554B71006C0E22 /* SDL_stdlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE6212E6671700899322 /* SDL_stdlib.c */; };
+ DB31402617554B71006C0E22 /* SDL_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE6312E6671700899322 /* SDL_string.c */; };
+ DB31402717554B71006C0E22 /* SDL_syscond.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE7E12E6671800899322 /* SDL_syscond.c */; };
+ DB31402817554B71006C0E22 /* SDL_sysmutex.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE7F12E6671800899322 /* SDL_sysmutex.c */; };
+ DB31402917554B71006C0E22 /* SDL_syssem.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE8112E6671800899322 /* SDL_syssem.c */; };
+ DB31402A17554B71006C0E22 /* SDL_systhread.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE8212E6671800899322 /* SDL_systhread.c */; };
+ DB31402B17554B71006C0E22 /* SDL_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE8C12E6671800899322 /* SDL_thread.c */; };
+ DB31402C17554B71006C0E22 /* SDL_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE9F12E6671800899322 /* SDL_timer.c */; };
+ DB31402D17554B71006C0E22 /* SDL_systimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEA212E6671800899322 /* SDL_systimer.c */; };
+ DB31402E17554B71006C0E22 /* SDL_cocoaclipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEC312E6671800899322 /* SDL_cocoaclipboard.m */; };
+ DB31402F17554B71006C0E22 /* SDL_cocoaevents.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEC512E6671800899322 /* SDL_cocoaevents.m */; };
+ DB31403017554B71006C0E22 /* SDL_cocoakeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEC712E6671800899322 /* SDL_cocoakeyboard.m */; };
+ DB31403117554B71006C0E22 /* SDL_cocoamodes.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEC912E6671800899322 /* SDL_cocoamodes.m */; };
+ DB31403217554B71006C0E22 /* SDL_cocoamouse.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFECB12E6671800899322 /* SDL_cocoamouse.m */; };
+ DB31403317554B71006C0E22 /* SDL_cocoaopengl.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFECD12E6671800899322 /* SDL_cocoaopengl.m */; };
+ DB31403417554B71006C0E22 /* SDL_cocoashape.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFECF12E6671800899322 /* SDL_cocoashape.m */; };
+ DB31403517554B71006C0E22 /* SDL_cocoavideo.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFED112E6671800899322 /* SDL_cocoavideo.m */; };
+ DB31403617554B71006C0E22 /* SDL_cocoawindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFED312E6671800899322 /* SDL_cocoawindow.m */; };
+ DB31403717554B71006C0E22 /* SDL_nullevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEE812E6671800899322 /* SDL_nullevents.c */; };
+ DB31403817554B71006C0E22 /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFEEC12E6671800899322 /* SDL_nullvideo.c */; };
+ DB31403917554B71006C0E22 /* SDL_blit.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF4E12E6671800899322 /* SDL_blit.c */; };
+ DB31403A17554B71006C0E22 /* SDL_blit_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5012E6671800899322 /* SDL_blit_0.c */; };
+ DB31403B17554B71006C0E22 /* SDL_blit_1.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5112E6671800899322 /* SDL_blit_1.c */; };
+ DB31403C17554B71006C0E22 /* SDL_blit_A.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5212E6671800899322 /* SDL_blit_A.c */; };
+ DB31403D17554B71006C0E22 /* SDL_blit_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5312E6671800899322 /* SDL_blit_auto.c */; };
+ DB31403E17554B71006C0E22 /* SDL_blit_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5512E6671800899322 /* SDL_blit_copy.c */; };
+ DB31403F17554B71006C0E22 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5712E6671800899322 /* SDL_blit_N.c */; };
+ DB31404017554B71006C0E22 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5812E6671800899322 /* SDL_blit_slow.c */; };
+ DB31404117554B71006C0E22 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5A12E6671800899322 /* SDL_bmp.c */; };
+ DB31404217554B71006C0E22 /* SDL_clipboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF5B12E6671800899322 /* SDL_clipboard.c */; };
+ DB31404317554B71006C0E22 /* SDL_fillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF6012E6671800899322 /* SDL_fillrect.c */; };
+ DB31404417554B71006C0E22 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF6512E6671800899322 /* SDL_pixels.c */; };
+ DB31404517554B71006C0E22 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF6712E6671800899322 /* SDL_rect.c */; };
+ DB31404617554B71006C0E22 /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF6F12E6671800899322 /* SDL_RLEaccel.c */; };
+ DB31404717554B71006C0E22 /* SDL_shape.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF7112E6671800899322 /* SDL_shape.c */; };
+ DB31404817554B71006C0E22 /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF7312E6671800899322 /* SDL_stretch.c */; };
+ DB31404917554B71006C0E22 /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF7412E6671800899322 /* SDL_surface.c */; };
+ DB31404A17554B71006C0E22 /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFF7612E6671800899322 /* SDL_video.c */; };
+ DB31404B17554B71006C0E22 /* imKStoUCS.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFB812E6671800899322 /* imKStoUCS.c */; };
+ DB31404C17554B71006C0E22 /* SDL_x11clipboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFBA12E6671800899322 /* SDL_x11clipboard.c */; };
+ DB31404D17554B71006C0E22 /* SDL_x11dyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFBC12E6671800899322 /* SDL_x11dyn.c */; };
+ DB31404E17554B71006C0E22 /* SDL_x11events.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFBE12E6671800899322 /* SDL_x11events.c */; };
+ DB31404F17554B71006C0E22 /* SDL_x11keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFC212E6671800899322 /* SDL_x11keyboard.c */; };
+ DB31405017554B71006C0E22 /* SDL_x11modes.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFC412E6671800899322 /* SDL_x11modes.c */; };
+ DB31405117554B71006C0E22 /* SDL_x11mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFC612E6671800899322 /* SDL_x11mouse.c */; };
+ DB31405217554B71006C0E22 /* SDL_x11opengl.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFC812E6671800899322 /* SDL_x11opengl.c */; };
+ DB31405317554B71006C0E22 /* SDL_x11opengles.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFCA12E6671800899322 /* SDL_x11opengles.c */; };
+ DB31405417554B71006C0E22 /* SDL_x11shape.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFCE12E6671800899322 /* SDL_x11shape.c */; };
+ DB31405517554B71006C0E22 /* SDL_x11touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFD112E6671800899322 /* SDL_x11touch.c */; };
+ DB31405617554B71006C0E22 /* SDL_x11video.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFD312E6671800899322 /* SDL_x11video.c */; };
+ DB31405717554B71006C0E22 /* SDL_x11window.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFFD512E6671800899322 /* SDL_x11window.c */; };
+ DB31405817554B71006C0E22 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2C9E12FA0D680087D585 /* SDL_render.c */; };
+ DB31405917554B71006C0E22 /* SDL_yuv_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 04409B8E12FA97ED00FB9AA8 /* SDL_yuv_mmx.c */; };
+ DB31405A17554B71006C0E22 /* SDL_yuv_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 04409B9012FA97ED00FB9AA8 /* SDL_yuv_sw.c */; };
+ DB31405B17554B71006C0E22 /* SDL_nullframebuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7803812FB748500FC43C0 /* SDL_nullframebuffer.c */; };
+ DB31405C17554B71006C0E22 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7803D12FB74A200FC43C0 /* SDL_blendfillrect.c */; };
+ DB31405D17554B71006C0E22 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7803F12FB74A200FC43C0 /* SDL_blendline.c */; };
+ DB31405E17554B71006C0E22 /* SDL_blendpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7804112FB74A200FC43C0 /* SDL_blendpoint.c */; };
+ DB31405F17554B71006C0E22 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7804412FB74A200FC43C0 /* SDL_drawline.c */; };
+ DB31406017554B71006C0E22 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7804612FB74A200FC43C0 /* SDL_drawpoint.c */; };
+ DB31406117554B71006C0E22 /* SDL_render_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0442EC1712FE1BBA004C9285 /* SDL_render_gl.c */; };
+ DB31406217554B71006C0E22 /* SDL_render_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 0442EC1B12FE1BCB004C9285 /* SDL_render_sw.c */; };
+ DB31406317554B71006C0E22 /* SDL_x11framebuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0442EC5812FE1C60004C9285 /* SDL_x11framebuffer.c */; };
+ DB31406417554B71006C0E22 /* SDL_hints.c in Sources */ = {isa = PBXBuildFile; fileRef = 0442EC5E12FE1C75004C9285 /* SDL_hints.c */; };
+ DB31406517554B71006C0E22 /* SDL_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BAC0C71300C2160055DE28 /* SDL_log.c */; };
+ DB31406617554B71006C0E22 /* SDL_shaders_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0435673C1303160F00BA5428 /* SDL_shaders_gl.c */; };
+ DB31406717554B71006C0E22 /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AC8159367B7005138DD /* SDL_rotate.c */; };
+ DB31406817554B71006C0E22 /* SDL_x11xinput2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628ACF159367F2005138DD /* SDL_x11xinput2.c */; };
+ DB31406917554B71006C0E22 /* SDL_x11messagebox.c in Sources */ = {isa = PBXBuildFile; fileRef = AA9E4092163BE51E007A2AD0 /* SDL_x11messagebox.c */; };
+ DB31406A17554B71006C0E22 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; };
+ DB31406C17554B71006C0E22 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
+ DB31406D17554B71006C0E22 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
+ DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; };
+ DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; };
+ DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; };
+ DB31407117554B71006C0E22 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; };
+ DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
+ DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; };
+ DB31408D17554D3C006C0E22 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 008310451072EA9000A531F1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 0083103F1072EA5700A531F1;
- remoteInfo = "Generate Doxygen DocSet";
- };
- 00D8DA2E1195094500638393 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = BECDF5FE0761BA81005FE872;
- remoteInfo = Framework;
- };
BECDF6C50761BA81005FE872 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -576,40 +787,7 @@
};
/* End PBXContainerItemProxy section */
-/* Begin PBXCopyFilesBuildPhase section */
- 006E9491119510E1001DE610 /* Copy Frameworks */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 006E94F01195125B001DE610 /* SDL2.framework in Copy Frameworks */,
- );
- name = "Copy Frameworks";
- runOnlyForDeploymentPostprocessing = 0;
- };
- 006E94B3119511CE001DE610 /* Copy rwops */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = rwops;
- dstSubfolderSpec = 7;
- files = (
- 006E94BC11951217001DE610 /* read in Copy rwops */,
- );
- name = "Copy rwops";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
/* Begin PBXFileReference section */
- 001E39EC1196F75000A3F5B8 /* TestSupportRWops_Cocoa.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestSupportRWops_Cocoa.m; sourceTree = ""; };
- 001E39ED1196F75000A3F5B8 /* TestSupportRWops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestSupportRWops.h; sourceTree = ""; };
- 006E949C119511A1001DE610 /* icon.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = icon.bmp; path = ../../test/icon.bmp; sourceTree = SOURCE_ROOT; };
- 006E949D119511A1001DE610 /* moose.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = moose.dat; path = ../../test/moose.dat; sourceTree = SOURCE_ROOT; };
- 006E949E119511A1001DE610 /* picture.xbm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = picture.xbm; path = ../../test/picture.xbm; sourceTree = SOURCE_ROOT; };
- 006E94A0119511A1001DE610 /* sample.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = sample.bmp; path = ../../test/sample.bmp; sourceTree = SOURCE_ROOT; };
- 006E94A1119511A1001DE610 /* sample.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = sample.wav; path = ../../test/sample.wav; sourceTree = SOURCE_ROOT; };
- 006E94A2119511A1001DE610 /* utf8.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = utf8.txt; path = ../../test/utf8.txt; sourceTree = SOURCE_ROOT; };
0073179B0858DECD00B2BC32 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; };
0073179C0858DECD00B2BC32 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; };
0073179D0858DECD00B2BC32 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
@@ -617,38 +795,10 @@
0073179F0858DECD00B2BC32 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; };
007317A00858DECD00B2BC32 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; };
007317C10858E15000B2BC32 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; };
- 00794D3F09D0C461003FC8A1 /* License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = License.rtf; sourceTree = ""; };
+ 00794D3F09D0C461003FC8A1 /* License.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = License.txt; sourceTree = ""; };
00AE6E1E08B958CC00255E2F /* ReadMeDevLite.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMeDevLite.txt; sourceTree = ""; };
00CFA89C106B4BA100758660 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = ""; };
00D0D08310675DD9004B05EF /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; };
- 00D8D9EF1195090700638393 /* testsdl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testsdl.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 00D8D9F11195090700638393 /* testsdl-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "testsdl-Info.plist"; sourceTree = ""; };
- 00D8D9FC1195093100638393 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio.c; sourceTree = ""; };
- 00D8D9FD1195093100638393 /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio.h; sourceTree = ""; };
- 00D8D9FF1195093100638393 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = ""; };
- 00D8DA001195093100638393 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; };
- 00D8DA011195093100638393 /* images.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = images.h; sourceTree = ""; };
- 00D8DA021195093100638393 /* img_blit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_blit.c; sourceTree = ""; };
- 00D8DA031195093100638393 /* img_blitblend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_blitblend.c; sourceTree = ""; };
- 00D8DA041195093100638393 /* img_face.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_face.c; sourceTree = ""; };
- 00D8DA051195093100638393 /* img_primitives.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_primitives.c; sourceTree = ""; };
- 00D8DA061195093100638393 /* img_primitivesblend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_primitivesblend.c; sourceTree = ""; };
- 00D8DA081195093100638393 /* platform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = platform.c; sourceTree = ""; };
- 00D8DA091195093100638393 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = ""; };
- 00D8DA0A1195093100638393 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../../test/automated/README; sourceTree = SOURCE_ROOT; };
- 00D8DA0C1195093100638393 /* rect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rect.c; sourceTree = ""; };
- 00D8DA0D1195093100638393 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = ""; };
- 00D8DA0F1195093100638393 /* render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = render.c; sourceTree = ""; };
- 00D8DA101195093100638393 /* render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render.h; sourceTree = ""; };
- 00D8DA121195093100638393 /* read */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = read; sourceTree = ""; };
- 00D8DA131195093100638393 /* rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rwops.c; sourceTree = ""; };
- 00D8DA141195093100638393 /* rwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rwops.h; sourceTree = ""; };
- 00D8DA151195093100638393 /* SDL_at.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_at.c; path = ../../test/automated/SDL_at.c; sourceTree = SOURCE_ROOT; };
- 00D8DA161195093100638393 /* SDL_at.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_at.h; path = ../../test/automated/SDL_at.h; sourceTree = SOURCE_ROOT; };
- 00D8DA181195093100638393 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = surface.c; sourceTree = ""; };
- 00D8DA191195093100638393 /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = ""; };
- 00D8DA1A1195093100638393 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; };
- 00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = UniversalBinaryNotes.rtf; sourceTree = ""; };
04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = ""; };
041B2C9E12FA0D680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = ""; };
041B2C9F12FA0D680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = ""; };
@@ -725,8 +875,6 @@
04BDFE5612E6671700899322 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = SOURCE_ROOT; };
04BDFE5812E6671700899322 /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_error_c.h; path = ../../src/SDL_error_c.h; sourceTree = SOURCE_ROOT; };
04BDFE5912E6671700899322 /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = SOURCE_ROOT; };
- 04BDFE5A12E6671700899322 /* SDL_fatal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_fatal.c; path = ../../src/SDL_fatal.c; sourceTree = SOURCE_ROOT; };
- 04BDFE5B12E6671700899322 /* SDL_fatal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_fatal.h; path = ../../src/SDL_fatal.h; sourceTree = SOURCE_ROOT; };
04BDFE5C12E6671700899322 /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL.c; path = ../../src/SDL.c; sourceTree = SOURCE_ROOT; };
04BDFE5E12E6671700899322 /* SDL_getenv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_getenv.c; sourceTree = ""; };
04BDFE5F12E6671700899322 /* SDL_iconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iconv.c; sourceTree = ""; };
@@ -837,6 +985,7 @@
566CDE8D148F0AC200C5A9BB /* SDL_dropevents_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dropevents_c.h; sourceTree = ""; };
566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dropevents.c; sourceTree = ""; };
A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = ""; };
+ AA0F8490178D5ECC00823F9D /* SDL_systls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_systls.c; sourceTree = ""; };
AA628AC8159367B7005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = ""; };
AA628AC9159367B7005138DD /* SDL_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = ""; };
AA628ACF159367F2005138DD /* SDL_x11xinput2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11xinput2.c; sourceTree = ""; };
@@ -901,27 +1050,21 @@
BECDF66C0761BA81005FE872 /* SDL2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BECDF6B30761BA81005FE872 /* libSDL2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2.a; sourceTree = BUILT_PRODUCTS_DIR; };
BECDF6BE0761BA81005FE872 /* Standard DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Standard DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
- BECDF6C30761BA81005FE872 /* Developer Extras Package */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Developer Extras Package"; sourceTree = BUILT_PRODUCTS_DIR; };
+ D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoamousetap.h; sourceTree = ""; };
+ D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoamousetap.m; sourceTree = ""; };
+ DB31407717554B71006C0E22 /* libSDL2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSDL2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
F59C70FF00D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; };
F59C710000D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = ""; };
F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; };
F59C710500D5CB5801000001 /* SDL-devel.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "SDL-devel.info"; sourceTree = ""; };
F59C710600D5CB5801000001 /* SDL.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL.info; sourceTree = ""; };
F59C710C00D5D15801000001 /* install.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = ""; };
- F5A2EF3900C6A39A01000001 /* BUGS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = BUGS; path = ../../BUGS; sourceTree = SOURCE_ROOT; };
- F5A2EF3A00C6A3C201000001 /* README.MacOSX */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = README.MacOSX; path = ../../README.MacOSX; sourceTree = SOURCE_ROOT; };
+ F5A2EF3900C6A39A01000001 /* BUGS.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = BUGS.txt; path = ../../BUGS.txt; sourceTree = SOURCE_ROOT; };
+ F5A2EF3A00C6A3C201000001 /* README-macosx.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "README-macosx.txt"; path = "../../README-macosx.txt"; sourceTree = SOURCE_ROOT; };
F5F81AD400D706B101000001 /* Readme SDL Developer.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = "Readme SDL Developer.txt"; path = "pkg-support/Readme SDL Developer.txt"; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 00D8D9ED1195090700638393 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 006E94EF11951255001DE610 /* SDL2.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
BECDF6680761BA81005FE872 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -949,122 +1092,28 @@
007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */,
007317AE0858DECD00B2BC32 /* OpenGL.framework in Frameworks */,
007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */,
+ DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB31406B17554B71006C0E22 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB31406C17554B71006C0E22 /* AudioToolbox.framework in Frameworks */,
+ DB31406D17554B71006C0E22 /* AudioUnit.framework in Frameworks */,
+ DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */,
+ DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */,
+ DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */,
+ DB31407117554B71006C0E22 /* OpenGL.framework in Frameworks */,
+ DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */,
+ DB31408D17554D3C006C0E22 /* ForceFeedback.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 006E949B11951160001DE610 /* TestResources */ = {
- isa = PBXGroup;
- children = (
- 006E949C119511A1001DE610 /* icon.bmp */,
- 006E949D119511A1001DE610 /* moose.dat */,
- 006E949E119511A1001DE610 /* picture.xbm */,
- 006E94A0119511A1001DE610 /* sample.bmp */,
- 006E94A1119511A1001DE610 /* sample.wav */,
- 006E94A2119511A1001DE610 /* utf8.txt */,
- );
- name = TestResources;
- sourceTree = "";
- };
- 00D8D9FA1195091500638393 /* AutomatedTests */ = {
- isa = PBXGroup;
- children = (
- 00D8D9FB1195093100638393 /* audio */,
- 00D8D9FE1195093100638393 /* common */,
- 00D8DA071195093100638393 /* platform */,
- 00D8DA0A1195093100638393 /* README */,
- 00D8DA0B1195093100638393 /* rect */,
- 00D8DA0E1195093100638393 /* render */,
- 00D8DA111195093100638393 /* rwops */,
- 00D8DA151195093100638393 /* SDL_at.c */,
- 00D8DA161195093100638393 /* SDL_at.h */,
- 00D8DA171195093100638393 /* surface */,
- 00D8DA1A1195093100638393 /* testsdl.c */,
- );
- name = AutomatedTests;
- sourceTree = "";
- };
- 00D8D9FB1195093100638393 /* audio */ = {
- isa = PBXGroup;
- children = (
- 00D8D9FC1195093100638393 /* audio.c */,
- 00D8D9FD1195093100638393 /* audio.h */,
- );
- name = audio;
- path = ../../test/automated/audio;
- sourceTree = SOURCE_ROOT;
- };
- 00D8D9FE1195093100638393 /* common */ = {
- isa = PBXGroup;
- children = (
- 00D8D9FF1195093100638393 /* common.c */,
- 00D8DA001195093100638393 /* common.h */,
- 00D8DA011195093100638393 /* images.h */,
- 00D8DA021195093100638393 /* img_blit.c */,
- 00D8DA031195093100638393 /* img_blitblend.c */,
- 00D8DA041195093100638393 /* img_face.c */,
- 00D8DA051195093100638393 /* img_primitives.c */,
- 00D8DA061195093100638393 /* img_primitivesblend.c */,
- );
- name = common;
- path = ../../test/automated/common;
- sourceTree = SOURCE_ROOT;
- };
- 00D8DA071195093100638393 /* platform */ = {
- isa = PBXGroup;
- children = (
- 00D8DA081195093100638393 /* platform.c */,
- 00D8DA091195093100638393 /* platform.h */,
- );
- name = platform;
- path = ../../test/automated/platform;
- sourceTree = SOURCE_ROOT;
- };
- 00D8DA0B1195093100638393 /* rect */ = {
- isa = PBXGroup;
- children = (
- 00D8DA0C1195093100638393 /* rect.c */,
- 00D8DA0D1195093100638393 /* rect.h */,
- );
- name = rect;
- path = ../../test/automated/rect;
- sourceTree = SOURCE_ROOT;
- };
- 00D8DA0E1195093100638393 /* render */ = {
- isa = PBXGroup;
- children = (
- 00D8DA0F1195093100638393 /* render.c */,
- 00D8DA101195093100638393 /* render.h */,
- );
- name = render;
- path = ../../test/automated/render;
- sourceTree = SOURCE_ROOT;
- };
- 00D8DA111195093100638393 /* rwops */ = {
- isa = PBXGroup;
- children = (
- 001E39EC1196F75000A3F5B8 /* TestSupportRWops_Cocoa.m */,
- 001E39ED1196F75000A3F5B8 /* TestSupportRWops.h */,
- 00D8DA121195093100638393 /* read */,
- 00D8DA131195093100638393 /* rwops.c */,
- 00D8DA141195093100638393 /* rwops.h */,
- );
- name = rwops;
- path = ../../test/automated/rwops;
- sourceTree = SOURCE_ROOT;
- };
- 00D8DA171195093100638393 /* surface */ = {
- isa = PBXGroup;
- children = (
- 00D8DA181195093100638393 /* surface.c */,
- 00D8DA191195093100638393 /* surface.h */,
- );
- name = surface;
- path = ../../test/automated/surface;
- sourceTree = SOURCE_ROOT;
- };
0153844A006D81B07F000001 /* Public Headers */ = {
isa = PBXGroup;
children = (
@@ -1133,8 +1182,7 @@
BECDF66C0761BA81005FE872 /* SDL2.framework */,
BECDF6B30761BA81005FE872 /* libSDL2.a */,
BECDF6BE0761BA81005FE872 /* Standard DMG */,
- BECDF6C30761BA81005FE872 /* Developer Extras Package */,
- 00D8D9EF1195090700638393 /* testsdl.app */,
+ DB31407717554B71006C0E22 /* libSDL2.dylib */,
);
name = Products;
sourceTree = "";
@@ -1418,6 +1466,7 @@
04BDFE8112E6671800899322 /* SDL_syssem.c */,
04BDFE8212E6671800899322 /* SDL_systhread.c */,
04BDFE8312E6671800899322 /* SDL_systhread_c.h */,
+ AA0F8490178D5ECC00823F9D /* SDL_systls.c */,
);
path = pthread;
sourceTree = "";
@@ -1493,6 +1542,8 @@
04BDFEC912E6671800899322 /* SDL_cocoamodes.m */,
04BDFECA12E6671800899322 /* SDL_cocoamouse.h */,
04BDFECB12E6671800899322 /* SDL_cocoamouse.m */,
+ D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */,
+ D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */,
04BDFECC12E6671800899322 /* SDL_cocoaopengl.h */,
04BDFECD12E6671800899322 /* SDL_cocoaopengl.m */,
04BDFECE12E6671800899322 /* SDL_cocoashape.h */,
@@ -1560,21 +1611,21 @@
0867D691FE84028FC02AAC07 /* SDLFramework */ = {
isa = PBXGroup;
children = (
- F5A2EF3900C6A39A01000001 /* BUGS */,
- F5A2EF3A00C6A3C201000001 /* README.MacOSX */,
+ F5A2EF3900C6A39A01000001 /* BUGS.txt */,
+ F5A2EF3A00C6A3C201000001 /* README-macosx.txt */,
F59C70FC00D5CB5801000001 /* pkg-support */,
0153844A006D81B07F000001 /* Public Headers */,
08FB77ACFE841707C02AAC07 /* Library Source */,
- 00D8D9FA1195091500638393 /* AutomatedTests */,
- 006E949B11951160001DE610 /* TestResources */,
034768DDFF38A45A11DB9C8B /* Products */,
BECDF66B0761BA81005FE872 /* Info-Framework.plist */,
BEC562FE0761C0E800A33029 /* Linked Frameworks */,
- 00D8D9F11195090700638393 /* testsdl-Info.plist */,
);
comments = "To build Universal Binaries, we have experimented with a variety of different options.\nThe complication is that we must retain compatibility with at least 10.2. \nThe Universal Binary defaults only work for > 10.3.9\n\nSo far, we have found:\ngcc 4.0.0 with Xcode 2.1 always links against libgcc_s. gcc 4.0.1 from Xcode 2.2 fixes this problem.\n\nBut gcc 4.0 will not work with < 10.3.9 because we continue to get an undefined symbol to _fprintf$LDBL128.\nSo we must use gcc 3.3 on PPC to accomplish 10.2 support. (But 4.0 is required for i386.)\n\nSetting the deployment target to 10.4 will disable prebinding, so for PPC, we set it less than 10.4 to preserve prebinding for legacy support.\n\nSetting the PPC SDKROOT to /Developers/SDKs/MacOSX10.2.8.sdk will link to 63.0.0 libSystem.B.dylib. Leaving it at current or 10.4u links to 88.1.2. However, as long as we are using gcc 3.3, it doesn't seem to matter as testing has demonstrated both will run. We have decided not to invoke the 10.2.8 SDK because it is not a default installed component with Xcode which will probably cause most people problems. However, rather than deleting the SDKROOT_ppc entry entirely, we have mapped it to 10.4u in case we decide we need to change this setting.\n\nTo use Altivec or SSE, we needed architecture specific flags:\nOTHER_CFLAGS_ppc\nOTHER_CFLAGS_i386\nOTHER_CFLAGS=$(OTHER_CFLAGS_($CURRENT_ARCH))\n\nThe general OTHER_CFLAGS needed to be manually mapped to architecture specific options because Xcode didn't do this automatically for us.\n\n\n";
+ indentWidth = 4;
name = SDLFramework;
sourceTree = "";
+ tabWidth = 4;
+ usesTabs = 0;
};
089C1665FE841158C02AAC07 /* Resources */ = {
isa = PBXGroup;
@@ -1604,8 +1655,6 @@
04BDFE5612E6671700899322 /* SDL_assert.c */,
04BDFE5812E6671700899322 /* SDL_error_c.h */,
04BDFE5912E6671700899322 /* SDL_error.c */,
- 04BDFE5A12E6671700899322 /* SDL_fatal.c */,
- 04BDFE5B12E6671700899322 /* SDL_fatal.h */,
0442EC5E12FE1C75004C9285 /* SDL_hints.c */,
04BAC0C71300C2160055DE28 /* SDL_log.c */,
04BDFE5C12E6671700899322 /* SDL.c */,
@@ -1654,8 +1703,7 @@
F59C710100D5CB5801000001 /* resources */ = {
isa = PBXGroup;
children = (
- 00794D3F09D0C461003FC8A1 /* License.rtf */,
- 00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */,
+ 00794D3F09D0C461003FC8A1 /* License.txt */,
00AE6E1E08B958CC00255E2F /* ReadMeDevLite.txt */,
F59C710300D5CB5801000001 /* ReadMe.txt */,
);
@@ -1750,7 +1798,6 @@
04BD007212E6671800899322 /* SDL_sysjoystick.h in Headers */,
04BD009B12E6671800899322 /* SDL_assert_c.h in Headers */,
04BD009E12E6671800899322 /* SDL_error_c.h in Headers */,
- 04BD00A112E6671800899322 /* SDL_fatal.h in Headers */,
04BD00BF12E6671800899322 /* SDL_sysmutex_c.h in Headers */,
04BD00C212E6671800899322 /* SDL_systhread_c.h in Headers */,
04BD00C912E6671800899322 /* SDL_systhread.h in Headers */,
@@ -1808,6 +1855,7 @@
AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */,
AABCC38D164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */,
AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */,
+ D55A1B81179F262300625D7C /* SDL_cocoamousetap.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1844,7 +1892,6 @@
04BD028D12E6671800899322 /* SDL_sysjoystick.h in Headers */,
04BD02B512E6671800899322 /* SDL_assert_c.h in Headers */,
04BD02B812E6671800899322 /* SDL_error_c.h in Headers */,
- 04BD02BB12E6671800899322 /* SDL_fatal.h in Headers */,
04BD02D912E6671800899322 /* SDL_sysmutex_c.h in Headers */,
04BD02DC12E6671800899322 /* SDL_systhread_c.h in Headers */,
04BD02E312E6671800899322 /* SDL_systhread.h in Headers */,
@@ -1952,32 +1999,157 @@
AABCC38E164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */,
A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */,
AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */,
+ D55A1B85179F278E00625D7C /* SDL_cocoamousetap.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB313F7317554B71006C0E22 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB313F7417554B71006C0E22 /* SDL_diskaudio.h in Headers */,
+ DB313F7517554B71006C0E22 /* SDL_dummyaudio.h in Headers */,
+ DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */,
+ DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */,
+ DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */,
+ DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */,
+ DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */,
+ DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */,
+ DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */,
+ DB313F7D17554B71006C0E22 /* default_cursor.h in Headers */,
+ DB313F7E17554B71006C0E22 /* scancodes_darwin.h in Headers */,
+ DB313F7F17554B71006C0E22 /* scancodes_linux.h in Headers */,
+ DB313F8017554B71006C0E22 /* scancodes_xfree86.h in Headers */,
+ DB313F8117554B71006C0E22 /* SDL_clipboardevents_c.h in Headers */,
+ DB313F8217554B71006C0E22 /* SDL_events_c.h in Headers */,
+ DB313F8317554B71006C0E22 /* SDL_gesture_c.h in Headers */,
+ DB313F8417554B71006C0E22 /* SDL_keyboard_c.h in Headers */,
+ DB313F8517554B71006C0E22 /* SDL_mouse_c.h in Headers */,
+ DB313F8617554B71006C0E22 /* SDL_sysevents.h in Headers */,
+ DB313F8717554B71006C0E22 /* SDL_touch_c.h in Headers */,
+ DB313F8817554B71006C0E22 /* SDL_windowevents_c.h in Headers */,
+ DB313F8917554B71006C0E22 /* SDL_rwopsbundlesupport.h in Headers */,
+ DB313F8A17554B71006C0E22 /* SDL_haptic_c.h in Headers */,
+ DB313F8B17554B71006C0E22 /* SDL_syshaptic.h in Headers */,
+ DB313F8C17554B71006C0E22 /* SDL_sysjoystick_c.h in Headers */,
+ DB313F8D17554B71006C0E22 /* SDL_joystick_c.h in Headers */,
+ DB313F8E17554B71006C0E22 /* SDL_sysjoystick.h in Headers */,
+ DB313F8F17554B71006C0E22 /* SDL_assert_c.h in Headers */,
+ DB313F9017554B71006C0E22 /* SDL_error_c.h in Headers */,
+ DB313F9217554B71006C0E22 /* SDL_sysmutex_c.h in Headers */,
+ DB313F9317554B71006C0E22 /* SDL_systhread_c.h in Headers */,
+ DB313F9417554B71006C0E22 /* SDL_systhread.h in Headers */,
+ DB313F9517554B71006C0E22 /* SDL_thread_c.h in Headers */,
+ DB313F9617554B71006C0E22 /* SDL_timer_c.h in Headers */,
+ DB313F9717554B71006C0E22 /* SDL_cocoaclipboard.h in Headers */,
+ DB313F9817554B71006C0E22 /* SDL_cocoaevents.h in Headers */,
+ DB313F9917554B71006C0E22 /* SDL_cocoakeyboard.h in Headers */,
+ DB313F9A17554B71006C0E22 /* SDL_cocoamodes.h in Headers */,
+ DB313F9B17554B71006C0E22 /* SDL_cocoamouse.h in Headers */,
+ DB313F9C17554B71006C0E22 /* SDL_cocoaopengl.h in Headers */,
+ DB313F9D17554B71006C0E22 /* SDL_cocoashape.h in Headers */,
+ DB313F9E17554B71006C0E22 /* SDL_cocoavideo.h in Headers */,
+ DB313F9F17554B71006C0E22 /* SDL_cocoawindow.h in Headers */,
+ DB313FA017554B71006C0E22 /* SDL_nullevents_c.h in Headers */,
+ DB313FA117554B71006C0E22 /* SDL_nullvideo.h in Headers */,
+ DB313FA217554B71006C0E22 /* SDL_blit.h in Headers */,
+ DB313FA317554B71006C0E22 /* SDL_blit_auto.h in Headers */,
+ DB313FA417554B71006C0E22 /* SDL_blit_copy.h in Headers */,
+ DB313FA517554B71006C0E22 /* SDL_blit_slow.h in Headers */,
+ DB313FA617554B71006C0E22 /* SDL_pixels_c.h in Headers */,
+ DB313FA717554B71006C0E22 /* SDL_RLEaccel_c.h in Headers */,
+ DB313FA817554B71006C0E22 /* SDL_shape_internals.h in Headers */,
+ DB313FA917554B71006C0E22 /* SDL_sysvideo.h in Headers */,
+ DB313FAA17554B71006C0E22 /* imKStoUCS.h in Headers */,
+ DB313FAB17554B71006C0E22 /* SDL_x11clipboard.h in Headers */,
+ DB313FAC17554B71006C0E22 /* SDL_x11dyn.h in Headers */,
+ DB313FAD17554B71006C0E22 /* SDL_x11events.h in Headers */,
+ DB313FAE17554B71006C0E22 /* SDL_x11keyboard.h in Headers */,
+ DB313FAF17554B71006C0E22 /* SDL_x11modes.h in Headers */,
+ DB313FB017554B71006C0E22 /* SDL_x11mouse.h in Headers */,
+ DB313FB117554B71006C0E22 /* SDL_x11opengl.h in Headers */,
+ DB313FB217554B71006C0E22 /* SDL_x11opengles.h in Headers */,
+ DB313FB317554B71006C0E22 /* SDL_x11shape.h in Headers */,
+ DB313FB417554B71006C0E22 /* SDL_x11sym.h in Headers */,
+ DB313FB517554B71006C0E22 /* SDL_x11touch.h in Headers */,
+ DB313FB617554B71006C0E22 /* SDL_x11video.h in Headers */,
+ DB313FB717554B71006C0E22 /* SDL_x11window.h in Headers */,
+ DB313FB817554B71006C0E22 /* SDL_sysrender.h in Headers */,
+ DB313FB917554B71006C0E22 /* mmx.h in Headers */,
+ DB313FBA17554B71006C0E22 /* SDL_yuv_sw_c.h in Headers */,
+ DB313FBB17554B71006C0E22 /* SDL_nullframebuffer_c.h in Headers */,
+ DB313FBC17554B71006C0E22 /* SDL_blendfillrect.h in Headers */,
+ DB313FBD17554B71006C0E22 /* SDL_blendline.h in Headers */,
+ DB313FBE17554B71006C0E22 /* SDL_blendpoint.h in Headers */,
+ DB313FBF17554B71006C0E22 /* SDL_draw.h in Headers */,
+ DB313FC017554B71006C0E22 /* SDL_drawline.h in Headers */,
+ DB313FC117554B71006C0E22 /* SDL_drawpoint.h in Headers */,
+ DB313FC217554B71006C0E22 /* SDL_render_sw_c.h in Headers */,
+ DB313FC317554B71006C0E22 /* SDL_x11framebuffer.h in Headers */,
+ DB313FC417554B71006C0E22 /* SDL_glfuncs.h in Headers */,
+ DB313FC517554B71006C0E22 /* SDL_shaders_gl.h in Headers */,
+ DB313FC617554B71006C0E22 /* SDL_rotate.h in Headers */,
+ DB313FC717554B71006C0E22 /* SDL_x11xinput2.h in Headers */,
+ DB313FC817554B71006C0E22 /* begin_code.h in Headers */,
+ DB313FC917554B71006C0E22 /* close_code.h in Headers */,
+ DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */,
+ DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */,
+ DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */,
+ DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */,
+ DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */,
+ DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */,
+ DB313FD017554B71006C0E22 /* SDL_config.h in Headers */,
+ DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */,
+ DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */,
+ DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */,
+ DB313FD417554B71006C0E22 /* SDL_error.h in Headers */,
+ DB313FD517554B71006C0E22 /* SDL_events.h in Headers */,
+ DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */,
+ DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */,
+ DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */,
+ DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */,
+ DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */,
+ DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */,
+ DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */,
+ DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */,
+ DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */,
+ DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */,
+ DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */,
+ DB313FE117554B71006C0E22 /* SDL_name.h in Headers */,
+ DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */,
+ DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */,
+ DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */,
+ DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */,
+ DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */,
+ DB313FE717554B71006C0E22 /* SDL_power.h in Headers */,
+ DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */,
+ DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */,
+ DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */,
+ DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */,
+ DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */,
+ DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */,
+ DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */,
+ DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */,
+ DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */,
+ DB313FF117554B71006C0E22 /* SDL_system.h in Headers */,
+ DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */,
+ DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */,
+ DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */,
+ DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */,
+ DB313FF617554B71006C0E22 /* SDL_types.h in Headers */,
+ DB313FF717554B71006C0E22 /* SDL_version.h in Headers */,
+ DB313FF817554B71006C0E22 /* SDL_video.h in Headers */,
+ DB313FF917554B71006C0E22 /* SDL.h in Headers */,
+ DB313FFA17554B71006C0E22 /* SDL_cocoamessagebox.h in Headers */,
+ DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */,
+ DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */,
+ D55A1B86179F278F00625D7C /* SDL_cocoamousetap.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 00D8D9EE1195090700638393 /* testsdl */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 00D8D9F71195090900638393 /* Build configuration list for PBXNativeTarget "testsdl" */;
- buildPhases = (
- 00D8D9EB1195090700638393 /* Resources */,
- 00D8D9EC1195090700638393 /* Sources */,
- 00D8D9ED1195090700638393 /* Frameworks */,
- 006E9491119510E1001DE610 /* Copy Frameworks */,
- 006E94B3119511CE001DE610 /* Copy rwops */,
- );
- buildRules = (
- );
- dependencies = (
- 00D8DA2F1195094500638393 /* PBXTargetDependency */,
- );
- name = testsdl;
- productName = testsdl;
- productReference = 00D8D9EF1195090700638393 /* testsdl.app */;
- productType = "com.apple.product-type.application";
- };
BECDF5FE0761BA81005FE872 /* Framework */ = {
isa = PBXNativeTarget;
buildConfigurationList = 0073177A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Framework" */;
@@ -1986,6 +2158,7 @@
BECDF62A0761BA81005FE872 /* Resources */,
BECDF62C0761BA81005FE872 /* Sources */,
BECDF6680761BA81005FE872 /* Frameworks */,
+ AA5C3FDC17A8C58600D6C8A1 /* Sign Frameworks */,
);
buildRules = (
);
@@ -2035,22 +2208,25 @@
productReference = BECDF6BE0761BA81005FE872 /* Standard DMG */;
productType = "com.apple.product-type.tool";
};
- BECDF6C00761BA81005FE872 /* Developer Extras Package */ = {
+ DB313F7217554B71006C0E22 /* Shared Library */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 0073178A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Developer Extras Package" */;
+ buildConfigurationList = DB31407417554B71006C0E22 /* Build configuration list for PBXNativeTarget "Shared Library" */;
buildPhases = (
- BECDF6C20761BA81005FE872 /* ShellScript */,
+ DB313F7317554B71006C0E22 /* Headers */,
+ DB313FFD17554B71006C0E22 /* Sources */,
+ DB31406B17554B71006C0E22 /* Frameworks */,
+ DB31407317554B71006C0E22 /* Rez */,
);
buildRules = (
);
+ comments = "This produces libSDL2.dylib, which is the shared build of SDL.";
dependencies = (
- 008310461072EA9000A531F1 /* PBXTargetDependency */,
);
- name = "Developer Extras Package";
- productInstallPath = /usr/local/bin;
- productName = "Devel Package";
- productReference = BECDF6C30761BA81005FE872 /* Developer Extras Package */;
- productType = "com.apple.product-type.tool";
+ name = "Shared Library";
+ productInstallPath = /usr/local/lib;
+ productName = "Shared Library";
+ productReference = DB31407717554B71006C0E22 /* libSDL2.dylib */;
+ productType = "com.apple.product-type.library.dynamic";
};
/* End PBXNativeTarget section */
@@ -2077,28 +2253,13 @@
targets = (
BECDF5FE0761BA81005FE872 /* Framework */,
BECDF66D0761BA81005FE872 /* Static Library */,
+ DB313F7217554B71006C0E22 /* Shared Library */,
BECDF6BB0761BA81005FE872 /* Standard DMG */,
- BECDF6C00761BA81005FE872 /* Developer Extras Package */,
- 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */,
- 00D8D9EE1195090700638393 /* testsdl */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
- 00D8D9EB1195090700638393 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 006E94A3119511A1001DE610 /* icon.bmp in Resources */,
- 006E94A4119511A1001DE610 /* moose.dat in Resources */,
- 006E94A5119511A1001DE610 /* picture.xbm in Resources */,
- 006E94A7119511A1001DE610 /* sample.bmp in Resources */,
- 006E94A8119511A1001DE610 /* sample.wav in Resources */,
- 006E94A9119511A1001DE610 /* utf8.txt in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
BECDF62A0761BA81005FE872 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2116,21 +2277,29 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ DB31407317554B71006C0E22 /* Rez */ = {
+ isa = PBXRezBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXRezBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 0083103E1072EA5700A531F1 /* ShellScript */ = {
+ AA5C3FDC17A8C58600D6C8A1 /* Sign Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
+ name = "Sign Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# DOXYGEN_EXE is defined in the Enclosing Target's Build Tab\n# DOXYGEN_EXE=/Applications/Doxygen.app/Contents/Resources/doxygen\n#echo DOXYGEN_EXE dir is $DOXYGEN_EXE\n\nDOC_DIR=$SRCROOT/../XcodeDocSet\n#echo Doc dir is $DOC_DIR\ncd $DOC_DIR\n$DOXYGEN_EXE $DOC_DIR/Doxyfile\ncd html\nmake\nif [ -d $SRCROOT/../XcodeDocSet/org.libsdl.sdl.docset ] ; then\n\t# remove previous docset\n\trm -rf $SRCROOT/../XcodeDocSet/org.libsdl.sdl.docset\nfi\nmv org.libsdl.sdl.docset ..\ncd ..\nrm -rf html\nexit 0";
+ shellScript = "if [ \"$USER\" = \"slouken\" ]; then\n CODE_SIGN_IDENTITY=\"Mac Developer: Sam Lantinga (84TP7N5TA4)\" pkg-support/codesign-frameworks.sh || exit 1\nfi";
};
BECDF6BD0761BA81005FE872 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -2139,38 +2308,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\n`xcode-select -print-path`/Tools/CpMac -r $TARGET_BUILD_DIR/SDL2.framework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL2 -srcfolder build/dmg-tmp build/SDL2.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
- };
- BECDF6C20761BA81005FE872 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- comments = "The old .pkg generator script:\n\n# make a copy of the framework to work with\nmkdir -p build/pkg-tmp\n\n## We're changing this to follow OS X conventions, where the headers and\n## framework are bundled together. Thus this development package won't \n## actually contain any direct framework elements.\n#/Developer/Tools/CpMac -r build/SDL.framework build/pkg-tmp/\n\n# copy in some files they might want around...\ncp ../../docs.html build/pkg-tmp\ncp -r ../../docs build/pkg-tmp\n#cp -r ../../src/main/macosx build/pkg-tmp/\n#rm -rf build/pkg-tmp/main/exports\ncp -r \"../Project Stationary\" build/pkg-tmp/\ncp \"pkg-support/Readme SDL Developer.txt\" build/pkg-tmp/\n#cp \"../uninstall.csh\" build/pkg-tmp/\n\n## We shouldn't have any framework stuff to deal with now\n# clean up the framework, remove extra files\n# rm -rf build/pkg-tmp/SDL.framework/Resources/pbdevelopment.plist\n\n# remove the .DS_Store file to keep tool from crapping out\nfind pkg-support -name \".DS_Store\" -exec rm -rf \"{}\" \";\" \n\n# create the .pkg\n../package build/pkg-tmp pkg-support/SDL-devel.info -d build -r pkg-support/devel-resources \n#\"/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker\" -build -p build/ -f build/pkg-tmp -r pkg-support/devel-resources -i Info.plist -d Description.plist\n\n# create install scripts\nDIR=build/SDL-devel.pkg/\ncp $DIR/install.sh $DIR/SDL-devel.post_install\nmv $DIR/install.sh $DIR/SDL-devel.post_upgrade\n\n# add execute flag to scripts\nchmod 755 $DIR/SDL-devel.post_install $DIR/SDL-devel.post_upgrade\n\n# remove temporary files\n#rm -rf build/pkg-tmp\n\n# compress\n(cd build; gnutar -zcvf SDL-devel.pkg.tar.gz SDL-devel.pkg)";
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# make a directory to hold the stuff we're going to package up\nmkdir -p build/devel-extras-tmp\nmkdir -p build/devel-extras-tmp/Documentation\nmkdir -p build/devel-extras-tmp/Documentation/docs/XcodeDocSet\nmkdir -p build/devel-extras-tmp/XcodeTemplates\n#mkdir -p build/devel-extras-tmp/SDLMain\n#mkdir -p build/devel-extras-tmp/SDLMain/NIBless\n#mkdir -p build/devel-extras-tmp/SDLMain/CocoaMenus\n\n# copy the docs\ncp ../../docs.html build/devel-extras-tmp/Documentation\ncp -r ../../docs build/devel-extras-tmp/Documentation\n\n# Copy Doxyfile for DocSet\ncp $SRCROOT/../XcodeDocSet/Doxyfile build/devel-extras-tmp/Documentation/docs/XcodeDocSet\n\n# Copy DocSet (if it exists)\nif [ -d $SRCROOT/../XcodeDocSet/org.libsdl.sdl.docset ] ; then\n#\techo Found docset directory\n\tmv $SRCROOT/../XcodeDocSet/org.libsdl.sdl.docset build/devel-extras-tmp/Documentation/docs/XcodeDocSet/\nelse\n\techo Warning: Could not find DocSet and will be omitted from package\nfi\n\n# copy the Xcode Project user templates\ncp -r \"../TemplatesForXcodeTiger\" build/devel-extras-tmp/XcodeTemplates\ncp -r \"../TemplatesForXcodeLeopard\" build/devel-extras-tmp/XcodeTemplates\ncp -r \"../TemplatesForXcodeSnowLeopard\" build/devel-extras-tmp/XcodeTemplates\n\ncp \"pkg-support/Readme SDL Developer.txt\" build/devel-extras-tmp\n\n\n# readme file\n#cp pkg-support/resources/ReadMe.txt build/devel-extras-tmp\n\n#cp pkg-support/resources/UniversalBinaryNotes.rtf build/devel-extras-tmp\n\n# Copy the devel-lite stuff just in case the user didn't notice it in the main package\n# I should copy all the different SDLMain versions (and nibs) instead.\n# I'm assuming the default is the same as the SDL App and SDL/OpenGL templates\n\n#cp pkg-support/resources/ReadMeDevLite.txt build/devel-extras-tmp/SDLMain/NIBless\n#cp ../../src/main/macosx/SDLMain.h build/devel-extras-tmp/SDLMain/NIBless\n#cp ../../src/main/macosx/SDLMain.m build/devel-extras-tmp/SDLMain/NIBless\n\n# Nib stuff from SDL-Cocoa App\n#/Developer/Tools/CpMac -r \"../TemplatesForXcodeSnowLeopard/SDL Cocoa Application/#SDLMain.h\" build/devel-extras-tmp/SDLMain/CocoaMenus\n#/Developer/Tools/CpMac -r \"../TemplatesForXcodeSnowLeopard/SDL Cocoa Application/#SDLMain.m\" build/devel-extras-tmp/SDLMain/CocoaMenus\n#/Developer/Tools/CpMac -r \"../TemplatesForXcodeSnowLeopard/SDL Cocoa Application/#English.lproj/SDLMain.nib\" build/devel-extras-tmp/SDLMain/CocoaMenus\n\n# Copy precompiled libSDLmain.a's here??? We have potentially 3 different ones?\n# /Developer/Tools/CpMac -r $TARGET_BUILD_DIR/libSDLmain.a build/devel-extras-tmp/SDLMain/NIBless\n#\n#\n\n# Copy sdl-config's for those who've been wanting one? Will need to document that it may\n# require manual changes if you don't install the framework to /Library/Frameworks\n# <>\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/devel-extras-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n# remove CVS stuff\nfind build/devel-extras-tmp -name .cvsignore -exec rm -f \"{}\" \\;\n# depth first traversal, type=directory, remove recursively\nfind -d build/devel-extras-tmp -type d -name CVS -exec rm -rf \"{}\" \\;\nfind -d build/devel-extras-tmp -type d -name .svn -exec rm -rf \"{}\" \\;\n\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL-devel-extras -srcfolder build/devel-extras-tmp build/SDL-devel-extras.dmg\n\n# clean up\nrm -rf build/devel-extras-tmp\n\n# compress it???\n#(cd build; gnutar -zcvf SDL.dmg.tar.gz SDL.dmg)\n\n";
+ shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nxcrun CpMac -r $TARGET_BUILD_DIR/SDL2.framework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL2 -srcfolder build/dmg-tmp build/SDL2.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 00D8D9EC1195090700638393 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 00D8DA1B1195093100638393 /* audio.c in Sources */,
- 00D8DA1C1195093100638393 /* common.c in Sources */,
- 00D8DA221195093100638393 /* platform.c in Sources */,
- 00D8DA241195093100638393 /* rect.c in Sources */,
- 00D8DA251195093100638393 /* render.c in Sources */,
- 00D8DA271195093100638393 /* rwops.c in Sources */,
- 00D8DA281195093100638393 /* SDL_at.c in Sources */,
- 00D8DA291195093100638393 /* surface.c in Sources */,
- 00D8DA2A1195093100638393 /* testsdl.c in Sources */,
- 001E39EE1196F75000A3F5B8 /* TestSupportRWops_Cocoa.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
BECDF62C0761BA81005FE872 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2206,7 +2348,6 @@
04BD009612E6671800899322 /* SDL_power.c in Sources */,
04BD009C12E6671800899322 /* SDL_assert.c in Sources */,
04BD009F12E6671800899322 /* SDL_error.c in Sources */,
- 04BD00A012E6671800899322 /* SDL_fatal.c in Sources */,
04BD00A212E6671800899322 /* SDL.c in Sources */,
04BD00A312E6671800899322 /* SDL_getenv.c in Sources */,
04BD00A412E6671800899322 /* SDL_iconv.c in Sources */,
@@ -2284,6 +2425,8 @@
AA9E4093163BE51E007A2AD0 /* SDL_x11messagebox.c in Sources */,
AABCC38F164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */,
AA0AD09D16648D1700CE5896 /* SDL_gamecontroller.c in Sources */,
+ AA0F8491178D5ECC00823F9D /* SDL_systls.c in Sources */,
+ D55A1B82179F262300625D7C /* SDL_cocoamousetap.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2324,7 +2467,6 @@
04BD02B012E6671800899322 /* SDL_power.c in Sources */,
04BD02B612E6671800899322 /* SDL_assert.c in Sources */,
04BD02B912E6671800899322 /* SDL_error.c in Sources */,
- 04BD02BA12E6671800899322 /* SDL_fatal.c in Sources */,
04BD02BC12E6671800899322 /* SDL.c in Sources */,
04BD02BD12E6671800899322 /* SDL_getenv.c in Sources */,
04BD02BE12E6671800899322 /* SDL_iconv.c in Sources */,
@@ -2400,22 +2542,131 @@
AA628AD2159367F2005138DD /* SDL_x11xinput2.c in Sources */,
AA9E4094163BE51E007A2AD0 /* SDL_x11messagebox.c in Sources */,
AABCC390164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */,
+ AA0F8492178D5ECC00823F9D /* SDL_systls.c in Sources */,
+ D55A1B84179F263600625D7C /* SDL_cocoamousetap.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB313FFD17554B71006C0E22 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB313FFE17554B71006C0E22 /* SDL_atomic.c in Sources */,
+ DB313FFF17554B71006C0E22 /* SDL_spinlock.c in Sources */,
+ DB31400017554B71006C0E22 /* SDL_diskaudio.c in Sources */,
+ DB31400117554B71006C0E22 /* SDL_dummyaudio.c in Sources */,
+ DB31400217554B71006C0E22 /* SDL_coreaudio.c in Sources */,
+ DB31400317554B71006C0E22 /* SDL_audio.c in Sources */,
+ DB31400417554B71006C0E22 /* SDL_audiocvt.c in Sources */,
+ DB31400517554B71006C0E22 /* SDL_audiodev.c in Sources */,
+ DB31400617554B71006C0E22 /* SDL_audiotypecvt.c in Sources */,
+ DB31400717554B71006C0E22 /* SDL_mixer.c in Sources */,
+ DB31400817554B71006C0E22 /* SDL_wave.c in Sources */,
+ DB31400917554B71006C0E22 /* SDL_cpuinfo.c in Sources */,
+ DB31400A17554B71006C0E22 /* SDL_clipboardevents.c in Sources */,
+ DB31400B17554B71006C0E22 /* SDL_events.c in Sources */,
+ DB31400C17554B71006C0E22 /* SDL_dropevents.c in Sources */,
+ DB31400D17554B71006C0E22 /* SDL_gesture.c in Sources */,
+ DB31400E17554B71006C0E22 /* SDL_keyboard.c in Sources */,
+ DB31400F17554B71006C0E22 /* SDL_mouse.c in Sources */,
+ DB31401017554B71006C0E22 /* SDL_quit.c in Sources */,
+ DB31401117554B71006C0E22 /* SDL_touch.c in Sources */,
+ DB31401217554B71006C0E22 /* SDL_windowevents.c in Sources */,
+ DB31401317554B71006C0E22 /* SDL_rwopsbundlesupport.m in Sources */,
+ DB31401417554B71006C0E22 /* SDL_rwops.c in Sources */,
+ DB31401517554B71006C0E22 /* SDL_syshaptic.c in Sources */,
+ DB31401617554B71006C0E22 /* SDL_haptic.c in Sources */,
+ DB31401717554B71006C0E22 /* SDL_sysjoystick.c in Sources */,
+ DB31401817554B71006C0E22 /* SDL_gamecontroller.c in Sources */,
+ DB31401917554B71006C0E22 /* SDL_joystick.c in Sources */,
+ DB31401A17554B71006C0E22 /* SDL_sysloadso.c in Sources */,
+ DB31401B17554B71006C0E22 /* SDL_syspower.c in Sources */,
+ DB31401C17554B71006C0E22 /* SDL_power.c in Sources */,
+ DB31401D17554B71006C0E22 /* SDL_assert.c in Sources */,
+ DB31401E17554B71006C0E22 /* SDL_error.c in Sources */,
+ DB31402017554B71006C0E22 /* SDL.c in Sources */,
+ DB31402117554B71006C0E22 /* SDL_getenv.c in Sources */,
+ DB31402217554B71006C0E22 /* SDL_iconv.c in Sources */,
+ DB31402317554B71006C0E22 /* SDL_malloc.c in Sources */,
+ DB31402417554B71006C0E22 /* SDL_qsort.c in Sources */,
+ DB31402517554B71006C0E22 /* SDL_stdlib.c in Sources */,
+ DB31402617554B71006C0E22 /* SDL_string.c in Sources */,
+ DB31402717554B71006C0E22 /* SDL_syscond.c in Sources */,
+ DB31402817554B71006C0E22 /* SDL_sysmutex.c in Sources */,
+ DB31402917554B71006C0E22 /* SDL_syssem.c in Sources */,
+ DB31402A17554B71006C0E22 /* SDL_systhread.c in Sources */,
+ DB31402B17554B71006C0E22 /* SDL_thread.c in Sources */,
+ DB31402C17554B71006C0E22 /* SDL_timer.c in Sources */,
+ DB31402D17554B71006C0E22 /* SDL_systimer.c in Sources */,
+ DB31402E17554B71006C0E22 /* SDL_cocoaclipboard.m in Sources */,
+ DB31402F17554B71006C0E22 /* SDL_cocoaevents.m in Sources */,
+ DB31403017554B71006C0E22 /* SDL_cocoakeyboard.m in Sources */,
+ DB31403117554B71006C0E22 /* SDL_cocoamodes.m in Sources */,
+ DB31403217554B71006C0E22 /* SDL_cocoamouse.m in Sources */,
+ DB31403317554B71006C0E22 /* SDL_cocoaopengl.m in Sources */,
+ DB31403417554B71006C0E22 /* SDL_cocoashape.m in Sources */,
+ DB31403517554B71006C0E22 /* SDL_cocoavideo.m in Sources */,
+ DB31403617554B71006C0E22 /* SDL_cocoawindow.m in Sources */,
+ DB31403717554B71006C0E22 /* SDL_nullevents.c in Sources */,
+ DB31403817554B71006C0E22 /* SDL_nullvideo.c in Sources */,
+ DB31403917554B71006C0E22 /* SDL_blit.c in Sources */,
+ DB31403A17554B71006C0E22 /* SDL_blit_0.c in Sources */,
+ DB31403B17554B71006C0E22 /* SDL_blit_1.c in Sources */,
+ DB31403C17554B71006C0E22 /* SDL_blit_A.c in Sources */,
+ DB31403D17554B71006C0E22 /* SDL_blit_auto.c in Sources */,
+ DB31403E17554B71006C0E22 /* SDL_blit_copy.c in Sources */,
+ DB31403F17554B71006C0E22 /* SDL_blit_N.c in Sources */,
+ DB31404017554B71006C0E22 /* SDL_blit_slow.c in Sources */,
+ DB31404117554B71006C0E22 /* SDL_bmp.c in Sources */,
+ DB31404217554B71006C0E22 /* SDL_clipboard.c in Sources */,
+ DB31404317554B71006C0E22 /* SDL_fillrect.c in Sources */,
+ DB31404417554B71006C0E22 /* SDL_pixels.c in Sources */,
+ DB31404517554B71006C0E22 /* SDL_rect.c in Sources */,
+ DB31404617554B71006C0E22 /* SDL_RLEaccel.c in Sources */,
+ DB31404717554B71006C0E22 /* SDL_shape.c in Sources */,
+ DB31404817554B71006C0E22 /* SDL_stretch.c in Sources */,
+ DB31404917554B71006C0E22 /* SDL_surface.c in Sources */,
+ DB31404A17554B71006C0E22 /* SDL_video.c in Sources */,
+ DB31404B17554B71006C0E22 /* imKStoUCS.c in Sources */,
+ DB31404C17554B71006C0E22 /* SDL_x11clipboard.c in Sources */,
+ DB31404D17554B71006C0E22 /* SDL_x11dyn.c in Sources */,
+ DB31404E17554B71006C0E22 /* SDL_x11events.c in Sources */,
+ DB31404F17554B71006C0E22 /* SDL_x11keyboard.c in Sources */,
+ DB31405017554B71006C0E22 /* SDL_x11modes.c in Sources */,
+ DB31405117554B71006C0E22 /* SDL_x11mouse.c in Sources */,
+ DB31405217554B71006C0E22 /* SDL_x11opengl.c in Sources */,
+ DB31405317554B71006C0E22 /* SDL_x11opengles.c in Sources */,
+ DB31405417554B71006C0E22 /* SDL_x11shape.c in Sources */,
+ DB31405517554B71006C0E22 /* SDL_x11touch.c in Sources */,
+ DB31405617554B71006C0E22 /* SDL_x11video.c in Sources */,
+ DB31405717554B71006C0E22 /* SDL_x11window.c in Sources */,
+ DB31405817554B71006C0E22 /* SDL_render.c in Sources */,
+ DB31405917554B71006C0E22 /* SDL_yuv_mmx.c in Sources */,
+ DB31405A17554B71006C0E22 /* SDL_yuv_sw.c in Sources */,
+ DB31405B17554B71006C0E22 /* SDL_nullframebuffer.c in Sources */,
+ DB31405C17554B71006C0E22 /* SDL_blendfillrect.c in Sources */,
+ DB31405D17554B71006C0E22 /* SDL_blendline.c in Sources */,
+ DB31405E17554B71006C0E22 /* SDL_blendpoint.c in Sources */,
+ DB31405F17554B71006C0E22 /* SDL_drawline.c in Sources */,
+ DB31406017554B71006C0E22 /* SDL_drawpoint.c in Sources */,
+ DB31406117554B71006C0E22 /* SDL_render_gl.c in Sources */,
+ DB31406217554B71006C0E22 /* SDL_render_sw.c in Sources */,
+ DB31406317554B71006C0E22 /* SDL_x11framebuffer.c in Sources */,
+ DB31406417554B71006C0E22 /* SDL_hints.c in Sources */,
+ DB31406517554B71006C0E22 /* SDL_log.c in Sources */,
+ DB31406617554B71006C0E22 /* SDL_shaders_gl.c in Sources */,
+ DB31406717554B71006C0E22 /* SDL_rotate.c in Sources */,
+ DB31406817554B71006C0E22 /* SDL_x11xinput2.c in Sources */,
+ DB31406917554B71006C0E22 /* SDL_x11messagebox.c in Sources */,
+ DB31406A17554B71006C0E22 /* SDL_cocoamessagebox.m in Sources */,
+ AA0F8493178D5ECC00823F9D /* SDL_systls.c in Sources */,
+ D55A1B83179F263500625D7C /* SDL_cocoamousetap.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 008310461072EA9000A531F1 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */;
- targetProxy = 008310451072EA9000A531F1 /* PBXContainerItemProxy */;
- };
- 00D8DA2F1195094500638393 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = BECDF5FE0761BA81005FE872 /* Framework */;
- targetProxy = 00D8DA2E1195094500638393 /* PBXContainerItemProxy */;
- };
BECDF6C60761BA81005FE872 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BECDF5FE0761BA81005FE872 /* Framework */;
@@ -2424,24 +2675,6 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
- 008310421072EA5700A531F1 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- PRODUCT_NAME = "Generate Doxygen DocSet";
- };
- name = Debug;
- };
- 008310431072EA5700A531F1 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- PRODUCT_NAME = "Generate Doxygen DocSet";
- };
- name = Release;
- };
00CFA621106A567900758660 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -2467,7 +2700,7 @@
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
PRODUCT_NAME = SDL2;
WRAPPER_EXTENSION = framework;
@@ -2498,13 +2731,6 @@
};
name = Release;
};
- 00CFA626106A567900758660 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "Developer Extras Package";
- };
- name = Release;
- };
00CFA627106A568900758660 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -2528,7 +2754,7 @@
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
OTHER_LDFLAGS = "-liconv";
PRODUCT_NAME = SDL2;
WRAPPER_EXTENSION = framework;
@@ -2559,38 +2785,41 @@
};
name = Debug;
};
- 00CFA62C106A568900758660 /* Debug */ = {
+ DB31407517554B71006C0E22 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- PRODUCT_NAME = "Developer Extras Package";
+ EXECUTABLE_PREFIX = lib;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ HEADER_SEARCH_PATHS = /usr/X11R6/include;
+ INSTALL_PATH = "@rpath";
+ PRODUCT_NAME = SDL2;
+ SKIP_INSTALL = YES;
};
name = Debug;
};
- 00D8D9F41195090800638393 /* Debug */ = {
+ DB31407617554B71006C0E22 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- INFOPLIST_FILE = "testsdl-Info.plist";
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
+ EXECUTABLE_PREFIX = lib;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
);
- PRODUCT_NAME = testsdl;
- };
- name = Debug;
- };
- 00D8D9F51195090800638393 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- INFOPLIST_FILE = "testsdl-Info.plist";
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
- PRODUCT_NAME = testsdl;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ HEADER_SEARCH_PATHS = /usr/X11R6/include;
+ INSTALL_PATH = "@rpath";
+ PRODUCT_NAME = SDL2;
+ SKIP_INSTALL = YES;
};
name = Release;
};
@@ -2624,15 +2853,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 0073178A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Developer Extras Package" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 00CFA62C106A568900758660 /* Debug */,
- 00CFA626106A567900758660 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -2642,20 +2862,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */ = {
+ DB31407417554B71006C0E22 /* Build configuration list for PBXNativeTarget "Shared Library" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 008310421072EA5700A531F1 /* Debug */,
- 008310431072EA5700A531F1 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
- 00D8D9F71195090900638393 /* Build configuration list for PBXNativeTarget "testsdl" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 00D8D9F41195090800638393 /* Debug */,
- 00D8D9F51195090800638393 /* Release */,
+ DB31407517554B71006C0E22 /* Debug */,
+ DB31407617554B71006C0E22 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
diff --git a/Xcode/SDL/pkg-support/Readme SDL Developer.txt b/Xcode/SDL/pkg-support/Readme SDL Developer.txt
deleted file mode 100755
index 348b80734..000000000
--- a/Xcode/SDL/pkg-support/Readme SDL Developer.txt
+++ /dev/null
@@ -1,282 +0,0 @@
-SDL Mac OS X Developer Notes:
- This is an optional developer package to provide extras that an
- SDL developer might benefit from.
-
- Make sure you have already installed the SDL.framework
- from the SDL.dmg.
-
- For more complete documentation, please see READMEs included
- with the SDL source code. Also, don't forget about the API
- documentation (also included with this package).
-
-
-This package contains:
-- SDL API Documentation
-- A variety of SDLMain and .Nib files to choose from
-- Xcode project templates
-
-
-SDL API Documentation:
- We include both the HTML documentation and the man files.
- We also include an Xocde DocSet which
- is generated via Doxygen. These require Xcode 3.0 or greater.
-
- You will need to drill down into the XcodeDocSet directory
- from the Documentation folder and find the
- org.libsdl.sdl.docset bundle. We recommend you copy this to:
-
- /Library/Developer/Shared/Documentation/DocSets
-
- Again, this follows all the standard Xcode patterns
- described with the project templates (below). You may need
- to create the directories if they don't already exist.
- You may install it on a per-user basis.
- And you may target specific versions of Xcode
- in lieu of using the "Shared" directory.
-
- To use, it is quite simple. Just bring up the Xcode
- Documentation Browser window (can be activated through
- the Xcode Help Menu) and start searching for something.
-
- If nothing is found on a legitimate search, verify that
- the SDL documentation is enabled by opening up the DocSet
- popup box below the toolbar in Snow Leopard.
- (In Leopard, the DocSets appear in the left-side panel.)
-
- Another handy trick is to use the mouse and Option-Double-Click
- on a function or keyword to bring up documentation on the
- selected item. Prior to Xcode 3.2 (Snow Leopard), this would
- jump you to the entry in the Xcode Documentation Browser.
-
- However, in Xcode 3.2 (Snow Leopard), this behavior has been
- altered and you are now given a hovering connected popup box
- on the selected item (called Quick Help). Unfortunately, the
- Doxygen generated DocSet doesn't currently provide Quick Help
- information. You can either follow a link to the main
- Documentation Browser from the Quick Help, or alternatively,
- you can bypass Quick Help by using Command-Option-Double-Click
- instead of Option-Double-Click. (Please file feedback with both
- Doxygen and Apple to improve Quick Help integration.)
-
-
- For those that want to tweak the documentation output,
- you can find my Doxyfile in the XcodeDocSet directory in
- the Xcode directory of the SDL source code base (and in this package).
-
- One of the most significant options is "Separate Member Pages"
- which I disable. When disabled, the documentation is about 6MB.
- When enabled, the documentation is closer to 1.6GB (yes gigabytes).
- Obviously, distribution will be really hard with sizes that huge
- so I disable the option.
-
- I also disabled Dot because there didn't seem to be
- much benefit of generating graphs for public C functions.
-
- One thing I would like to see is a CSS file that makes the
- Doxygen DocSet look more like the native Apple documentation
- style. Style sheets are outside my expertise so I am asking for
- contributions on this one. Meanwhile, I also request you send
- feedback to Doxygen and Apple about this issue too.
-
-
- Finally for convenience, I have added a new shell script target
- to the Xcode project that builds SDL that refers to my Doxyfile
- and generate the DocSet we distribute.
-
-
-SDLMain:
- We include several different variations of SDLMain and the
- .Nibs. (Each of these are demonstrated by the different PB/Xcode
- project templates.) You get to pick which one you want to use,
- or you can write your own to meet your own specific needs. We do
- not currently provide a libSDLMain.a. You can build it yourself
- once you decide which one you want to use though it is easier and
- recommended in the SDL FAQ that you just copy the SDLMain.h and
- SDLMain.m directly into your project. If you are puzzled by this,
- we strongly recommend you look at the different PB/Xcode project
- templates to understand their uses and differences. (See Project
- Template info below.) Note that the "Nibless" version is the same
- version of SDLMain we include the the devel-lite section of the
- main SDL.dmg.
-
-
-Xocde Project Templates:
- For convenience, we provide Project Templates for Xcode.
- Using Xcode is *not* a requirement for using
- the SDL.framework. However, for newbies, we do recommend trying
- out the Xcode templates first (and work your way back to raw gcc
- if you desire), as the Xcode templates try to setup everything
- for you in a working state. This avoids the need to ask those
- many reoccuring questions that appear on the mailing list
- or the SDL FAQ.
-
-
- We have provided 3 different kinds of SDL templates for Xcode and have
- a different set of templates for each version of Xcode (which generally
- correspond with a particular Mac OS X version).
- The installion directory depends on which version of Xcode you have.
- (Note: These directories may not already exist on your system so you must create them yourself.)
-
- For Leopard and Snow Leopard (Xcode 2.5, 3+), we recommend you install to:
- /Library/Application Support/Developer/Shared/Xcode/Project Templates/Application
-
- For Xcode 1.0 to 2.4,
- /Library/Application Support/Apple/Developer Tools/Project Templates/Application
-
-
- Also note you may place it in per-user locations, e.g.
- ~/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application
-
-
- And for advanced users who have multiple versions of Xcode installed on a single system,
- you may put each set in a directory with the Xcode version number instead of using "Shared", e.g.
- /Library/Application Support/Developer/2.5/Xcode/Project Templates/Application
- /Library/Application Support/Developer/3.1/Xcode/Project Templates/Application
- /Library/Application Support/Developer/3.2/Xcode/Project Templates/Application
-
-
- Copy each of the SDL/Xcode template directories into the correct location (e.g. "SDL OpenGL Application").
- Do not copy our enclosing folder into the location (e.g. TemplatesForXcodeSnowLeopard).
- So for example, in:
- /Library/Application Support/Developer/Shared/Xcode/Project Templates/Application
- you should have the 3 folders:
- SDL Application
- SDL Cocoa Application
- SDL OpenGL Application
-
-
- After doing this, when doing a File->New Project, you will see the
- projects under the Application category.
- (Newer versions of Xcode have a separate section for User Templates and it will
- appear in the Application category of the User Templates section.)
-
-
-
- How to create a new SDL project:
-
- 1. Open Xcode
- 2. Select File->New Project
- 3. Select SDL Application
- 4. Name, Save, and Finish
- 5. Add your sources.
- *6. That's it!
-
- * If you installed the SDL.framework to $(HOME)/Library/Frameworks
- instead of /Library/Frameworks, you will need to update the
- location of the SDL.framework in the "Groups & Files" browser.
-
-
- The project templates we provide are:
- - SDL Application
- This is the barebones, most basic version. There is no
- customized .Nib file. While still utilizing Cocoa under
- the hood, this version may be best suited for fullscreen
- applications.
-
- - SDL Cocoa Application
- This demonstrates the integration of using native
- Cocoa Menus with an SDL Application. For applications
- designed to run in Windowed mode, Mac users may appreciate
- having access to standard menus for things
- like Preferences and Quiting (among other things).
-
- - SDL OpenGL Application
- This reuses the same SDLMain from the "SDL Application"
- temmplate, but also demonstrates how to
- bring OpenGL into the mix.
-
-
-Special Notes:
-Only the 10.6 Snow Leopard templates (and later) will include 64-bit in the Universal Binary as
-prior versions of OS X lacked the API support SDL requires for 64-bit to work correctly.
-To prevent 64-bit SDL executables from being launched on 10.5 Leopard, a special key has been set
-in the Info.plist in our Snow Leopard SDL/Xcode templates.
-
-
-Xcode Tips and Tricks:
-
-- Building from command line
- Use the command line tool: xcodebuild (see man page)
-
-- Running your app
- You can send command line args to your app by either
- invoking it from the command line (in *.app/Contents/MacOS)
- or by entering them in the "Executables" panel of the target
- settings.
-
-- Working directory
- As defined in the SDLMain.m file, the working directory of
- your SDL app is by default set to its parent. You may wish to
- change this to better suit your needs.
-
-
-
-Additional References:
-
- - Screencast tutorials for getting started with OpenSceneGraph/Mac OS X are
- available at:
- http://www.openscenegraph.org/projects/osg/wiki/Support/Tutorials/MacOSXTips
- Though these are OpenSceneGraph centric, the same exact concepts apply to
- SDL, thus the videos are recommended for everybody getting started with
- developing on Mac OS X. (You can skim over the PlugIns stuff since SDL
- doesn't have any PlugIns to worry about.)
-
-
-Partial History:
-2009-09-21 - CustomView template project was removed because it was broken by
- the removal of legacy Quicktime support while moving to 64-bit.
- ProjectBuilder templates were removed.
- Tiger, Leopard, and Snow Leopard Xcode templates were introduced instead of
- using a single common template due to the differences between the 3.
- (Tiger used a chevron marker for substitution while Leopard/Snow Leopard use ___
- and we need the 10.6 SDK for 64-bit.)
-
-2007-12-30 - Updated documentation to reflect new template paths in Leopard
- Xcode. Added reference to OSG screencasts.
-
-2006-03-17 - Changed the package format from a .pkg based
- installer to a .dmg to avoid requiring administrator/root
- to access contents, for better transparency, and to allow
- users to more easily control which components
- they actually want to install.
- Introduced and updated documentation.
- Created brand new Xcode project templates for Xcode 2.1
- based on the old Project Builder templates as they
- required Xcode users to "Upgrade to Native Target". The new
- templates try to leveage more default options and leverage
- more Xcode conventions. The major change that may introduce
- some breakage is that I now link to the SDL framework
- via the "Group & Files" browser instead of using build
- options. The downside to this is that if the user
- installs the SDL.framework to a place other than
- /Library/Frameworks (e.g. $(HOME)/Library/Frameworks),
- the framework will not be found to link to and the user
- has to manually fix this. But the upshot is (in addition to
- being visually displayed in the forefront) is that it is
- really easy to copy (embed) the framework automatically
- into the .app bundle on build. So I have added this
- feature, which makes the application potentially
- drag-and-droppable ready. The Project Builder templates
- are mostly unchanged due to the fact that I don't have
- Project Builder. I did rename a file extension to .pbxproj
- for the SDL Custom Cocoa Application template because
- the .pbx extension would not load in my version of Xcode.
- For both Project Builder and Xcode templates, I resync'd
- the SDLMain.* files for the SDL App and OpenGL App
- templates. I think people forget that we have 2 other
- SDLMain's (and .Nib's) and somebody needs to go
- through them and merge the new changes into those.
- I also wrote a fix for the SDL Custom Cocoa App
- template in MyController.m. The sprite loading code
- needed to be able to find the icon.bmp in the .app
- bundle's Resources folder. This change was needed to get
- the app to run out of the box. This might change is untested
- with Project Builder though and might break it.
- There also seemed to be some corruption in the .nib itself.
- Merely opening it and saving (allowing IB to correct the
- .nib) seemed to correct things.
- (Eric Wing)
-
-
-
-
diff --git a/Xcode/SDL/pkg-support/SDL-devel.info b/Xcode/SDL/pkg-support/SDL-devel.info
deleted file mode 100755
index 698f1d603..000000000
--- a/Xcode/SDL/pkg-support/SDL-devel.info
+++ /dev/null
@@ -1,15 +0,0 @@
-Title SDL 1.2.9
-Version 1
-Description SDL Library for Mac OS X (http://www.libsdl.org)
-DefaultLocation /Developer/Documentation/SDL
-Diskname (null)
-DeleteWarning
-NeedsAuthorization YES
-DisableStop NO
-UseUserMask YES
-Application NO
-Relocatable NO
-Required NO
-InstallOnly NO
-RequiresReboot NO
-InstallFat NO
diff --git a/Xcode/SDL/pkg-support/SDL.info b/Xcode/SDL/pkg-support/SDL.info
index ca37a7f16..f08facd23 100755
--- a/Xcode/SDL/pkg-support/SDL.info
+++ b/Xcode/SDL/pkg-support/SDL.info
@@ -1,4 +1,4 @@
-Title SDL 1.2.8
+Title SDL 2.0.0
Version 1
Description SDL Library for Mac OS X (http://www.libsdl.org)
DefaultLocation /Library/Frameworks
diff --git a/Xcode/SDL/pkg-support/codesign-frameworks.sh b/Xcode/SDL/pkg-support/codesign-frameworks.sh
new file mode 100755
index 000000000..16dea2519
--- /dev/null
+++ b/Xcode/SDL/pkg-support/codesign-frameworks.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!
+
+# Verify that $CODE_SIGN_IDENTITY is set
+if [ -z "$CODE_SIGN_IDENTITY" ] ; then
+ echo "CODE_SIGN_IDENTITY needs to be non-empty for codesigning frameworks!"
+
+ if [ "$CONFIGURATION" = "Release" ] ; then
+ exit 1
+ else
+ # Codesigning is optional for non-release builds.
+ exit 0
+ fi
+fi
+
+SAVEIFS=$IFS
+IFS=$(echo -en "\n\b")
+
+FRAMEWORK_DIR="${TARGET_BUILD_DIR}"
+
+# Loop through all frameworks
+FRAMEWORKS=`find "${FRAMEWORK_DIR}" -type d -name "*.framework" | sed -e "s/\(.*\)/\1\/Versions\/A\//"`
+RESULT=$?
+if [[ $RESULT != 0 ]] ; then
+ exit 1
+fi
+
+echo "Found:"
+echo "${FRAMEWORKS}"
+
+for FRAMEWORK in $FRAMEWORKS;
+do
+ echo "Signing '${FRAMEWORK}'"
+ `codesign -f -v -s "${CODE_SIGN_IDENTITY}" "${FRAMEWORK}"`
+ RESULT=$?
+ if [[ $RESULT != 0 ]] ; then
+ exit 1
+ fi
+done
+
+# restore $IFS
+IFS=$SAVEIFS
diff --git a/Xcode/SDL/pkg-support/devel-resources/ReadMe.txt b/Xcode/SDL/pkg-support/devel-resources/ReadMe.txt
deleted file mode 100755
index f4fe36164..000000000
--- a/Xcode/SDL/pkg-support/devel-resources/ReadMe.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The Simple DirectMedia Layer (SDL for short) is a cross-platform library designed to make it easy to write multi-media software, such as games and emulators.
-
-The Simple DirectMedia Layer library source code is available from: http://www.libsdl.org/
-
-This library is distributed under the terms of the GNU LGPL license: http://www.gnu.org/copyleft/lesser.html
\ No newline at end of file
diff --git a/Xcode/SDL/pkg-support/devel-resources/Welcome.txt b/Xcode/SDL/pkg-support/devel-resources/Welcome.txt
deleted file mode 100755
index 9b0d2862f..000000000
--- a/Xcode/SDL/pkg-support/devel-resources/Welcome.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This package installs documentation and Project Builder stationary for the SDL framework.
-
-The SDL documentation is installed into /Developer/Documentation/SDL.
-
-The SDL Mac OS X Readme is installed into your home directory.
diff --git a/Xcode/SDL/pkg-support/devel-resources/install.sh b/Xcode/SDL/pkg-support/devel-resources/install.sh
deleted file mode 100755
index e7a4dedff..000000000
--- a/Xcode/SDL/pkg-support/devel-resources/install.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to SDL-devel.post_install and SDL-devel.post_upgrade
-# inside the .pkg bundle
-echo "Running post-install script"
-umask 022
-
-USER=`basename ~`
-echo "User is \"$USER\""
-
-ROOT=/Developer/Documentation/SDL
-echo "Fixing framework permissions"
-find $ROOT -type d -exec chmod a+rx {} \;
-find $ROOT -type f -exec chmod a+r {} \;
-
-## We're not installing frameworks here anymore. The single
-## framework should be installed to /Library/Frameworks which
-## is handled by the standard package (not developer package).
-## Using the home directory here is problematic for multi-user systems too.
-# echo "Moving SDL.framework to ~/Library/Frameworks"
-# move SDL to its proper home, so the target stationary works
-#sudo -u $USER mkdir -p ~/Library/Frameworks
-#sudo -u $USER /Developer/Tools/CpMac -r $ROOT/SDL.framework ~/Library/Frameworks
-
-## I'm not sure where this gets created and what's put in there.
-rm -rf $ROOT/SDL.framework
-
-## I think precompiled headers have changed through the revisions of Apple's gcc.
-## I don't know how useful this is anymore w.r.t. Apple's newest system for precompiled headers.
-## I'm removing this for now.
-# echo "Precompiling Header"
-# precompile header for speedier compiles
-#sudo -u $USER /usr/bin/cc -precomp ~/Library/Frameworks/SDL.framework/Headers/SDL.h -o ~/Library/Frameworks/SDL.framework/Headers/SDL.p
-
-# find the directory to store stationary in
-if [ -e "/Library/Application Support/Apple/Developer Tools" ] ; then
- echo "Installing project stationary for XCode"
- PBXDIR="/Library/Application Support/Apple/Developer Tools"
-else
- echo "Installing project stationary for Project Builder"
- PBXDIR="/Developer/ProjectBuilder Extras"
-fi
-
-# move stationary to its proper home
-mkdir -p "$PBXDIR/Project Templates/Application"
-mkdir -p "$PBXDIR/Target Templates/SDL"
-
-cp -r "$ROOT/Project Stationary/SDL Application" "$PBXDIR/Project Templates/Application/"
-cp -r "$ROOT/Project Stationary/SDL Cocoa Application" "$PBXDIR/Project Templates/Application/"
-cp -r "$ROOT/Project Stationary/SDL Custom Cocoa Application" "$PBXDIR/Project Templates/Application/"
-cp -r "$ROOT/Project Stationary/SDL OpenGL Application" "$PBXDIR/Project Templates/Application/"
-cp "$ROOT/Project Stationary/Application.trgttmpl" "$PBXDIR/Target Templates/SDL/"
-
-rm -rf "$ROOT/Project Stationary"
-
-# Actually, man doesn't check this directory by default, so this isn't
-# very helpful anymore.
-#echo "Installing Man Pages"
-## remove old man pages
-#rm -rf "/Developer/Documentation/ManPages/man3/SDL"*
-#
-## install man pages
-#mkdir -p "/Developer/Documentation/ManPages/man3"
-#cp "$ROOT/docs/man3/SDL"* "/Developer/Documentation/ManPages/man3/"
-#rm -rf "$ROOT/docs/man3"
-#
-#echo "Rebuilding Apropos Database"
-## rebuild apropos database
-#/usr/libexec/makewhatis
-
-# copy README file to your home directory
-sudo -u $USER cp "$ROOT/Readme SDL Developer.txt" ~/
-
-# open up the README file
-sudo -u $USER open ~/"Readme SDL Developer.txt"
diff --git a/Xcode/SDL/pkg-support/resources/ReadMe.txt b/Xcode/SDL/pkg-support/resources/ReadMe.txt
index f5c3b9ffc..40ac3a14c 100755
--- a/Xcode/SDL/pkg-support/resources/ReadMe.txt
+++ b/Xcode/SDL/pkg-support/resources/ReadMe.txt
@@ -19,12 +19,6 @@ Copy the SDL2.framework to /Library/Frameworks
You may alternatively install it in /Library/Frameworks
if your access privileges are not high enough.
-(Be aware that the Xcode templates we provide in the SDL Developer Extras
-package may require some adjustment for your system if you do this.)
-
-
-Known Issues:
-???
Additional References:
diff --git a/Xcode/SDL/pkg-support/resources/ReadMeDevLite.txt b/Xcode/SDL/pkg-support/resources/ReadMeDevLite.txt
deleted file mode 100644
index f1831a606..000000000
--- a/Xcode/SDL/pkg-support/resources/ReadMeDevLite.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory is for developers. This directory contains some basic essentials you will need for developing SDL based applications on OS X. The SDL-devel package contains all of this stuff plus more, so you can ignore this if you install the SDL-devel.pkg. The SDL-devel package contains Project Builder/Xcode templates, SDL documentation, and different variations of SDLmain and NIB files for SDL.
-
-To compile an SDL based application on OS X, SDLMain.m must be compiled into your program. (See the SDL FAQ). The SDL-devel.pkg includes Project Builder/Xcode templates which already do this for you. But for those who may not want to install the dev package, an SDLMain is provided here as a convenience. Be aware that there are different variations of SDLMain.m depending on what class of SDL application you make and they are intended to work with NIB files. Only one SDLMain variant is provided here and without any NIB files. You should look to the SDL-devel package for the others. We currently do not provide a SDLMain.a file, partly to call to attention that there are different variations of SDLmain.
-
-To build from the command line, your gcc line will look something like this:
-
-gcc -I/Library/Frameworks/SDL.framework/Headers MyProgram.c SDLmain.m -framework SDL -framework Cocoa
-
-An SDL/OpenGL based application might look like:
-
-gcc -I/Library/Frameworks/SDL.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers MyProgram.c SDLmain.m -framework SDL -framework Cocoa -framework OpenGL
-
diff --git a/Xcode/SDL/testsdl-Info.plist b/Xcode/SDL/testsdl-Info.plist
deleted file mode 100644
index 88ac6abca..000000000
--- a/Xcode/SDL/testsdl-Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIdentifier
- com.yourcompany.${PRODUCT_NAME:rfc1034identifier}
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1
- LSMinimumSystemVersion
- ${MACOSX_DEPLOYMENT_TARGET}
- NSMainNibFile
- SDLMain
- NSPrincipalClass
- NSApplication
-
-
diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
index 78e73b472..bb4714de2 100755
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -780,20 +780,6 @@
remoteGlobalIDString = BECDF6BE0761BA81005FE872;
remoteInfo = "Standard DMG";
};
- 003FA64A093FFD41000C53B3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BECDF6C30761BA81005FE872;
- remoteInfo = "Devel Extras Package";
- };
- 4537747F120914AE002F0F45 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 00D8D9EF1195090700638393;
- remoteInfo = testsdl;
- };
DB166D6D16A1CEAA00A1396C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -878,6 +864,13 @@
remoteGlobalIDString = DB166E8016A1D78C00A1396C;
remoteInfo = teststreaming;
};
+ DB1D40D617B3F30D00D74CFC /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = DB31407717554B71006C0E22;
+ remoteInfo = "Shared Library";
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -991,13 +984,13 @@
0017958F1074216E00F5D044 /* testatomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testatomic.c; path = ../../test/testatomic.c; sourceTree = SOURCE_ROOT; };
001795AD107421BF00F5D044 /* testaudioinfo */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testaudioinfo; sourceTree = BUILT_PRODUCTS_DIR; };
001795B01074222D00F5D044 /* testaudioinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testaudioinfo.c; path = ../../test/testaudioinfo.c; sourceTree = SOURCE_ROOT; };
- 0017972110742F3200F5D044 /* testgl2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testgl2; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0017972110742F3200F5D044 /* testgl2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testgl2; sourceTree = BUILT_PRODUCTS_DIR; };
0017972710742FB900F5D044 /* testgl2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testgl2.c; path = ../../test/testgl2.c; sourceTree = SOURCE_ROOT; };
- 00179748107430D600F5D044 /* testhaptic */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testhaptic; sourceTree = BUILT_PRODUCTS_DIR; };
+ 00179748107430D600F5D044 /* testhaptic */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testhaptic; sourceTree = BUILT_PRODUCTS_DIR; };
0017974E1074315700F5D044 /* testhaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testhaptic.c; path = ../../test/testhaptic.c; sourceTree = SOURCE_ROOT; };
0017976E107431B300F5D044 /* testdraw2 */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testdraw2; sourceTree = BUILT_PRODUCTS_DIR; };
001797711074320D00F5D044 /* testdraw2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testdraw2.c; path = ../../test/testdraw2.c; sourceTree = SOURCE_ROOT; };
- 0017978E107432AE00F5D044 /* testime */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testime; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0017978E107432AE00F5D044 /* testime */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testime; sourceTree = BUILT_PRODUCTS_DIR; };
00179791107432FA00F5D044 /* testime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testime.c; path = ../../test/testime.c; sourceTree = SOURCE_ROOT; };
001797AE1074334C00F5D044 /* testintersections */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testintersections; sourceTree = BUILT_PRODUCTS_DIR; };
001797B31074339C00F5D044 /* testintersections.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testintersections.c; path = ../../test/testintersections.c; sourceTree = SOURCE_ROOT; };
@@ -1056,13 +1049,13 @@
4537749212091504002F0F45 /* testshape */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testshape; sourceTree = BUILT_PRODUCTS_DIR; };
453774A4120915E3002F0F45 /* testshape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testshape.c; path = ../../test/testshape.c; sourceTree = SOURCE_ROOT; };
BBFC088E164C6820003E6A99 /* testgamecontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testgamecontroller.c; path = ../../test/testgamecontroller.c; sourceTree = ""; };
- BBFC08CD164C6862003E6A99 /* testgamecontroller */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testgamecontroller; sourceTree = BUILT_PRODUCTS_DIR; };
- BEC566B60761D90300A33029 /* checkkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = checkkeys; sourceTree = BUILT_PRODUCTS_DIR; };
+ BBFC08CD164C6862003E6A99 /* testgamecontroller */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testgamecontroller; sourceTree = BUILT_PRODUCTS_DIR; };
+ BEC566B60761D90300A33029 /* checkkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = checkkeys; sourceTree = BUILT_PRODUCTS_DIR; };
BEC566D10761D90300A33029 /* loopwave */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = loopwave; sourceTree = BUILT_PRODUCTS_DIR; };
BEC567060761D90400A33029 /* testerror */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testerror; sourceTree = BUILT_PRODUCTS_DIR; };
BEC5672E0761D90400A33029 /* testthread */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testthread; sourceTree = BUILT_PRODUCTS_DIR; };
- BEC5673B0761D90400A33029 /* testjoystick */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testjoystick; sourceTree = BUILT_PRODUCTS_DIR; };
- BEC567480761D90400A33029 /* testkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testkeys; sourceTree = BUILT_PRODUCTS_DIR; };
+ BEC5673B0761D90400A33029 /* testjoystick */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testjoystick; sourceTree = BUILT_PRODUCTS_DIR; };
+ BEC567480761D90400A33029 /* testkeys */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testkeys; sourceTree = BUILT_PRODUCTS_DIR; };
BEC567550761D90400A33029 /* testlock */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testlock; sourceTree = BUILT_PRODUCTS_DIR; };
BEC5677D0761D90500A33029 /* testsem */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testsem; sourceTree = BUILT_PRODUCTS_DIR; };
BEC567980761D90500A33029 /* testtimer */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testtimer; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1848,9 +1841,8 @@
children = (
003FA643093FFD41000C53B3 /* SDL2.framework */,
003FA645093FFD41000C53B3 /* libSDL2.a */,
+ DB1D40D717B3F30D00D74CFC /* libSDL2.dylib */,
003FA649093FFD41000C53B3 /* Standard DMG */,
- 003FA64B093FFD41000C53B3 /* Developer Extras Package */,
- 45377480120914AE002F0F45 /* testsdl.app */,
);
name = Products;
sourceTree = "";
@@ -2800,18 +2792,11 @@
remoteRef = 003FA648093FFD41000C53B3 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 003FA64B093FFD41000C53B3 /* Developer Extras Package */ = {
+ DB1D40D717B3F30D00D74CFC /* libSDL2.dylib */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = "Developer Extras Package";
- remoteRef = 003FA64A093FFD41000C53B3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 45377480120914AE002F0F45 /* testsdl.app */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = testsdl.app;
- remoteRef = 4537747F120914AE002F0F45 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.dylib";
+ path = libSDL2.dylib;
+ remoteRef = DB1D40D617B3F30D00D74CFC /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -4323,6 +4308,7 @@
DB166D8216A1D12400A1396C /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
};
DB166DBC16A1D2F600A1396C /* Build configuration list for PBXNativeTarget "testgesture" */ = {
isa = XCConfigurationList;
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeLeopard/SDL Application/English.lproj/InfoPlist.strings
deleted file mode 100644
index 6e721b0ef..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL Application/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/Info.plist b/Xcode/TemplatesForXcodeLeopard/SDL Application/Info.plist
deleted file mode 100644
index e4332041b..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Application/Info.plist
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
-
- CFBundleIdentifier
- com.yourcompany.___PROJECTNAMEASXML___
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- NSMainNibFile
- SDLMain
- NSPrincipalClass
- NSApplication
- LSMinimumSystemVersionByArchitecture
-
- x86_64
- 10.6.0
- i386
- 10.4.0
- ppc
- 10.4.0
-
-
-
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
deleted file mode 100644
index 00095074a..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Prefix header for all source files of the 'ÇPROJECTNAMEÈ' target in the 'ÇPROJECTNAMEÈ' project
-//
-
-#include "SDL.h"
-
-#ifdef __OBJC__
- #import
-#endif
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
deleted file mode 100644
index ae0b02b12..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
deleted file mode 100644
index d9ca45493..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- FilesToRename = {
- "SDLApp_Prefix.pch" = "ÇPROJECTNAMEÈ_Prefix.pch";
- };
- FilesToMacroExpand = (
- "ÇPROJECTNAMEÈ_Prefix.pch",
- "Info.plist",
- "English.lproj/InfoPlist.strings",
- "main.c",
- );
- Description = "This project builds an SDL-based application.";
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/project.pbxproj
deleted file mode 100644
index 7179f5254..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Application/___PROJECTNAME___.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,304 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A3E09D088BA00EBEB88 /* main.c */; };
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */,
- );
- name = "Copy Frameworks into .app bundle";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 002F39F909D0881F00EBEB88 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; };
- 002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = SOURCE_ROOT; };
- 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; };
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; };
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "___PROJECTNAME____Prefix.pch"; sourceTree = ""; };
- 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; };
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 8D11072E0486CEB800E47090 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */,
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 080E96DDFE201D6D7F000001 /* Classes */ = {
- isa = PBXGroup;
- children = (
- );
- name = Classes;
- sourceTree = "";
- };
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 002F39F909D0881F00EBEB88 /* SDL.framework */,
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "";
- };
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
- isa = PBXGroup;
- children = (
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
- );
- name = "Other Frameworks";
- sourceTree = "";
- };
- 19C28FACFE9D520D11CA2CBB /* Products */ = {
- isa = PBXGroup;
- children = (
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */,
- );
- name = Products;
- sourceTree = "";
- };
- 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */ = {
- isa = PBXGroup;
- children = (
- 080E96DDFE201D6D7F000001 /* Classes */,
- 29B97315FDCFA39411CA2CEA /* Other Sources */,
- 29B97317FDCFA39411CA2CEA /* Resources */,
- 29B97323FDCFA39411CA2CEA /* Frameworks */,
- 19C28FACFE9D520D11CA2CBB /* Products */,
- );
- name = "___PROJECTNAMEASXML___";
- sourceTree = "";
- };
- 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
- isa = PBXGroup;
- children = (
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */,
- 002F3A3E09D088BA00EBEB88 /* main.c */,
- );
- name = "Other Sources";
- sourceTree = "";
- };
- 29B97317FDCFA39411CA2CEA /* Resources */ = {
- isa = PBXGroup;
- children = (
- 8D1107310486CEB800E47090 /* Info.plist */,
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
- );
- name = Resources;
- sourceTree = "";
- };
- 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
- );
- name = Frameworks;
- sourceTree = "";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */;
- buildPhases = (
- 8D1107290486CEB800E47090 /* Resources */,
- 8D11072C0486CEB800E47090 /* Sources */,
- 8D11072E0486CEB800E47090 /* Frameworks */,
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = "___PROJECTNAME___";
- productInstallPath = "$(HOME)/Applications";
- productName = "___PROJECTNAME___";
- productReference = 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 29B97313FDCFA39411CA2CEA /* Project object */ = {
- isa = PBXProject;
- buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */;
- compatibilityVersion = "Xcode 2.4";
- hasScannedForEncodings = 1;
- mainGroup = 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 8D1107290486CEB800E47090 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 8D11072C0486CEB800E47090 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 089C165DFE840E0CC02AAC07 /* English */,
- );
- name = InfoPlist.strings;
- sourceTree = "";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- C01FCF4B08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Debug;
- };
- C01FCF4C08A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Release;
- };
- C01FCF4F08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Debug;
- };
- C01FCF5008A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4B08A954540054247B /* Debug */,
- C01FCF4C08A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4F08A954540054247B /* Debug */,
- C01FCF5008A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Application/main.c b/Xcode/TemplatesForXcodeLeopard/SDL Application/main.c
deleted file mode 100644
index 7115de989..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Application/main.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/* Simple program: Create a blank window, wait for keypress, quit.
-
- Please see the SDL documentation for details on using the SDL API:
- /Developer/Documentation/SDL/docs.html
-*/
-
-#include
-#include
-#include
-#include
-
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{
- Uint32 initflags = SDL_INIT_VIDEO; /* See documentation for details */
- SDL_Surface *screen;
- Uint8 video_bpp = 0;
- Uint32 videoflags = SDL_SWSURFACE;
- int done;
- SDL_Event event;
-
- /* Initialize the SDL library */
- if ( SDL_Init(initflags) < 0 ) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n",
- SDL_GetError());
- exit(1);
- }
-
- /* Set 640x480 video mode */
- screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
- if (screen == NULL) {
- fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
- video_bpp, SDL_GetError());
- SDL_Quit();
- exit(2);
- }
-
- done = 0;
- while ( !done ) {
-
- /* Check for events */
- while ( SDL_PollEvent(&event) ) {
- switch (event.type) {
-
- case SDL_MOUSEMOTION:
- break;
- case SDL_MOUSEBUTTONDOWN:
- break;
- case SDL_KEYDOWN:
- /* Any keypress quits the app... */
- case SDL_QUIT:
- done = 1;
- break;
- default:
- break;
- }
- }
- }
-
- /* Clean up the SDL library */
- SDL_Quit();
- return(0);
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/InfoPlist.strings
deleted file mode 100644
index 6e721b0ef..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/classes.nib b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/classes.nib
deleted file mode 100644
index 799eaaddd..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/classes.nib
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- ACTIONS = {
- help = id;
- newGame = id;
- openGame = id;
- prefsMenu = id;
- saveGame = id;
- saveGameAs = id;
- };
- CLASS = SDLMain;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/info.nib b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/info.nib
deleted file mode 100644
index 1d6fb7e01..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/info.nib
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- IBDocumentLocation
- 62 117 356 240 0 0 1152 848
- IBEditorPositions
-
- 29
- 62 362 195 44 0 0 1152 848
-
- IBFramework Version
- 291.0
- IBOpenObjects
-
- 29
-
- IBSystem Version
- 6L60
-
-
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/objects.nib b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/objects.nib
deleted file mode 100644
index 637801528..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/English.lproj/SDLMain.nib/objects.nib and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/Info.plist b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/Info.plist
deleted file mode 100644
index 40a970f97..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/Info.plist
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
-
- CFBundleIdentifier
- com.yourcompany.___PROJECTNAMEASXML___
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- NSMainNibFile
- SDLMain
- NSPrincipalClass
- NSApplication
- LSMinimumSystemVersionByArchitecture
-
- x86_64
- 10.6.0
- i386
- 10.4.0
- ppc
- 10.4.0
-
-
-
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
deleted file mode 100644
index 00095074a..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Prefix header for all source files of the 'ÇPROJECTNAMEÈ' target in the 'ÇPROJECTNAMEÈ' project
-//
-
-#include "SDL.h"
-
-#ifdef __OBJC__
- #import
-#endif
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
deleted file mode 100644
index ae0b02b12..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
deleted file mode 100644
index 1dcbea207..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- FilesToRename = {
- "SDLApp_Prefix.pch" = "ÇPROJECTNAMEÈ_Prefix.pch";
- };
- FilesToMacroExpand = (
- "ÇPROJECTNAMEÈ_Prefix.pch",
- "Info.plist",
- "English.lproj/InfoPlist.strings",
- "main.c",
- );
- Description = "This project builds an SDL-based application with Cocoa menus.";
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/project.pbxproj
deleted file mode 100644
index e259c6102..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/___PROJECTNAME___.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A3E09D088BA00EBEB88 /* main.c */; };
- 002F3AF109D08F1000EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 002F3AEF09D08F1000EBEB88 /* SDLMain.nib */; };
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */,
- );
- name = "Copy Frameworks into .app bundle";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 002F39F909D0881F00EBEB88 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; };
- 002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = SOURCE_ROOT; };
- 002F3AF009D08F1000EBEB88 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/SDLMain.nib; sourceTree = ""; };
- 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; };
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; };
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "___PROJECTNAME____Prefix.pch"; sourceTree = ""; };
- 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; };
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 8D11072E0486CEB800E47090 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */,
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 080E96DDFE201D6D7F000001 /* Classes */ = {
- isa = PBXGroup;
- children = (
- );
- name = Classes;
- sourceTree = "";
- };
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 002F39F909D0881F00EBEB88 /* SDL.framework */,
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "";
- };
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
- isa = PBXGroup;
- children = (
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
- );
- name = "Other Frameworks";
- sourceTree = "";
- };
- 19C28FACFE9D520D11CA2CBB /* Products */ = {
- isa = PBXGroup;
- children = (
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */,
- );
- name = Products;
- sourceTree = "";
- };
- 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */ = {
- isa = PBXGroup;
- children = (
- 080E96DDFE201D6D7F000001 /* Classes */,
- 29B97315FDCFA39411CA2CEA /* Other Sources */,
- 29B97317FDCFA39411CA2CEA /* Resources */,
- 29B97323FDCFA39411CA2CEA /* Frameworks */,
- 19C28FACFE9D520D11CA2CBB /* Products */,
- );
- name = "___PROJECTNAMEASXML___";
- sourceTree = "";
- };
- 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
- isa = PBXGroup;
- children = (
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */,
- 002F3A3E09D088BA00EBEB88 /* main.c */,
- );
- name = "Other Sources";
- sourceTree = "";
- };
- 29B97317FDCFA39411CA2CEA /* Resources */ = {
- isa = PBXGroup;
- children = (
- 8D1107310486CEB800E47090 /* Info.plist */,
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
- 002F3AEF09D08F1000EBEB88 /* SDLMain.nib */,
- );
- name = Resources;
- sourceTree = "";
- };
- 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
- );
- name = Frameworks;
- sourceTree = "";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */;
- buildPhases = (
- 8D1107290486CEB800E47090 /* Resources */,
- 8D11072C0486CEB800E47090 /* Sources */,
- 8D11072E0486CEB800E47090 /* Frameworks */,
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = "___PROJECTNAME___";
- productInstallPath = "$(HOME)/Applications";
- productName = "___PROJECTNAME___";
- productReference = 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 29B97313FDCFA39411CA2CEA /* Project object */ = {
- isa = PBXProject;
- buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */;
- compatibilityVersion = "Xcode 2.4";
- hasScannedForEncodings = 1;
- mainGroup = 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 8D1107290486CEB800E47090 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
- 002F3AF109D08F1000EBEB88 /* SDLMain.nib in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 8D11072C0486CEB800E47090 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 002F3AEF09D08F1000EBEB88 /* SDLMain.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 002F3AF009D08F1000EBEB88 /* English */,
- );
- name = SDLMain.nib;
- sourceTree = "";
- };
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 089C165DFE840E0CC02AAC07 /* English */,
- );
- name = InfoPlist.strings;
- sourceTree = "";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- C01FCF4B08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Debug;
- };
- C01FCF4C08A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Release;
- };
- C01FCF4F08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Debug;
- };
- C01FCF5008A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4B08A954540054247B /* Debug */,
- C01FCF4C08A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4F08A954540054247B /* Debug */,
- C01FCF5008A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c
deleted file mode 100644
index 7115de989..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/* Simple program: Create a blank window, wait for keypress, quit.
-
- Please see the SDL documentation for details on using the SDL API:
- /Developer/Documentation/SDL/docs.html
-*/
-
-#include
-#include
-#include
-#include
-
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{
- Uint32 initflags = SDL_INIT_VIDEO; /* See documentation for details */
- SDL_Surface *screen;
- Uint8 video_bpp = 0;
- Uint32 videoflags = SDL_SWSURFACE;
- int done;
- SDL_Event event;
-
- /* Initialize the SDL library */
- if ( SDL_Init(initflags) < 0 ) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n",
- SDL_GetError());
- exit(1);
- }
-
- /* Set 640x480 video mode */
- screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
- if (screen == NULL) {
- fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
- video_bpp, SDL_GetError());
- SDL_Quit();
- exit(2);
- }
-
- done = 0;
- while ( !done ) {
-
- /* Check for events */
- while ( SDL_PollEvent(&event) ) {
- switch (event.type) {
-
- case SDL_MOUSEMOTION:
- break;
- case SDL_MOUSEBUTTONDOWN:
- break;
- case SDL_KEYDOWN:
- /* Any keypress quits the app... */
- case SDL_QUIT:
- done = 1;
- break;
- default:
- break;
- }
- }
- }
-
- /* Clean up the SDL library */
- SDL_Quit();
- return(0);
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/English.lproj/InfoPlist.strings
deleted file mode 100644
index 6e721b0ef..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/Info.plist b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/Info.plist
deleted file mode 100644
index a2e942960..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/Info.plist
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
-
- CFBundleIdentifier
- com.yourcompany.___PROJECTNAMEASXML___
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- NSMainNibFile
- SDLMain
- NSPrincipalClass
- NSApplication
- LSMinimumSystemVersionByArchitecture
-
- x86_64
- 10.6.0
- i386
- 10.4.0
- ppc
- 10.4.0
-
-
-
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
deleted file mode 100644
index 00095074a..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAMEASIDENTIFIER____Prefix.pch
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Prefix header for all source files of the 'ÇPROJECTNAMEÈ' target in the 'ÇPROJECTNAMEÈ' project
-//
-
-#include "SDL.h"
-
-#ifdef __OBJC__
- #import
-#endif
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
deleted file mode 100644
index ae0b02b12..000000000
Binary files a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
deleted file mode 100644
index ba87745fc..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- FilesToRename = {
- "SDLApp_Prefix.pch" = "ÇPROJECTNAMEÈ_Prefix.pch";
- };
- FilesToMacroExpand = (
- "ÇPROJECTNAMEÈ_Prefix.pch",
- "Info.plist",
- "English.lproj/InfoPlist.strings",
- "main.c",
- );
- Description = "This project builds an SDL-based application that uses OpenGL.";
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/project.pbxproj
deleted file mode 100644
index d81bb862e..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/___PROJECTNAME___.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,346 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A3E09D088BA00EBEB88 /* main.c */; };
- 002F3BFA09D0938900EBEB88 /* atlantis.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3BF409D0938900EBEB88 /* atlantis.c */; };
- 002F3BFC09D0938900EBEB88 /* dolphin.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3BF609D0938900EBEB88 /* dolphin.c */; };
- 002F3BFD09D0938900EBEB88 /* shark.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3BF709D0938900EBEB88 /* shark.c */; };
- 002F3BFE09D0938900EBEB88 /* swim.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3BF809D0938900EBEB88 /* swim.c */; };
- 002F3BFF09D0938900EBEB88 /* whale.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3BF909D0938900EBEB88 /* whale.c */; };
- 002F3C0109D093BD00EBEB88 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C0009D093BD00EBEB88 /* OpenGL.framework */; };
- 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C6009D0951E00EBEB88 /* GLUT.framework */; };
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */,
- );
- name = "Copy Frameworks into .app bundle";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 002F39F909D0881F00EBEB88 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; };
- 002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = SOURCE_ROOT; };
- 002F3BF409D0938900EBEB88 /* atlantis.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = atlantis.c; path = atlantis/atlantis.c; sourceTree = SOURCE_ROOT; };
- 002F3BF509D0938900EBEB88 /* atlantis.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = atlantis.h; path = atlantis/atlantis.h; sourceTree = SOURCE_ROOT; };
- 002F3BF609D0938900EBEB88 /* dolphin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dolphin.c; path = atlantis/dolphin.c; sourceTree = SOURCE_ROOT; };
- 002F3BF709D0938900EBEB88 /* shark.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = shark.c; path = atlantis/shark.c; sourceTree = SOURCE_ROOT; };
- 002F3BF809D0938900EBEB88 /* swim.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = swim.c; path = atlantis/swim.c; sourceTree = SOURCE_ROOT; };
- 002F3BF909D0938900EBEB88 /* whale.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = whale.c; path = atlantis/whale.c; sourceTree = SOURCE_ROOT; };
- 002F3C0009D093BD00EBEB88 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; };
- 002F3C6009D0951E00EBEB88 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../../../../../../../../System/Library/Frameworks/GLUT.framework; sourceTree = SOURCE_ROOT; };
- 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; };
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; };
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "___PROJECTNAME____Prefix.pch"; sourceTree = ""; };
- 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; };
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 8D11072E0486CEB800E47090 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */,
- 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */,
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
- 002F3C0109D093BD00EBEB88 /* OpenGL.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 002F3BF309D0937800EBEB88 /* atlantis */ = {
- isa = PBXGroup;
- children = (
- 002F3BF409D0938900EBEB88 /* atlantis.c */,
- 002F3BF509D0938900EBEB88 /* atlantis.h */,
- 002F3BF609D0938900EBEB88 /* dolphin.c */,
- 002F3BF709D0938900EBEB88 /* shark.c */,
- 002F3BF809D0938900EBEB88 /* swim.c */,
- 002F3BF909D0938900EBEB88 /* whale.c */,
- );
- name = atlantis;
- sourceTree = "";
- };
- 080E96DDFE201D6D7F000001 /* Classes */ = {
- isa = PBXGroup;
- children = (
- );
- name = Classes;
- sourceTree = "";
- };
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 002F39F909D0881F00EBEB88 /* SDL.framework */,
- 002F3C6009D0951E00EBEB88 /* GLUT.framework */,
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
- 002F3C0009D093BD00EBEB88 /* OpenGL.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "";
- };
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
- isa = PBXGroup;
- children = (
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
- );
- name = "Other Frameworks";
- sourceTree = "";
- };
- 19C28FACFE9D520D11CA2CBB /* Products */ = {
- isa = PBXGroup;
- children = (
- 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */,
- );
- name = Products;
- sourceTree = "";
- };
- 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */ = {
- isa = PBXGroup;
- children = (
- 080E96DDFE201D6D7F000001 /* Classes */,
- 29B97315FDCFA39411CA2CEA /* Other Sources */,
- 29B97317FDCFA39411CA2CEA /* Resources */,
- 29B97323FDCFA39411CA2CEA /* Frameworks */,
- 19C28FACFE9D520D11CA2CBB /* Products */,
- );
- name = "___PROJECTNAMEASXML___";
- sourceTree = "";
- };
- 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
- isa = PBXGroup;
- children = (
- 002F3BF309D0937800EBEB88 /* atlantis */,
- 32CA4F630368D1EE00C91783 /* ___PROJECTNAME____Prefix.pch */,
- 002F3A3E09D088BA00EBEB88 /* main.c */,
- );
- name = "Other Sources";
- sourceTree = "";
- };
- 29B97317FDCFA39411CA2CEA /* Resources */ = {
- isa = PBXGroup;
- children = (
- 8D1107310486CEB800E47090 /* Info.plist */,
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
- );
- name = Resources;
- sourceTree = "";
- };
- 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
- 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
- );
- name = Frameworks;
- sourceTree = "";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */;
- buildPhases = (
- 8D1107290486CEB800E47090 /* Resources */,
- 8D11072C0486CEB800E47090 /* Sources */,
- 8D11072E0486CEB800E47090 /* Frameworks */,
- 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = "___PROJECTNAME___";
- productInstallPath = "$(HOME)/Applications";
- productName = "___PROJECTNAME___";
- productReference = 8D1107320486CEB800E47090 /* ___PROJECTNAME___.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 29B97313FDCFA39411CA2CEA /* Project object */ = {
- isa = PBXProject;
- buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */;
- compatibilityVersion = "Xcode 2.4";
- hasScannedForEncodings = 1;
- mainGroup = 29B97314FDCFA39411CA2CEA /* ___PROJECTNAMEASXML___ */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 8D1107260486CEB800E47090 /* ___PROJECTNAME___ */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 8D1107290486CEB800E47090 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 8D11072C0486CEB800E47090 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 002F3A3F09D088BA00EBEB88 /* main.c in Sources */,
- 002F3BFA09D0938900EBEB88 /* atlantis.c in Sources */,
- 002F3BFC09D0938900EBEB88 /* dolphin.c in Sources */,
- 002F3BFD09D0938900EBEB88 /* shark.c in Sources */,
- 002F3BFE09D0938900EBEB88 /* swim.c in Sources */,
- 002F3BFF09D0938900EBEB88 /* whale.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 089C165DFE840E0CC02AAC07 /* English */,
- );
- name = InfoPlist.strings;
- sourceTree = "";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- C01FCF4B08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Debug;
- };
- C01FCF4C08A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER____Prefix.pch";
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = "___PROJECTNAME___";
- WRAPPER_EXTENSION = app;
- };
- name = Release;
- };
- C01FCF4F08A954540054247B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Debug;
- };
- C01FCF5008A954540054247B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
- /Library/Frameworks,
- "$(FRAMEWORK_SEARCH_PATHS)",
- );
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = 4.0;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks/SDL.framework/Headers",
- /Library/Frameworks/SDL.framework/Headers,
- "$(HEADER_SEARCH_PATHS)",
- );
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4B08A954540054247B /* Debug */,
- C01FCF4C08A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C01FCF4F08A954540054247B /* Debug */,
- C01FCF5008A954540054247B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c
deleted file mode 100644
index 4efdf6ce8..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c
+++ /dev/null
@@ -1,459 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include "atlantis.h"
-
-fishRec sharks[NUM_SHARKS];
-fishRec momWhale;
-fishRec babyWhale;
-fishRec dolph;
-
-GLboolean Timing = GL_TRUE;
-
-int w_win = 640;
-int h_win = 480;
-GLint count = 0;
-GLenum StrMode = GL_VENDOR;
-
-GLboolean moving;
-
-static double mtime(void)
-{
- struct timeval tk_time;
- struct timezone tz;
-
- gettimeofday(&tk_time, &tz);
-
- return 4294.967296 * tk_time.tv_sec + 0.000001 * tk_time.tv_usec;
-}
-
-static double filter(double in, double *save)
-{
- static double k1 = 0.9;
- static double k2 = 0.05;
-
- save[3] = in;
- save[1] = save[0]*k1 + k2*(save[3] + save[2]);
-
- save[0]=save[1];
- save[2]=save[3];
-
- return(save[1]);
-}
-
-void DrawStr(const char *str)
-{
- GLint i = 0;
-
- if(!str) return;
-
- while(str[i])
- {
- glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
- i++;
- }
-}
-
-void
-InitFishs(void)
-{
- int i;
-
- for (i = 0; i < NUM_SHARKS; i++) {
- sharks[i].x = 70000.0 + rand() % 6000;
- sharks[i].y = rand() % 6000;
- sharks[i].z = rand() % 6000;
- sharks[i].psi = rand() % 360 - 180.0;
- sharks[i].v = 1.0;
- }
-
- dolph.x = 30000.0;
- dolph.y = 0.0;
- dolph.z = 6000.0;
- dolph.psi = 90.0;
- dolph.theta = 0.0;
- dolph.v = 3.0;
-
- momWhale.x = 70000.0;
- momWhale.y = 0.0;
- momWhale.z = 0.0;
- momWhale.psi = 90.0;
- momWhale.theta = 0.0;
- momWhale.v = 3.0;
-
- babyWhale.x = 60000.0;
- babyWhale.y = -2000.0;
- babyWhale.z = -2000.0;
- babyWhale.psi = 90.0;
- babyWhale.theta = 0.0;
- babyWhale.v = 3.0;
-}
-
-void
-Atlantis_Init(void)
-{
- static float ambient[] = {0.2, 0.2, 0.2, 1.0};
- static float diffuse[] = {1.0, 1.0, 1.0, 1.0};
- static float position[] = {0.0, 1.0, 0.0, 0.0};
- static float mat_shininess[] = {90.0};
- static float mat_specular[] = {0.8, 0.8, 0.8, 1.0};
- static float mat_diffuse[] = {0.46, 0.66, 0.795, 1.0};
- static float mat_ambient[] = {0.3, 0.4, 0.5, 1.0};
- static float lmodel_ambient[] = {0.4, 0.4, 0.4, 1.0};
- static float lmodel_localviewer[] = {0.0};
- //GLfloat map1[4] = {0.0, 0.0, 0.0, 0.0};
- //GLfloat map2[4] = {0.0, 0.0, 0.0, 0.0};
- static float fog_color[] = {0.0, 0.5, 0.9, 1.0};
-
- glFrontFace(GL_CCW);
-
- glDepthFunc(GL_LESS);
- glEnable(GL_DEPTH_TEST);
-
- glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
- glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse);
- glLightfv(GL_LIGHT0, GL_POSITION, position);
- glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
- glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, lmodel_localviewer);
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
-
- glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
- glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
- glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse);
- glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
-
- InitFishs();
-
- glEnable(GL_FOG);
- glFogi(GL_FOG_MODE, GL_EXP);
- glFogf(GL_FOG_DENSITY, 0.0000025);
- glFogfv(GL_FOG_COLOR, fog_color);
-
- glClearColor(0.0, 0.5, 0.9, 1.0);
-}
-
-void
-Atlantis_Reshape(int width, int height)
-{
- w_win = width;
- h_win = height;
-
- glViewport(0, 0, width, height);
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- gluPerspective(60.0, (GLfloat) width / (GLfloat) height, 20000.0, 300000.0);
- glMatrixMode(GL_MODELVIEW);
-}
-
-void
-Atlantis_Animate(void)
-{
- int i;
-
- for (i = 0; i < NUM_SHARKS; i++) {
- SharkPilot(&sharks[i]);
- SharkMiss(i);
- }
- WhalePilot(&dolph);
- dolph.phi++;
- //glutPostRedisplay();
- WhalePilot(&momWhale);
- momWhale.phi++;
- WhalePilot(&babyWhale);
- babyWhale.phi++;
-}
-
-void
-Atlantis_Key(unsigned char key, int x, int y)
-{
- switch (key) {
- case 't':
- Timing = !Timing;
- break;
- case ' ':
- switch(StrMode)
- {
- case GL_EXTENSIONS:
- StrMode = GL_VENDOR;
- break;
- case GL_VENDOR:
- StrMode = GL_RENDERER;
- break;
- case GL_RENDERER:
- StrMode = GL_VERSION;
- break;
- case GL_VERSION:
- StrMode = GL_EXTENSIONS;
- break;
- }
- break;
- case 27: /* Esc will quit */
- exit(1);
- break;
- case 's': /* "s" start animation */
- moving = GL_TRUE;
- //glutIdleFunc(Animate);
- break;
- case 'a': /* "a" stop animation */
- moving = GL_FALSE;
- //glutIdleFunc(NULL);
- break;
- case '.': /* "." will advance frame */
- if (!moving) {
- Atlantis_Animate();
- }
- }
-}
-/*
-void Display(void)
-{
- static float P123[3] = {-448.94, -203.14, 9499.60};
- static float P124[3] = {-442.64, -185.20, 9528.07};
- static float P125[3] = {-441.07, -148.05, 9528.07};
- static float P126[3] = {-443.43, -128.84, 9499.60};
- static float P127[3] = {-456.87, -146.78, 9466.67};
- static float P128[3] = {-453.68, -183.93, 9466.67};
-
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- glPushMatrix();
- FishTransform(&dolph);
- DrawDolphin(&dolph);
- glPopMatrix();
-
- glutSwapBuffers();
-}
-*/
-
-void
-Atlantis_Display(void)
-{
- int i;
- static double th[4] = {0.0, 0.0, 0.0, 0.0};
- static double t1 = 0.0, t2 = 0.0, t;
- char num_str[128];
-
- t1 = t2;
-
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- for (i = 0; i < NUM_SHARKS; i++) {
- glPushMatrix();
- FishTransform(&sharks[i]);
- DrawShark(&sharks[i]);
- glPopMatrix();
- }
-
- glPushMatrix();
- FishTransform(&dolph);
- DrawDolphin(&dolph);
- glPopMatrix();
-
- glPushMatrix();
- FishTransform(&momWhale);
- DrawWhale(&momWhale);
- glPopMatrix();
-
- glPushMatrix();
- FishTransform(&babyWhale);
- glScalef(0.45, 0.45, 0.3);
- DrawWhale(&babyWhale);
- glPopMatrix();
-
- if(Timing)
- {
- t2 = mtime();
- t = t2 - t1;
- if(t > 0.0001) t = 1.0 / t;
-
- glDisable(GL_LIGHTING);
- //glDisable(GL_DEPTH_TEST);
-
- glColor3f(1.0, 0.0, 0.0);
-
- glMatrixMode (GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
- glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
-
- glRasterPos2f(5.0, 5.0);
-
- switch(StrMode)
- {
- case GL_VENDOR:
- sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
- DrawStr(num_str);
- DrawStr(glGetString(GL_VENDOR));
- break;
- case GL_RENDERER:
- sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
- DrawStr(num_str);
- DrawStr(glGetString(GL_RENDERER));
- break;
- case GL_VERSION:
- sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
- DrawStr(num_str);
- DrawStr(glGetString(GL_VERSION));
- break;
- case GL_EXTENSIONS:
- sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
- DrawStr(num_str);
- DrawStr(glGetString(GL_EXTENSIONS));
- break;
- }
-
- glPopMatrix();
- glMatrixMode(GL_MODELVIEW);
-
- glEnable(GL_LIGHTING);
- //glEnable(GL_DEPTH_TEST);
- }
-
- count++;
-
- glutSwapBuffers();
-}
-
-/*
-void
-Visible(int state)
-{
- if (state == GLUT_VISIBLE) {
- if (moving)
- glutIdleFunc(Animate);
- } else {
- if (moving)
- glutIdleFunc(NULL);
- }
-}
-
-
-void
-timingSelect(int value)
-{
- switch(value)
- {
- case 1:
- StrMode = GL_VENDOR;
- break;
- case 2:
- StrMode = GL_RENDERER;
- break;
- case 3:
- StrMode = GL_VERSION;
- break;
- case 4:
- StrMode = GL_EXTENSIONS;
- break;
- }
-}
-
-void
-menuSelect(int value)
-{
- switch (value) {
- case 1:
- moving = GL_TRUE;
- glutIdleFunc(Animate);
- break;
- case 2:
- moving = GL_FALSE;
- glutIdleFunc(NULL);
- break;
- case 4:
- exit(0);
- break;
- }
-}
-
-int
-main(int argc, char **argv)
-{
- GLboolean fullscreen = GL_FALSE;
- GLint time_menu;
-
- srand(0);
-
- glutInit(&argc, argv);
- if (argc > 1 && !strcmp(argv[1], "-w"))
- fullscreen = GL_FALSE;
-
- //glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
- glutInitDisplayString("rgba double depth=24");
- if (fullscreen) {
- glutGameModeString("1024x768:32");
- glutEnterGameMode();
- } else {
- glutInitWindowSize(320, 240);
- glutCreateWindow("Atlantis Timing");
- }
- Init();
- glutDisplayFunc(Display);
- glutReshapeFunc(Reshape);
- glutKeyboardFunc(Key);
- moving = GL_TRUE;
-glutIdleFunc(Animate);
- glutVisibilityFunc(Visible);
-
- time_menu = glutCreateMenu(timingSelect);
- glutAddMenuEntry("GL_VENDOR", 1);
- glutAddMenuEntry("GL_RENDERER", 2);
- glutAddMenuEntry("GL_VERSION", 3);
- glutAddMenuEntry("GL_EXTENSIONS", 4);
-
- glutCreateMenu(menuSelect);
- glutAddMenuEntry("Start motion", 1);
- glutAddMenuEntry("Stop motion", 2);
- glutAddSubMenu("Timing Mode", time_menu);
- glutAddMenuEntry("Quit", 4);
-
- //glutAttachMenu(GLUT_RIGHT_BUTTON);
- glutAttachMenu(GLUT_RIGHT_BUTTON);
- glutMainLoop();
- return 0; // ANSI C requires main to return int.
-}
-*/
\ No newline at end of file
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.h b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.h
deleted file mode 100644
index 6ccf2d5f0..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#define RAD 57.295
-#define RRAD 0.01745
-
-#define NUM_SHARKS 4
-#define SHARKSIZE 6000
-#define SHARKSPEED 100.0
-
-#define WHALESPEED 250.0
-
-typedef struct _fishRec {
- float x, y, z, phi, theta, psi, v;
- float xt, yt, zt;
- float htail, vtail;
- float dtheta;
- int spurt, attack;
-} fishRec;
-
-extern fishRec sharks[NUM_SHARKS];
-extern fishRec momWhale;
-extern fishRec babyWhale;
-extern fishRec dolph;
-
-extern void FishTransform(fishRec *);
-extern void WhalePilot(fishRec *);
-extern void SharkPilot(fishRec *);
-extern void SharkMiss(int);
-extern void DrawWhale(fishRec *);
-extern void DrawShark(fishRec *);
-extern void DrawDolphin(fishRec *);
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/dolphin.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/dolphin.c
deleted file mode 100644
index 9fba3ba98..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/dolphin.c
+++ /dev/null
@@ -1,1934 +0,0 @@
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#include
-#include
-#include "atlantis.h"
-/* *INDENT-OFF* */
-static float N001[3] = {-0.005937 ,-0.101998 ,-0.994767};
-static float N002[3] = {0.936780 ,-0.200803 ,0.286569};
-static float N003[3] = {-0.233062 ,0.972058 ,0.028007};
-static float N005[3] = {0.898117 ,0.360171 ,0.252315};
-static float N006[3] = {-0.915437 ,0.348456 ,0.201378};
-static float N007[3] = {0.602263 ,-0.777527 ,0.180920};
-static float N008[3] = {-0.906912 ,-0.412015 ,0.088061};
-static float N012[3] = {0.884408 ,-0.429417 ,-0.182821};
-static float N013[3] = {0.921121 ,0.311084 ,-0.234016};
-static float N014[3] = {0.382635 ,0.877882 ,-0.287948};
-static float N015[3] = {-0.380046 ,0.888166 ,-0.258316};
-static float N016[3] = {-0.891515 ,0.392238 ,-0.226607};
-static float N017[3] = {-0.901419 ,-0.382002 ,-0.203763};
-static float N018[3] = {-0.367225 ,-0.911091 ,-0.187243};
-static float N019[3] = {0.339539 ,-0.924846 ,-0.171388};
-static float N020[3] = {0.914706 ,-0.378617 ,-0.141290};
-static float N021[3] = {0.950662 ,0.262713 ,-0.164994};
-static float N022[3] = {0.546359 ,0.801460 ,-0.243218};
-static float N023[3] = {-0.315796 ,0.917068 ,-0.243431};
-static float N024[3] = {-0.825687 ,0.532277 ,-0.186875};
-static float N025[3] = {-0.974763 ,-0.155232 ,-0.160435};
-static float N026[3] = {-0.560596 ,-0.816658 ,-0.137119};
-static float N027[3] = {0.380210 ,-0.910817 ,-0.160786};
-static float N028[3] = {0.923772 ,-0.358322 ,-0.135093};
-static float N029[3] = {0.951202 ,0.275053 ,-0.139859};
-static float N030[3] = {0.686099 ,0.702548 ,-0.188932};
-static float N031[3] = {-0.521865 ,0.826719 ,-0.210220};
-static float N032[3] = {-0.923820 ,0.346739 ,-0.162258};
-static float N033[3] = {-0.902095 ,-0.409995 ,-0.134646};
-static float N034[3] = {-0.509115 ,-0.848498 ,-0.144404};
-static float N035[3] = {0.456469 ,-0.880293 ,-0.129305};
-static float N036[3] = {0.873401 ,-0.475489 ,-0.105266};
-static float N037[3] = {0.970825 ,0.179861 ,-0.158584};
-static float N038[3] = {0.675609 ,0.714187 ,-0.183004};
-static float N039[3] = {-0.523574 ,0.830212 ,-0.191360};
-static float N040[3] = {-0.958895 ,0.230808 ,-0.165071};
-static float N041[3] = {-0.918285 ,-0.376803 ,-0.121542};
-static float N042[3] = {-0.622467 ,-0.774167 ,-0.114888};
-static float N043[3] = {0.404497 ,-0.908807 ,-0.102231};
-static float N044[3] = {0.930538 ,-0.365155 ,-0.027588};
-static float N045[3] = {0.921920 ,0.374157 ,-0.100345};
-static float N046[3] = {0.507346 ,0.860739 ,0.041562};
-static float N047[3] = {-0.394646 ,0.918815 ,-0.005730};
-static float N048[3] = {-0.925411 ,0.373024 ,-0.066837};
-static float N049[3] = {-0.945337 ,-0.322309 ,-0.049551};
-static float N050[3] = {-0.660437 ,-0.750557 ,-0.022072};
-static float N051[3] = {0.488835 ,-0.871950 ,-0.027261};
-static float N052[3] = {0.902599 ,-0.421397 ,0.087969};
-static float N053[3] = {0.938636 ,0.322606 ,0.122020};
-static float N054[3] = {0.484605 ,0.871078 ,0.079878};
-static float N055[3] = {-0.353607 ,0.931559 ,0.084619};
-static float N056[3] = {-0.867759 ,0.478564 ,0.134054};
-static float N057[3] = {-0.951583 ,-0.296030 ,0.082794};
-static float N058[3] = {-0.672355 ,-0.730209 ,0.121384};
-static float N059[3] = {0.528336 ,-0.842452 ,0.105525};
-static float N060[3] = {0.786913 ,-0.564760 ,0.248627};
-static float N062[3] = {0.622098 ,0.765230 ,0.165584};
-static float N063[3] = {-0.631711 ,0.767816 ,0.106773};
-static float N064[3] = {-0.687886 ,0.606351 ,0.398938};
-static float N065[3] = {-0.946327 ,-0.281623 ,0.158598};
-static float N066[3] = {-0.509549 ,-0.860437 ,0.002776};
-static float N067[3] = {0.462594 ,-0.876692 ,0.131977};
-static float N071[3] = {0.000000 ,1.000000 ,0.000000};
-static float N077[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N078[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N079[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N080[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N081[3] = {-0.571197 ,0.816173 ,0.087152};
-static float N082[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N083[3] = {-0.571197 ,0.816173 ,0.087152};
-static float N084[3] = {-0.571197 ,0.816173 ,0.087152};
-static float N085[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N086[3] = {-0.571197 ,0.816173 ,0.087152};
-static float N087[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N088[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N089[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N090[3] = {-0.880770 ,0.461448 ,0.106351};
-static float N091[3] = {0.000000 ,1.000000 ,0.000000};
-static float N092[3] = {0.000000 ,1.000000 ,0.000000};
-static float N093[3] = {0.000000 ,1.000000 ,0.000000};
-static float N094[3] = {1.000000 ,0.000000 ,0.000000};
-static float N095[3] = {-1.000000 ,0.000000 ,0.000000};
-static float N097[3] = {-0.697296 ,0.702881 ,0.140491};
-static float N098[3] = {0.918864 ,0.340821 ,0.198819};
-static float N099[3] = {-0.932737 ,0.201195 ,0.299202};
-static float N100[3] = {0.029517 ,0.981679 ,0.188244};
-static float N102[3] = {0.813521 ,-0.204936 ,0.544229};
-static float N110[3] = {-0.781480 ,-0.384779 ,0.491155};
-static float N111[3] = {-0.722243 ,0.384927 ,0.574627};
-static float N112[3] = {-0.752278 ,0.502679 ,0.425901};
-static float N113[3] = {0.547257 ,0.367910 ,0.751766};
-static float N114[3] = {0.725949 ,-0.232568 ,0.647233};
-static float N115[3] = {-0.747182 ,-0.660786 ,0.071280};
-static float N116[3] = {0.931519 ,0.200748 ,0.303270};
-static float N117[3] = {-0.828928 ,0.313757 ,0.463071};
-static float N118[3] = {0.902554 ,-0.370967 ,0.218587};
-static float N119[3] = {-0.879257 ,-0.441851 ,0.177973};
-static float N120[3] = {0.642327 ,0.611901 ,0.461512};
-static float N121[3] = {0.964817 ,-0.202322 ,0.167910};
-static float N122[3] = {0.000000 ,1.000000 ,0.000000};
-static float P001[3] = {5.68, -300.95, 1324.70};
-static float P002[3] = {338.69, -219.63, 9677.03};
-static float P003[3] = {12.18, 474.59, 9138.14};
-static float P005[3] = {487.51, 198.05, 9350.78};
-static float P006[3] = {-457.61, 68.74, 9427.85};
-static float P007[3] = {156.52, -266.72, 10311.68};
-static float P008[3] = {-185.56, -266.51, 10310.47};
-static float P009[3] = {124.39, -261.46, 1942.34};
-static float P010[3] = {-130.05, -261.46, 1946.03};
-static float P011[3] = {141.07, -320.11, 1239.38};
-static float P012[3] = {156.48, -360.12, 2073.41};
-static float P013[3] = {162.00, -175.88, 2064.44};
-static float P014[3] = {88.16, -87.72, 2064.02};
-static float P015[3] = {-65.21, -96.13, 2064.02};
-static float P016[3] = {-156.48, -180.96, 2064.44};
-static float P017[3] = {-162.00, -368.93, 2082.39};
-static float P018[3] = {-88.16, -439.22, 2082.39};
-static float P019[3] = {65.21, -440.32, 2083.39};
-static float P020[3] = {246.87, -356.02, 2576.95};
-static float P021[3] = {253.17, -111.15, 2567.15};
-static float P022[3] = {132.34, 51.41, 2559.84};
-static float P023[3] = {-97.88, 40.44, 2567.15};
-static float P024[3] = {-222.97, -117.49, 2567.15};
-static float P025[3] = {-252.22, -371.53, 2569.92};
-static float P026[3] = {-108.44, -518.19, 2586.75};
-static float P027[3] = {97.88, -524.79, 2586.75};
-static float P028[3] = {370.03, -421.19, 3419.70};
-static float P029[3] = {351.15, -16.98, 3423.17};
-static float P030[3] = {200.66, 248.46, 3430.37};
-static float P031[3] = {-148.42, 235.02, 3417.91};
-static float P032[3] = {-360.21, -30.27, 3416.84};
-static float P033[3] = {-357.90, -414.89, 3407.04};
-static float P034[3] = {-148.88, -631.35, 3409.90};
-static float P035[3] = {156.38, -632.59, 3419.70};
-static float P036[3] = {462.61, -469.21, 4431.51};
-static float P037[3] = {466.60, 102.25, 4434.98};
-static float P038[3] = {243.05, 474.34, 4562.02};
-static float P039[3] = {-191.23, 474.40, 4554.42};
-static float P040[3] = {-476.12, 111.05, 4451.11};
-static float P041[3] = {-473.36, -470.74, 4444.78};
-static float P042[3] = {-266.95, -748.41, 4447.78};
-static float P043[3] = {211.14, -749.91, 4429.73};
-static float P044[3] = {680.57, -370.27, 5943.46};
-static float P045[3] = {834.01, 363.09, 6360.63};
-static float P046[3] = {371.29, 804.51, 6486.26};
-static float P047[3] = {-291.43, 797.22, 6494.28};
-static float P048[3] = {-784.13, 370.75, 6378.01};
-static float P049[3] = {-743.29, -325.82, 5943.46};
-static float P050[3] = {-383.24, -804.77, 5943.46};
-static float P051[3] = {283.47, -846.09, 5943.46};
-static float iP001[3] = {5.68, -300.95, 1324.70};
-static float iP009[3] = {124.39, -261.46, 1942.34};
-static float iP010[3] = {-130.05, -261.46, 1946.03};
-static float iP011[3] = {141.07, -320.11, 1239.38};
-static float iP012[3] = {156.48, -360.12, 2073.41};
-static float iP013[3] = {162.00, -175.88, 2064.44};
-static float iP014[3] = {88.16, -87.72, 2064.02};
-static float iP015[3] = {-65.21, -96.13, 2064.02};
-static float iP016[3] = {-156.48, -180.96, 2064.44};
-static float iP017[3] = {-162.00, -368.93, 2082.39};
-static float iP018[3] = {-88.16, -439.22, 2082.39};
-static float iP019[3] = {65.21, -440.32, 2083.39};
-static float iP020[3] = {246.87, -356.02, 2576.95};
-static float iP021[3] = {253.17, -111.15, 2567.15};
-static float iP022[3] = {132.34, 51.41, 2559.84};
-static float iP023[3] = {-97.88, 40.44, 2567.15};
-static float iP024[3] = {-222.97, -117.49, 2567.15};
-static float iP025[3] = {-252.22, -371.53, 2569.92};
-static float iP026[3] = {-108.44, -518.19, 2586.75};
-static float iP027[3] = {97.88, -524.79, 2586.75};
-static float iP028[3] = {370.03, -421.19, 3419.70};
-static float iP029[3] = {351.15, -16.98, 3423.17};
-static float iP030[3] = {200.66, 248.46, 3430.37};
-static float iP031[3] = {-148.42, 235.02, 3417.91};
-static float iP032[3] = {-360.21, -30.27, 3416.84};
-static float iP033[3] = {-357.90, -414.89, 3407.04};
-static float iP034[3] = {-148.88, -631.35, 3409.90};
-static float iP035[3] = {156.38, -632.59, 3419.70};
-static float iP036[3] = {462.61, -469.21, 4431.51};
-static float iP037[3] = {466.60, 102.25, 4434.98};
-static float iP038[3] = {243.05, 474.34, 4562.02};
-static float iP039[3] = {-191.23, 474.40, 4554.42};
-static float iP040[3] = {-476.12, 111.05, 4451.11};
-static float iP041[3] = {-473.36, -470.74, 4444.78};
-static float iP042[3] = {-266.95, -748.41, 4447.78};
-static float iP043[3] = {211.14, -749.91, 4429.73};
-static float iP044[3] = {680.57, -370.27, 5943.46};
-static float iP045[3] = {834.01, 363.09, 6360.63};
-static float iP046[3] = {371.29, 804.51, 6486.26};
-static float iP047[3] = {-291.43, 797.22, 6494.28};
-static float iP048[3] = {-784.13, 370.75, 6378.01};
-static float iP049[3] = {-743.29, -325.82, 5943.46};
-static float iP050[3] = {-383.24, -804.77, 5943.46};
-static float iP051[3] = {283.47, -846.09, 5943.46};
-static float P052[3] = {599.09, -300.15, 7894.03};
-static float P053[3] = {735.48, 306.26, 7911.92};
-static float P054[3] = {246.22, 558.53, 8460.50};
-static float P055[3] = {-230.41, 559.84, 8473.23};
-static float P056[3] = {-698.66, 320.83, 7902.59};
-static float P057[3] = {-643.29, -299.16, 7902.59};
-static float P058[3] = {-341.47, -719.30, 7902.59};
-static float P059[3] = {252.57, -756.12, 7902.59};
-static float P060[3] = {458.39, -265.31, 9355.44};
-static float P062[3] = {224.04, 338.75, 9450.30};
-static float P063[3] = {-165.71, 341.04, 9462.35};
-static float P064[3] = {-298.11, 110.13, 10180.37};
-static float P065[3] = {-473.99, -219.71, 9355.44};
-static float P066[3] = {-211.97, -479.87, 9355.44};
-static float P067[3] = {192.86, -491.45, 9348.73};
-static float P068[3] = {-136.29, -319.84, 1228.73};
-static float P069[3] = {1111.17, -314.14, 1314.19};
-static float P070[3] = {-1167.34, -321.61, 1319.45};
-static float P071[3] = {1404.86, -306.66, 1235.45};
-static float P072[3] = {-1409.73, -314.14, 1247.66};
-static float P073[3] = {1254.01, -296.87, 1544.58};
-static float P074[3] = {-1262.09, -291.70, 1504.26};
-static float P075[3] = {965.71, -269.26, 1742.65};
-static float P076[3] = {-900.97, -276.74, 1726.07};
-static float iP068[3] = {-136.29, -319.84, 1228.73};
-static float iP069[3] = {1111.17, -314.14, 1314.19};
-static float iP070[3] = {-1167.34, -321.61, 1319.45};
-static float iP071[3] = {1404.86, -306.66, 1235.45};
-static float iP072[3] = {-1409.73, -314.14, 1247.66};
-static float iP073[3] = {1254.01, -296.87, 1544.58};
-static float iP074[3] = {-1262.09, -291.70, 1504.26};
-static float iP075[3] = {965.71, -269.26, 1742.65};
-static float iP076[3] = {-900.97, -276.74, 1726.07};
-static float P077[3] = {1058.00, -448.81, 8194.66};
-static float P078[3] = {-1016.51, -456.43, 8190.62};
-static float P079[3] = {-1515.96, -676.45, 7754.93};
-static float P080[3] = {1856.75, -830.34, 7296.56};
-static float P081[3] = {1472.16, -497.38, 7399.68};
-static float P082[3] = {-1775.26, -829.51, 7298.46};
-static float P083[3] = {911.09, -252.51, 7510.99};
-static float P084[3] = {-1451.94, -495.62, 7384.30};
-static float P085[3] = {1598.75, -669.26, 7769.90};
-static float P086[3] = {-836.53, -250.08, 7463.25};
-static float P087[3] = {722.87, -158.18, 8006.41};
-static float P088[3] = {-688.86, -162.28, 7993.89};
-static float P089[3] = {-626.92, -185.30, 8364.98};
-static float P090[3] = {647.72, -189.46, 8354.99};
-static float P091[3] = {0.00, 835.01, 5555.62};
-static float P092[3] = {0.00, 1350.18, 5220.86};
-static float P093[3] = {0.00, 1422.94, 5285.27};
-static float P094[3] = {0.00, 1296.75, 5650.19};
-static float P095[3] = {0.00, 795.63, 6493.88};
-static float iP091[3] = {0.00, 835.01, 5555.62};
-static float iP092[3] = {0.00, 1350.18, 5220.86};
-static float iP093[3] = {0.00, 1422.94, 5285.27};
-static float iP094[3] = {0.00, 1296.75, 5650.19};
-static float iP095[3] = {0.00, 795.63, 6493.88};
-static float P097[3] = {-194.91, -357.14, 10313.32};
-static float P098[3] = {135.35, -357.66, 10307.94};
-static float iP097[3] = {-194.91, -357.14, 10313.32};
-static float iP098[3] = {135.35, -357.66, 10307.94};
-static float P099[3] = {-380.53, -221.14, 9677.98};
-static float P100[3] = {0.00, 412.99, 9629.33};
-static float P102[3] = {59.51, -412.55, 10677.58};
-static float iP102[3] = {59.51, -412.55, 10677.58};
-static float P103[3] = {6.50, 484.74, 9009.94};
-static float P105[3] = {-41.86, 476.51, 9078.17};
-static float P108[3] = {49.20, 476.83, 9078.24};
-static float P110[3] = {-187.62, -410.04, 10674.12};
-static float iP110[3] = {-187.62, -410.04, 10674.12};
-static float P111[3] = {-184.25, -318.70, 10723.88};
-static float iP111[3] = {-184.25, -318.70, 10723.88};
-static float P112[3] = {-179.61, -142.81, 10670.26};
-static float P113[3] = {57.43, -147.94, 10675.26};
-static float P114[3] = {54.06, -218.90, 10712.44};
-static float P115[3] = {-186.35, -212.09, 10713.76};
-static float P116[3] = {205.90, -84.61, 10275.97};
-static float P117[3] = {-230.96, -83.26, 10280.09};
-static float iP118[3] = {216.78, -509.17, 10098.94};
-static float iP119[3] = {-313.21, -510.79, 10102.62};
-static float P118[3] = {216.78, -509.17, 10098.94};
-static float P119[3] = {-313.21, -510.79, 10102.62};
-static float P120[3] = {217.95, 96.34, 10161.62};
-static float P121[3] = {71.99, -319.74, 10717.70};
-static float iP121[3] = {71.99, -319.74, 10717.70};
-static float P122[3] = {0.00, 602.74, 5375.84};
-static float iP122[3] = {0.00, 602.74, 5375.84};
-static float P123[3] = {-448.94, -203.14, 9499.60};
-static float P124[3] = {-442.64, -185.20, 9528.07};
-static float P125[3] = {-441.07, -148.05, 9528.07};
-static float P126[3] = {-443.43, -128.84, 9499.60};
-static float P127[3] = {-456.87, -146.78, 9466.67};
-static float P128[3] = {-453.68, -183.93, 9466.67};
-static float P129[3] = {428.43, -124.08, 9503.03};
-static float P130[3] = {419.73, -142.14, 9534.56};
-static float P131[3] = {419.92, -179.96, 9534.56};
-static float P132[3] = {431.20, -199.73, 9505.26};
-static float P133[3] = {442.28, -181.67, 9475.96};
-static float P134[3] = {442.08, -143.84, 9475.96};
-/* *INDENT-ON* */
-
-void
-Dolphin001(void)
-{
- glNormal3fv(N071);
- glBegin(GL_POLYGON);
- glVertex3fv(P001);
- glVertex3fv(P068);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P068);
- glVertex3fv(P076);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P068);
- glVertex3fv(P070);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P076);
- glVertex3fv(P070);
- glVertex3fv(P074);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P070);
- glVertex3fv(P072);
- glVertex3fv(P074);
- glEnd();
- glNormal3fv(N119);
- glBegin(GL_POLYGON);
- glVertex3fv(P072);
- glVertex3fv(P070);
- glVertex3fv(P074);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P074);
- glVertex3fv(P070);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P070);
- glVertex3fv(P068);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P076);
- glVertex3fv(P068);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P068);
- glVertex3fv(P001);
- glVertex3fv(P010);
- glEnd();
-}
-
-void
-Dolphin002(void)
-{
- glNormal3fv(N071);
- glBegin(GL_POLYGON);
- glVertex3fv(P011);
- glVertex3fv(P001);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P075);
- glVertex3fv(P011);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P069);
- glVertex3fv(P011);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P069);
- glVertex3fv(P075);
- glVertex3fv(P073);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P071);
- glVertex3fv(P069);
- glVertex3fv(P073);
- glEnd();
- glNormal3fv(N119);
- glBegin(GL_POLYGON);
- glVertex3fv(P001);
- glVertex3fv(P011);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P009);
- glVertex3fv(P011);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P011);
- glVertex3fv(P069);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P069);
- glVertex3fv(P073);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P069);
- glVertex3fv(P071);
- glVertex3fv(P073);
- glEnd();
-}
-
-void
-Dolphin003(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glEnd();
-}
-
-void
-Dolphin004(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glEnd();
-}
-
-void
-Dolphin005(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glEnd();
-}
-
-void
-Dolphin006(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N093);
- glVertex3fv(P093);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N093);
- glVertex3fv(P093);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N122);
- glVertex3fv(P122);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N122);
- glVertex3fv(P122);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glEnd();
-}
-
-void
-Dolphin007(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glEnd();
-}
-
-void
-Dolphin008(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glEnd();
-}
-
-void
-Dolphin009(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
-}
-
-void
-Dolphin010(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N080);
- glVertex3fv(P080);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N090);
- glVertex3fv(P090);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N080);
- glVertex3fv(P080);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glNormal3fv(N090);
- glVertex3fv(P090);
- glEnd();
-}
-
-void
-Dolphin011(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N082);
- glVertex3fv(P082);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N082);
- glVertex3fv(P082);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
-}
-
-void
-Dolphin012(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glEnd();
-}
-
-void
-Dolphin013(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glNormal3fv(N117);
- glVertex3fv(P117);
- glNormal3fv(N112);
- glVertex3fv(P112);
- glNormal3fv(N113);
- glVertex3fv(P113);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N114);
- glVertex3fv(P114);
- glNormal3fv(N113);
- glVertex3fv(P113);
- glNormal3fv(N112);
- glVertex3fv(P112);
- glNormal3fv(N115);
- glVertex3fv(P115);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N114);
- glVertex3fv(P114);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glNormal3fv(N113);
- glVertex3fv(P113);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N114);
- glVertex3fv(P114);
- glNormal3fv(N007);
- glVertex3fv(P007);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N007);
- glVertex3fv(P007);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P002);
- glVertex3fv(P007);
- glVertex3fv(P008);
- glVertex3fv(P099);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P007);
- glVertex3fv(P114);
- glVertex3fv(P115);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N117);
- glVertex3fv(P117);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N117);
- glVertex3fv(P117);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N112);
- glVertex3fv(P112);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N112);
- glVertex3fv(P112);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N115);
- glVertex3fv(P115);
- glEnd();
-}
-
-void
-Dolphin014(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N111);
- glVertex3fv(P111);
- glNormal3fv(N110);
- glVertex3fv(P110);
- glNormal3fv(N102);
- glVertex3fv(P102);
- glNormal3fv(N121);
- glVertex3fv(P121);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N111);
- glVertex3fv(P111);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glNormal3fv(N110);
- glVertex3fv(P110);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glNormal3fv(N110);
- glVertex3fv(P110);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P098);
- glVertex3fv(P097);
- glVertex3fv(P111);
- glVertex3fv(P121);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P002);
- glVertex3fv(P099);
- glVertex3fv(P097);
- glVertex3fv(P098);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N110);
- glVertex3fv(P110);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glNormal3fv(N118);
- glVertex3fv(P118);
- glNormal3fv(N102);
- glVertex3fv(P102);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N119);
- glVertex3fv(P119);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N118);
- glVertex3fv(P118);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N118);
- glVertex3fv(P118);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N118);
- glVertex3fv(P118);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N098);
- glVertex3fv(P098);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N118);
- glVertex3fv(P118);
- glNormal3fv(N098);
- glVertex3fv(P098);
- glNormal3fv(N102);
- glVertex3fv(P102);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N102);
- glVertex3fv(P102);
- glNormal3fv(N098);
- glVertex3fv(P098);
- glNormal3fv(N121);
- glVertex3fv(P121);
- glEnd();
-}
-
-void
-Dolphin015(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glNormal3fv(N117);
- glVertex3fv(P117);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glNormal3fv(N117);
- glVertex3fv(P117);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N120);
- glVertex3fv(P120);
- glNormal3fv(N116);
- glVertex3fv(P116);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
-}
-
-void
-Dolphin016(void)
-{
-
- glDisable(GL_DEPTH_TEST);
- glBegin(GL_POLYGON);
- glVertex3fv(P123);
- glVertex3fv(P124);
- glVertex3fv(P125);
- glVertex3fv(P126);
- glVertex3fv(P127);
- glVertex3fv(P128);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P129);
- glVertex3fv(P130);
- glVertex3fv(P131);
- glVertex3fv(P132);
- glVertex3fv(P133);
- glVertex3fv(P134);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P103);
- glVertex3fv(P105);
- glVertex3fv(P108);
- glEnd();
- glEnable(GL_DEPTH_TEST);
-}
-
-void
-DrawDolphin(fishRec * fish)
-{
- float seg0, seg1, seg2, seg3, seg4, seg5, seg6, seg7;
- float pitch, thrash, chomp;
-
- fish->htail = (int) (fish->htail - (int) (10.0 * fish->v)) % 360;
-
- thrash = 70.0 * fish->v;
-
- seg0 = 1.0 * thrash * sin((fish->htail) * RRAD);
- seg3 = 1.0 * thrash * sin((fish->htail) * RRAD);
- seg1 = 2.0 * thrash * sin((fish->htail + 4.0) * RRAD);
- seg2 = 3.0 * thrash * sin((fish->htail + 6.0) * RRAD);
- seg4 = 4.0 * thrash * sin((fish->htail + 10.0) * RRAD);
- seg5 = 4.5 * thrash * sin((fish->htail + 15.0) * RRAD);
- seg6 = 5.0 * thrash * sin((fish->htail + 20.0) * RRAD);
- seg7 = 6.0 * thrash * sin((fish->htail + 30.0) * RRAD);
-
- pitch = fish->v * sin((fish->htail + 180.0) * RRAD);
-
- if (fish->v > 2.0) {
- chomp = -(fish->v - 2.0) * 200.0;
- }
- chomp = 100.0;
-
- P012[1] = iP012[1] + seg5;
- P013[1] = iP013[1] + seg5;
- P014[1] = iP014[1] + seg5;
- P015[1] = iP015[1] + seg5;
- P016[1] = iP016[1] + seg5;
- P017[1] = iP017[1] + seg5;
- P018[1] = iP018[1] + seg5;
- P019[1] = iP019[1] + seg5;
-
- P020[1] = iP020[1] + seg4;
- P021[1] = iP021[1] + seg4;
- P022[1] = iP022[1] + seg4;
- P023[1] = iP023[1] + seg4;
- P024[1] = iP024[1] + seg4;
- P025[1] = iP025[1] + seg4;
- P026[1] = iP026[1] + seg4;
- P027[1] = iP027[1] + seg4;
-
- P028[1] = iP028[1] + seg2;
- P029[1] = iP029[1] + seg2;
- P030[1] = iP030[1] + seg2;
- P031[1] = iP031[1] + seg2;
- P032[1] = iP032[1] + seg2;
- P033[1] = iP033[1] + seg2;
- P034[1] = iP034[1] + seg2;
- P035[1] = iP035[1] + seg2;
-
- P036[1] = iP036[1] + seg1;
- P037[1] = iP037[1] + seg1;
- P038[1] = iP038[1] + seg1;
- P039[1] = iP039[1] + seg1;
- P040[1] = iP040[1] + seg1;
- P041[1] = iP041[1] + seg1;
- P042[1] = iP042[1] + seg1;
- P043[1] = iP043[1] + seg1;
-
- P044[1] = iP044[1] + seg0;
- P045[1] = iP045[1] + seg0;
- P046[1] = iP046[1] + seg0;
- P047[1] = iP047[1] + seg0;
- P048[1] = iP048[1] + seg0;
- P049[1] = iP049[1] + seg0;
- P050[1] = iP050[1] + seg0;
- P051[1] = iP051[1] + seg0;
-
- P009[1] = iP009[1] + seg6;
- P010[1] = iP010[1] + seg6;
- P075[1] = iP075[1] + seg6;
- P076[1] = iP076[1] + seg6;
-
- P001[1] = iP001[1] + seg7;
- P011[1] = iP011[1] + seg7;
- P068[1] = iP068[1] + seg7;
- P069[1] = iP069[1] + seg7;
- P070[1] = iP070[1] + seg7;
- P071[1] = iP071[1] + seg7;
- P072[1] = iP072[1] + seg7;
- P073[1] = iP073[1] + seg7;
- P074[1] = iP074[1] + seg7;
-
- P091[1] = iP091[1] + seg3;
- P092[1] = iP092[1] + seg3;
- P093[1] = iP093[1] + seg3;
- P094[1] = iP094[1] + seg3;
- P095[1] = iP095[1] + seg3;
- P122[1] = iP122[1] + seg3 * 1.5;
-
- P097[1] = iP097[1] + chomp;
- P098[1] = iP098[1] + chomp;
- P102[1] = iP102[1] + chomp;
- P110[1] = iP110[1] + chomp;
- P111[1] = iP111[1] + chomp;
- P121[1] = iP121[1] + chomp;
- P118[1] = iP118[1] + chomp;
- P119[1] = iP119[1] + chomp;
-
- glPushMatrix();
-
- glRotatef(pitch, 1.0, 0.0, 0.0);
-
- glTranslatef(0.0, 0.0, 7000.0);
-
- glRotatef(180.0, 0.0, 1.0, 0.0);
-
- glEnable(GL_CULL_FACE);
- Dolphin014();
- Dolphin010();
- Dolphin009();
- Dolphin012();
- Dolphin013();
- Dolphin006();
- Dolphin002();
- Dolphin001();
- Dolphin003();
- Dolphin015();
- Dolphin004();
- Dolphin005();
- Dolphin007();
- Dolphin008();
- Dolphin011();
- Dolphin016();
- glDisable(GL_CULL_FACE);
-
- glPopMatrix();
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/shark.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/shark.c
deleted file mode 100644
index 9c847dbaf..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/shark.c
+++ /dev/null
@@ -1,1308 +0,0 @@
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#include
-#include
-#include "atlantis.h"
-/* *INDENT-OFF* */
-static float N002[3] = {0.000077 ,-0.020611 ,0.999788};
-static float N003[3] = {0.961425 ,0.258729 ,-0.093390};
-static float N004[3] = {0.510811 ,-0.769633 ,-0.383063};
-static float N005[3] = {0.400123 ,0.855734 ,-0.328055};
-static float N006[3] = {-0.770715 ,0.610204 ,-0.183440};
-static float N007[3] = {-0.915597 ,-0.373345 ,-0.149316};
-static float N008[3] = {-0.972788 ,0.208921 ,-0.100179};
-static float N009[3] = {-0.939713 ,-0.312268 ,-0.139383};
-static float N010[3] = {-0.624138 ,-0.741047 ,-0.247589};
-static float N011[3] = {0.591434 ,-0.768401 ,-0.244471};
-static float N012[3] = {0.935152 ,-0.328495 ,-0.132598};
-static float N013[3] = {0.997102 ,0.074243 ,-0.016593};
-static float N014[3] = {0.969995 ,0.241712 ,-0.026186};
-static float N015[3] = {0.844539 ,0.502628 ,-0.184714};
-static float N016[3] = {-0.906608 ,0.386308 ,-0.169787};
-static float N017[3] = {-0.970016 ,0.241698 ,-0.025516};
-static float N018[3] = {-0.998652 ,0.050493 ,-0.012045};
-static float N019[3] = {-0.942685 ,-0.333051 ,-0.020556};
-static float N020[3] = {-0.660944 ,-0.750276 ,0.015480};
-static float N021[3] = {0.503549 ,-0.862908 ,-0.042749};
-static float N022[3] = {0.953202 ,-0.302092 ,-0.012089};
-static float N023[3] = {0.998738 ,0.023574 ,0.044344};
-static float N024[3] = {0.979297 ,0.193272 ,0.060202};
-static float N025[3] = {0.798300 ,0.464885 ,0.382883};
-static float N026[3] = {-0.756590 ,0.452403 ,0.472126};
-static float N027[3] = {-0.953855 ,0.293003 ,0.065651};
-static float N028[3] = {-0.998033 ,0.040292 ,0.048028};
-static float N029[3] = {-0.977079 ,-0.204288 ,0.059858};
-static float N030[3] = {-0.729117 ,-0.675304 ,0.111140};
-static float N031[3] = {0.598361 ,-0.792753 ,0.116221};
-static float N032[3] = {0.965192 ,-0.252991 ,0.066332};
-static float N033[3] = {0.998201 ,-0.002790 ,0.059892};
-static float N034[3] = {0.978657 ,0.193135 ,0.070207};
-static float N035[3] = {0.718815 ,0.680392 ,0.142733};
-static float N036[3] = {-0.383096 ,0.906212 ,0.178936};
-static float N037[3] = {-0.952831 ,0.292590 ,0.080647};
-static float N038[3] = {-0.997680 ,0.032417 ,0.059861};
-static float N039[3] = {-0.982629 ,-0.169881 ,0.074700};
-static float N040[3] = {-0.695424 ,-0.703466 ,0.146700};
-static float N041[3] = {0.359323 ,-0.915531 ,0.180805};
-static float N042[3] = {0.943356 ,-0.319387 ,0.089842};
-static float N043[3] = {0.998272 ,-0.032435 ,0.048993};
-static float N044[3] = {0.978997 ,0.193205 ,0.065084};
-static float N045[3] = {0.872144 ,0.470094 ,-0.135565};
-static float N046[3] = {-0.664282 ,0.737945 ,-0.119027};
-static float N047[3] = {-0.954508 ,0.288570 ,0.075107};
-static float N048[3] = {-0.998273 ,0.032406 ,0.048993};
-static float N049[3] = {-0.979908 ,-0.193579 ,0.048038};
-static float N050[3] = {-0.858736 ,-0.507202 ,-0.072938};
-static float N051[3] = {0.643545 ,-0.763887 ,-0.048237};
-static float N052[3] = {0.955580 ,-0.288954 ,0.058068};
-static float N058[3] = {0.000050 ,0.793007 ,-0.609213};
-static float N059[3] = {0.913510 ,0.235418 ,-0.331779};
-static float N060[3] = {-0.807970 ,0.495000 ,-0.319625};
-static float N061[3] = {0.000000 ,0.784687 ,-0.619892};
-static float N062[3] = {0.000000 ,-1.000000 ,0.000000};
-static float N063[3] = {0.000000 ,1.000000 ,0.000000};
-static float N064[3] = {0.000000 ,1.000000 ,0.000000};
-static float N065[3] = {0.000000 ,1.000000 ,0.000000};
-static float N066[3] = {-0.055784 ,0.257059 ,0.964784};
-static float N069[3] = {-0.000505 ,-0.929775 ,-0.368127};
-static float N070[3] = {0.000000 ,1.000000 ,0.000000};
-static float P002[3] = {0.00, -36.59, 5687.72};
-static float P003[3] = {90.00, 114.73, 724.38};
-static float P004[3] = {58.24, -146.84, 262.35};
-static float P005[3] = {27.81, 231.52, 510.43};
-static float P006[3] = {-27.81, 230.43, 509.76};
-static float P007[3] = {-46.09, -146.83, 265.84};
-static float P008[3] = {-90.00, 103.84, 718.53};
-static float P009[3] = {-131.10, -165.92, 834.85};
-static float P010[3] = {-27.81, -285.31, 500.00};
-static float P011[3] = {27.81, -285.32, 500.00};
-static float P012[3] = {147.96, -170.89, 845.50};
-static float P013[3] = {180.00, 0.00, 2000.00};
-static float P014[3] = {145.62, 352.67, 2000.00};
-static float P015[3] = {55.62, 570.63, 2000.00};
-static float P016[3] = {-55.62, 570.64, 2000.00};
-static float P017[3] = {-145.62, 352.68, 2000.00};
-static float P018[3] = {-180.00, 0.01, 2000.00};
-static float P019[3] = {-178.20, -352.66, 2001.61};
-static float P020[3] = {-55.63, -570.63, 2000.00};
-static float P021[3] = {55.62, -570.64, 2000.00};
-static float P022[3] = {179.91, -352.69, 1998.39};
-static float P023[3] = {150.00, 0.00, 3000.00};
-static float P024[3] = {121.35, 293.89, 3000.00};
-static float P025[3] = {46.35, 502.93, 2883.09};
-static float P026[3] = {-46.35, 497.45, 2877.24};
-static float P027[3] = {-121.35, 293.90, 3000.00};
-static float P028[3] = {-150.00, 0.00, 3000.00};
-static float P029[3] = {-152.21, -304.84, 2858.68};
-static float P030[3] = {-46.36, -475.52, 3000.00};
-static float P031[3] = {46.35, -475.53, 3000.00};
-static float P032[3] = {155.64, -304.87, 2863.50};
-static float P033[3] = {90.00, 0.00, 4000.00};
-static float P034[3] = {72.81, 176.33, 4000.00};
-static float P035[3] = {27.81, 285.32, 4000.00};
-static float P036[3] = {-27.81, 285.32, 4000.00};
-static float P037[3] = {-72.81, 176.34, 4000.00};
-static float P038[3] = {-90.00, 0.00, 4000.00};
-static float P039[3] = {-72.81, -176.33, 4000.00};
-static float P040[3] = {-27.81, -285.31, 4000.00};
-static float P041[3] = {27.81, -285.32, 4000.00};
-static float P042[3] = {72.81, -176.34, 4000.00};
-static float P043[3] = {30.00, 0.00, 5000.00};
-static float P044[3] = {24.27, 58.78, 5000.00};
-static float P045[3] = {9.27, 95.11, 5000.00};
-static float P046[3] = {-9.27, 95.11, 5000.00};
-static float P047[3] = {-24.27, 58.78, 5000.00};
-static float P048[3] = {-30.00, 0.00, 5000.00};
-static float P049[3] = {-24.27, -58.78, 5000.00};
-static float P050[3] = {-9.27, -95.10, 5000.00};
-static float P051[3] = {9.27, -95.11, 5000.00};
-static float P052[3] = {24.27, -58.78, 5000.00};
-static float P058[3] = {0.00, 1212.72, 2703.08};
-static float P059[3] = {50.36, 0.00, 108.14};
-static float P060[3] = {-22.18, 0.00, 108.14};
-static float P061[3] = {0.00, 1181.61, 6344.65};
-static float P062[3] = {516.45, -887.08, 2535.45};
-static float P063[3] = {-545.69, -879.31, 2555.63};
-static float P064[3] = {618.89, -1005.64, 2988.32};
-static float P065[3] = {-635.37, -1014.79, 2938.68};
-static float P066[3] = {0.00, 1374.43, 3064.18};
-static float P069[3] = {0.00, -418.25, 5765.04};
-static float P070[3] = {0.00, 1266.91, 6629.60};
-static float P071[3] = {-139.12, -124.96, 997.98};
-static float P072[3] = {-139.24, -110.18, 1020.68};
-static float P073[3] = {-137.33, -94.52, 1022.63};
-static float P074[3] = {-137.03, -79.91, 996.89};
-static float P075[3] = {-135.21, -91.48, 969.14};
-static float P076[3] = {-135.39, -110.87, 968.76};
-static float P077[3] = {150.23, -78.44, 995.53};
-static float P078[3] = {152.79, -92.76, 1018.46};
-static float P079[3] = {154.19, -110.20, 1020.55};
-static float P080[3] = {151.33, -124.15, 993.77};
-static float P081[3] = {150.49, -111.19, 969.86};
-static float P082[3] = {150.79, -92.41, 969.70};
-static float iP002[3] = {0.00, -36.59, 5687.72};
-static float iP004[3] = {58.24, -146.84, 262.35};
-static float iP007[3] = {-46.09, -146.83, 265.84};
-static float iP010[3] = {-27.81, -285.31, 500.00};
-static float iP011[3] = {27.81, -285.32, 500.00};
-static float iP023[3] = {150.00, 0.00, 3000.00};
-static float iP024[3] = {121.35, 293.89, 3000.00};
-static float iP025[3] = {46.35, 502.93, 2883.09};
-static float iP026[3] = {-46.35, 497.45, 2877.24};
-static float iP027[3] = {-121.35, 293.90, 3000.00};
-static float iP028[3] = {-150.00, 0.00, 3000.00};
-static float iP029[3] = {-121.35, -304.84, 2853.86};
-static float iP030[3] = {-46.36, -475.52, 3000.00};
-static float iP031[3] = {46.35, -475.53, 3000.00};
-static float iP032[3] = {121.35, -304.87, 2853.86};
-static float iP033[3] = {90.00, 0.00, 4000.00};
-static float iP034[3] = {72.81, 176.33, 4000.00};
-static float iP035[3] = {27.81, 285.32, 4000.00};
-static float iP036[3] = {-27.81, 285.32, 4000.00};
-static float iP037[3] = {-72.81, 176.34, 4000.00};
-static float iP038[3] = {-90.00, 0.00, 4000.00};
-static float iP039[3] = {-72.81, -176.33, 4000.00};
-static float iP040[3] = {-27.81, -285.31, 4000.00};
-static float iP041[3] = {27.81, -285.32, 4000.00};
-static float iP042[3] = {72.81, -176.34, 4000.00};
-static float iP043[3] = {30.00, 0.00, 5000.00};
-static float iP044[3] = {24.27, 58.78, 5000.00};
-static float iP045[3] = {9.27, 95.11, 5000.00};
-static float iP046[3] = {-9.27, 95.11, 5000.00};
-static float iP047[3] = {-24.27, 58.78, 5000.00};
-static float iP048[3] = {-30.00, 0.00, 5000.00};
-static float iP049[3] = {-24.27, -58.78, 5000.00};
-static float iP050[3] = {-9.27, -95.10, 5000.00};
-static float iP051[3] = {9.27, -95.11, 5000.00};
-static float iP052[3] = {24.27, -58.78, 5000.00};
-static float iP061[3] = {0.00, 1181.61, 6344.65};
-static float iP069[3] = {0.00, -418.25, 5765.04};
-static float iP070[3] = {0.00, 1266.91, 6629.60};
-/* *INDENT-ON* */
-
-void
-Fish001(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N007);
- glVertex3fv(P007);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N004);
- glVertex3fv(P004);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glNormal3fv(N007);
- glVertex3fv(P007);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N004);
- glVertex3fv(P004);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P071);
- glVertex3fv(P072);
- glVertex3fv(P073);
- glVertex3fv(P074);
- glVertex3fv(P075);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P077);
- glVertex3fv(P078);
- glVertex3fv(P079);
- glVertex3fv(P080);
- glVertex3fv(P081);
- glVertex3fv(P082);
- glEnd();
-}
-
-void
-Fish002(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
-}
-
-void
-Fish003(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glEnd();
-}
-
-void
-Fish004(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N061);
- glVertex3fv(P061);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N061);
- glVertex3fv(P061);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N061);
- glVertex3fv(P061);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N061);
- glVertex3fv(P061);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N061);
- glVertex3fv(P061);
- glEnd();
-}
-
-void
-Fish005(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
-}
-
-void
-Fish006(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glEnd();
-}
-
-void
-Fish007(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N064);
- glVertex3fv(P064);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
-}
-
-void
-Fish008(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
-}
-
-void
-Fish009(void)
-{
- glBegin(GL_POLYGON);
- glVertex3fv(P059);
- glVertex3fv(P012);
- glVertex3fv(P009);
- glVertex3fv(P060);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P012);
- glVertex3fv(P004);
- glVertex3fv(P007);
- glVertex3fv(P009);
- glEnd();
-}
-
-void
-Fish_1(void)
-{
- Fish004();
- Fish005();
- Fish003();
- Fish007();
- Fish006();
- Fish002();
- Fish008();
- Fish009();
- Fish001();
-}
-
-void
-Fish_2(void)
-{
- Fish005();
- Fish004();
- Fish003();
- Fish008();
- Fish006();
- Fish002();
- Fish007();
- Fish009();
- Fish001();
-}
-
-void
-Fish_3(void)
-{
- Fish005();
- Fish004();
- Fish007();
- Fish003();
- Fish002();
- Fish008();
- Fish009();
- Fish001();
- Fish006();
-}
-
-void
-Fish_4(void)
-{
- Fish005();
- Fish004();
- Fish008();
- Fish003();
- Fish002();
- Fish007();
- Fish009();
- Fish001();
- Fish006();
-}
-
-void
-Fish_5(void)
-{
- Fish009();
- Fish006();
- Fish007();
- Fish001();
- Fish002();
- Fish003();
- Fish008();
- Fish004();
- Fish005();
-}
-
-void
-Fish_6(void)
-{
- Fish009();
- Fish006();
- Fish008();
- Fish001();
- Fish002();
- Fish007();
- Fish003();
- Fish004();
- Fish005();
-}
-
-void
-Fish_7(void)
-{
- Fish009();
- Fish001();
- Fish007();
- Fish005();
- Fish002();
- Fish008();
- Fish003();
- Fish004();
- Fish006();
-}
-
-void
-Fish_8(void)
-{
- Fish009();
- Fish008();
- Fish001();
- Fish002();
- Fish007();
- Fish003();
- Fish005();
- Fish004();
- Fish006();
-}
-
-void
-DrawShark(fishRec * fish)
-{
- float mat[4][4];
- int n;
- float seg1, seg2, seg3, seg4, segup;
- float thrash, chomp;
-
- fish->htail = (int) (fish->htail - (int) (5.0 * fish->v)) % 360;
-
- thrash = 50.0 * fish->v;
-
- seg1 = 0.6 * thrash * sin(fish->htail * RRAD);
- seg2 = 1.8 * thrash * sin((fish->htail + 45.0) * RRAD);
- seg3 = 3.0 * thrash * sin((fish->htail + 90.0) * RRAD);
- seg4 = 4.0 * thrash * sin((fish->htail + 110.0) * RRAD);
-
- chomp = 0.0;
- if (fish->v > 2.0) {
- chomp = -(fish->v - 2.0) * 200.0;
- }
- P004[1] = iP004[1] + chomp;
- P007[1] = iP007[1] + chomp;
- P010[1] = iP010[1] + chomp;
- P011[1] = iP011[1] + chomp;
-
- P023[0] = iP023[0] + seg1;
- P024[0] = iP024[0] + seg1;
- P025[0] = iP025[0] + seg1;
- P026[0] = iP026[0] + seg1;
- P027[0] = iP027[0] + seg1;
- P028[0] = iP028[0] + seg1;
- P029[0] = iP029[0] + seg1;
- P030[0] = iP030[0] + seg1;
- P031[0] = iP031[0] + seg1;
- P032[0] = iP032[0] + seg1;
- P033[0] = iP033[0] + seg2;
- P034[0] = iP034[0] + seg2;
- P035[0] = iP035[0] + seg2;
- P036[0] = iP036[0] + seg2;
- P037[0] = iP037[0] + seg2;
- P038[0] = iP038[0] + seg2;
- P039[0] = iP039[0] + seg2;
- P040[0] = iP040[0] + seg2;
- P041[0] = iP041[0] + seg2;
- P042[0] = iP042[0] + seg2;
- P043[0] = iP043[0] + seg3;
- P044[0] = iP044[0] + seg3;
- P045[0] = iP045[0] + seg3;
- P046[0] = iP046[0] + seg3;
- P047[0] = iP047[0] + seg3;
- P048[0] = iP048[0] + seg3;
- P049[0] = iP049[0] + seg3;
- P050[0] = iP050[0] + seg3;
- P051[0] = iP051[0] + seg3;
- P052[0] = iP052[0] + seg3;
- P002[0] = iP002[0] + seg4;
- P061[0] = iP061[0] + seg4;
- P069[0] = iP069[0] + seg4;
- P070[0] = iP070[0] + seg4;
-
- fish->vtail += ((fish->dtheta - fish->vtail) * 0.1);
-
- if (fish->vtail > 0.5) {
- fish->vtail = 0.5;
- } else if (fish->vtail < -0.5) {
- fish->vtail = -0.5;
- }
- segup = thrash * fish->vtail;
-
- P023[1] = iP023[1] + segup;
- P024[1] = iP024[1] + segup;
- P025[1] = iP025[1] + segup;
- P026[1] = iP026[1] + segup;
- P027[1] = iP027[1] + segup;
- P028[1] = iP028[1] + segup;
- P029[1] = iP029[1] + segup;
- P030[1] = iP030[1] + segup;
- P031[1] = iP031[1] + segup;
- P032[1] = iP032[1] + segup;
- P033[1] = iP033[1] + segup * 5.0;
- P034[1] = iP034[1] + segup * 5.0;
- P035[1] = iP035[1] + segup * 5.0;
- P036[1] = iP036[1] + segup * 5.0;
- P037[1] = iP037[1] + segup * 5.0;
- P038[1] = iP038[1] + segup * 5.0;
- P039[1] = iP039[1] + segup * 5.0;
- P040[1] = iP040[1] + segup * 5.0;
- P041[1] = iP041[1] + segup * 5.0;
- P042[1] = iP042[1] + segup * 5.0;
- P043[1] = iP043[1] + segup * 12.0;
- P044[1] = iP044[1] + segup * 12.0;
- P045[1] = iP045[1] + segup * 12.0;
- P046[1] = iP046[1] + segup * 12.0;
- P047[1] = iP047[1] + segup * 12.0;
- P048[1] = iP048[1] + segup * 12.0;
- P049[1] = iP049[1] + segup * 12.0;
- P050[1] = iP050[1] + segup * 12.0;
- P051[1] = iP051[1] + segup * 12.0;
- P052[1] = iP052[1] + segup * 12.0;
- P002[1] = iP002[1] + segup * 17.0;
- P061[1] = iP061[1] + segup * 17.0;
- P069[1] = iP069[1] + segup * 17.0;
- P070[1] = iP070[1] + segup * 17.0;
-
- glPushMatrix();
-
- glTranslatef(0.0, 0.0, -3000.0);
-
- glGetFloatv(GL_MODELVIEW_MATRIX, &mat[0][0]);
- n = 0;
- if (mat[0][2] >= 0.0) {
- n += 1;
- }
- if (mat[1][2] >= 0.0) {
- n += 2;
- }
- if (mat[2][2] >= 0.0) {
- n += 4;
- }
- glScalef(2.0, 1.0, 1.0);
-
- glEnable(GL_CULL_FACE);
- switch (n) {
- case 0:
- Fish_1();
- break;
- case 1:
- Fish_2();
- break;
- case 2:
- Fish_3();
- break;
- case 3:
- Fish_4();
- break;
- case 4:
- Fish_5();
- break;
- case 5:
- Fish_6();
- break;
- case 6:
- Fish_7();
- break;
- case 7:
- Fish_8();
- break;
- }
- glDisable(GL_CULL_FACE);
-
- glPopMatrix();
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/swim.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/swim.c
deleted file mode 100644
index cac7b6095..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/swim.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#include
-#include /* For rand(). */
-#include
-#include "atlantis.h"
-
-void
-FishTransform(fishRec * fish)
-{
-
- glTranslatef(fish->y, fish->z, -fish->x);
- glRotatef(-fish->psi, 0.0, 1.0, 0.0);
- glRotatef(fish->theta, 1.0, 0.0, 0.0);
- glRotatef(-fish->phi, 0.0, 0.0, 1.0);
-}
-
-void
-WhalePilot(fishRec * fish)
-{
-
- fish->phi = -20.0;
- fish->theta = 0.0;
- fish->psi -= 0.5;
-
- fish->x += WHALESPEED * fish->v * cos(fish->psi / RAD) * cos(fish->theta / RAD);
- fish->y += WHALESPEED * fish->v * sin(fish->psi / RAD) * cos(fish->theta / RAD);
- fish->z += WHALESPEED * fish->v * sin(fish->theta / RAD);
-}
-
-void
-SharkPilot(fishRec * fish)
-{
- static int sign = 1;
- float X, Y, Z, tpsi, ttheta, thetal;
-
- fish->xt = 60000.0;
- fish->yt = 0.0;
- fish->zt = 0.0;
-
- X = fish->xt - fish->x;
- Y = fish->yt - fish->y;
- Z = fish->zt - fish->z;
-
- thetal = fish->theta;
-
- ttheta = RAD * atan(Z / (sqrt(X * X + Y * Y)));
-
- if (ttheta > fish->theta + 0.25) {
- fish->theta += 0.5;
- } else if (ttheta < fish->theta - 0.25) {
- fish->theta -= 0.5;
- }
- if (fish->theta > 90.0) {
- fish->theta = 90.0;
- }
- if (fish->theta < -90.0) {
- fish->theta = -90.0;
- }
- fish->dtheta = fish->theta - thetal;
-
- tpsi = RAD * atan2(Y, X);
-
- fish->attack = 0;
-
- if (fabs(tpsi - fish->psi) < 10.0) {
- fish->attack = 1;
- } else if (fabs(tpsi - fish->psi) < 45.0) {
- if (fish->psi > tpsi) {
- fish->psi -= 0.5;
- if (fish->psi < -180.0) {
- fish->psi += 360.0;
- }
- } else if (fish->psi < tpsi) {
- fish->psi += 0.5;
- if (fish->psi > 180.0) {
- fish->psi -= 360.0;
- }
- }
- } else {
- if (rand() % 100 > 98) {
- sign = 1 - sign;
- }
- fish->psi += sign;
- if (fish->psi > 180.0) {
- fish->psi -= 360.0;
- }
- if (fish->psi < -180.0) {
- fish->psi += 360.0;
- }
- }
-
- if (fish->attack) {
- if (fish->v < 1.1) {
- fish->spurt = 1;
- }
- if (fish->spurt) {
- fish->v += 0.2;
- }
- if (fish->v > 5.0) {
- fish->spurt = 0;
- }
- if ((fish->v > 1.0) && (!fish->spurt)) {
- fish->v -= 0.2;
- }
- } else {
- if (!(rand() % 400) && (!fish->spurt)) {
- fish->spurt = 1;
- }
- if (fish->spurt) {
- fish->v += 0.05;
- }
- if (fish->v > 3.0) {
- fish->spurt = 0;
- }
- if ((fish->v > 1.0) && (!fish->spurt)) {
- fish->v -= 0.05;
- }
- }
-
- fish->x += SHARKSPEED * fish->v * cos(fish->psi / RAD) * cos(fish->theta / RAD);
- fish->y += SHARKSPEED * fish->v * sin(fish->psi / RAD) * cos(fish->theta / RAD);
- fish->z += SHARKSPEED * fish->v * sin(fish->theta / RAD);
-}
-
-void
-SharkMiss(int i)
-{
- int j;
- float avoid, thetal;
- float X, Y, Z, R;
-
- for (j = 0; j < NUM_SHARKS; j++) {
- if (j != i) {
- X = sharks[j].x - sharks[i].x;
- Y = sharks[j].y - sharks[i].y;
- Z = sharks[j].z - sharks[i].z;
-
- R = sqrt(X * X + Y * Y + Z * Z);
-
- avoid = 1.0;
- thetal = sharks[i].theta;
-
- if (R < SHARKSIZE) {
- if (Z > 0.0) {
- sharks[i].theta -= avoid;
- } else {
- sharks[i].theta += avoid;
- }
- }
- sharks[i].dtheta += (sharks[i].theta - thetal);
- }
- }
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/whale.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/whale.c
deleted file mode 100644
index 828640ad0..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/whale.c
+++ /dev/null
@@ -1,1798 +0,0 @@
-/**
- * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States. Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-#include
-#include
-#include "atlantis.h"
-/* *INDENT-OFF* */
-static float N001[3] = {0.019249 ,0.011340 ,-0.999750};
-static float N002[3] = {-0.132579 ,0.954547 ,0.266952};
-static float N003[3] = {-0.196061 ,0.980392 ,-0.019778};
-static float N004[3] = {0.695461 ,0.604704 ,0.388158};
-static float N005[3] = {0.870600 ,0.425754 ,0.246557};
-static float N006[3] = {-0.881191 ,0.392012 ,0.264251};
-static float N008[3] = {-0.341437 ,0.887477 ,0.309523};
-static float N009[3] = {0.124035 ,-0.992278 ,0.000000};
-static float N010[3] = {0.242536 ,0.000000 ,-0.970143};
-static float N011[3] = {0.588172 ,0.000000 ,0.808736};
-static float N012[3] = {0.929824 ,-0.340623 ,-0.139298};
-static float N013[3] = {0.954183 ,0.267108 ,-0.134865};
-static float N014[3] = {0.495127 ,0.855436 ,-0.151914};
-static float N015[3] = {-0.390199 ,0.906569 ,-0.160867};
-static float N016[3] = {-0.923605 ,0.354581 ,-0.145692};
-static float N017[3] = {-0.955796 ,-0.260667 ,-0.136036};
-static float N018[3] = {-0.501283 ,-0.853462 ,-0.142540};
-static float N019[3] = {0.405300 ,-0.901974 ,-0.148913};
-static float N020[3] = {0.909913 ,-0.392746 ,-0.133451};
-static float N021[3] = {0.936494 ,0.331147 ,-0.115414};
-static float N022[3] = {0.600131 ,0.793724 ,-0.099222};
-static float N023[3] = {-0.231556 ,0.968361 ,-0.093053};
-static float N024[3] = {-0.844369 ,0.525330 ,-0.105211};
-static float N025[3] = {-0.982725 ,-0.136329 ,-0.125164};
-static float N026[3] = {-0.560844 ,-0.822654 ,-0.093241};
-static float N027[3] = {0.263884 ,-0.959981 ,-0.093817};
-static float N028[3] = {0.842057 ,-0.525192 ,-0.122938};
-static float N029[3] = {0.921620 ,0.367565 ,-0.124546};
-static float N030[3] = {0.613927 ,0.784109 ,-0.090918};
-static float N031[3] = {-0.448754 ,0.888261 ,-0.098037};
-static float N032[3] = {-0.891865 ,0.434376 ,-0.126077};
-static float N033[3] = {-0.881447 ,-0.448017 ,-0.149437};
-static float N034[3] = {-0.345647 ,-0.922057 ,-0.174183};
-static float N035[3] = {0.307998 ,-0.941371 ,-0.137688};
-static float N036[3] = {0.806316 ,-0.574647 ,-0.140124};
-static float N037[3] = {0.961346 ,0.233646 ,-0.145681};
-static float N038[3] = {0.488451 ,0.865586 ,-0.110351};
-static float N039[3] = {-0.374290 ,0.921953 ,-0.099553};
-static float N040[3] = {-0.928504 ,0.344533 ,-0.138485};
-static float N041[3] = {-0.918419 ,-0.371792 ,-0.135189};
-static float N042[3] = {-0.520666 ,-0.833704 ,-0.183968};
-static float N043[3] = {0.339204 ,-0.920273 ,-0.195036};
-static float N044[3] = {0.921475 ,-0.387382 ,-0.028636};
-static float N045[3] = {0.842465 ,0.533335 ,-0.076204};
-static float N046[3] = {0.380110 ,0.924939 ,0.002073};
-static float N047[3] = {-0.276128 ,0.961073 ,-0.009579};
-static float N048[3] = {-0.879684 ,0.473001 ,-0.049250};
-static float N049[3] = {-0.947184 ,-0.317614 ,-0.044321};
-static float N050[3] = {-0.642059 ,-0.764933 ,-0.051363};
-static float N051[3] = {0.466794 ,-0.880921 ,-0.077990};
-static float N052[3] = {0.898509 ,-0.432277 ,0.076279};
-static float N053[3] = {0.938985 ,0.328141 ,0.103109};
-static float N054[3] = {0.442420 ,0.895745 ,0.043647};
-static float N055[3] = {-0.255163 ,0.966723 ,0.018407};
-static float N056[3] = {-0.833769 ,0.540650 ,0.111924};
-static float N057[3] = {-0.953653 ,-0.289939 ,0.080507};
-static float N058[3] = {-0.672357 ,-0.730524 ,0.119461};
-static float N059[3] = {0.522249 ,-0.846652 ,0.102157};
-static float N060[3] = {0.885868 ,-0.427631 ,0.179914};
-static float N062[3] = {0.648942 ,0.743116 ,0.163255};
-static float N063[3] = {-0.578967 ,0.807730 ,0.111219};
-static float N065[3] = {-0.909864 ,-0.352202 ,0.219321};
-static float N066[3] = {-0.502541 ,-0.818090 ,0.279610};
-static float N067[3] = {0.322919 ,-0.915358 ,0.240504};
-static float N068[3] = {0.242536 ,0.000000 ,-0.970143};
-static float N069[3] = {0.000000 ,1.000000 ,0.000000};
-static float N070[3] = {0.000000 ,1.000000 ,0.000000};
-static float N071[3] = {0.000000 ,1.000000 ,0.000000};
-static float N072[3] = {0.000000 ,1.000000 ,0.000000};
-static float N073[3] = {0.000000 ,1.000000 ,0.000000};
-static float N074[3] = {0.000000 ,1.000000 ,0.000000};
-static float N075[3] = {0.031220 ,0.999025 ,-0.031220};
-static float N076[3] = {0.000000 ,1.000000 ,0.000000};
-static float N077[3] = {0.446821 ,0.893642 ,0.041889};
-static float N078[3] = {0.863035 ,-0.100980 ,0.494949};
-static float N079[3] = {0.585597 ,-0.808215 ,0.062174};
-static float N080[3] = {0.000000 ,1.000000 ,0.000000};
-static float N081[3] = {1.000000 ,0.000000 ,0.000000};
-static float N082[3] = {0.000000 ,1.000000 ,0.000000};
-static float N083[3] = {-1.000000 ,0.000000 ,0.000000};
-static float N084[3] = {-0.478893 ,0.837129 ,-0.264343};
-static float N085[3] = {0.000000 ,1.000000 ,0.000000};
-static float N086[3] = {0.763909 ,0.539455 ,-0.354163};
-static float N087[3] = {0.446821 ,0.893642 ,0.041889};
-static float N088[3] = {0.385134 ,-0.908288 ,0.163352};
-static float N089[3] = {-0.605952 ,0.779253 ,-0.159961};
-static float N090[3] = {0.000000 ,1.000000 ,0.000000};
-static float N091[3] = {0.000000 ,1.000000 ,0.000000};
-static float N092[3] = {0.000000 ,1.000000 ,0.000000};
-static float N093[3] = {0.000000 ,1.000000 ,0.000000};
-static float N094[3] = {1.000000 ,0.000000 ,0.000000};
-static float N095[3] = {-1.000000 ,0.000000 ,0.000000};
-static float N096[3] = {0.644444 ,-0.621516 ,0.445433};
-static float N097[3] = {-0.760896 ,-0.474416 ,0.442681};
-static float N098[3] = {0.636888 ,-0.464314 ,0.615456};
-static float N099[3] = {-0.710295 ,0.647038 ,0.277168};
-static float N100[3] = {0.009604 ,0.993655 ,0.112063};
-static float iP001[3] = {18.74, 13.19, 3.76};
-static float P001[3] = {18.74, 13.19, 3.76};
-static float P002[3] = {0.00, 390.42, 10292.57};
-static float P003[3] = {55.80, 622.31, 8254.35};
-static float P004[3] = {20.80, 247.66, 10652.13};
-static float P005[3] = {487.51, 198.05, 9350.78};
-static float P006[3] = {-457.61, 199.04, 9353.01};
-static float P008[3] = {-34.67, 247.64, 10663.71};
-static float iP009[3] = {97.46, 67.63, 593.82};
-static float iP010[3] = {-84.33, 67.63, 588.18};
-static float iP011[3] = {118.69, 8.98, -66.91};
-static float P009[3] = {97.46, 67.63, 593.82};
-static float P010[3] = {-84.33, 67.63, 588.18};
-static float P011[3] = {118.69, 8.98, -66.91};
-static float iP012[3] = {156.48, -31.95, 924.54};
-static float iP013[3] = {162.00, 110.22, 924.54};
-static float iP014[3] = {88.16, 221.65, 924.54};
-static float iP015[3] = {-65.21, 231.16, 924.54};
-static float iP016[3] = {-156.48, 121.97, 924.54};
-static float iP017[3] = {-162.00, -23.93, 924.54};
-static float iP018[3] = {-88.16, -139.10, 924.54};
-static float iP019[3] = {65.21, -148.61, 924.54};
-static float iP020[3] = {246.87, -98.73, 1783.04};
-static float iP021[3] = {253.17, 127.76, 1783.04};
-static float iP022[3] = {132.34, 270.77, 1783.04};
-static float iP023[3] = {-97.88, 285.04, 1783.04};
-static float iP024[3] = {-222.97, 139.80, 1783.04};
-static float iP025[3] = {-225.29, -86.68, 1783.04};
-static float iP026[3] = {-108.44, -224.15, 1783.04};
-static float iP027[3] = {97.88, -221.56, 1783.04};
-static float iP028[3] = {410.55, -200.66, 3213.87};
-static float iP029[3] = {432.19, 148.42, 3213.87};
-static float iP030[3] = {200.66, 410.55, 3213.87};
-static float iP031[3] = {-148.42, 432.19, 3213.87};
-static float iP032[3] = {-407.48, 171.88, 3213.87};
-static float iP033[3] = {-432.19, -148.42, 3213.87};
-static float iP034[3] = {-148.88, -309.74, 3213.87};
-static float iP035[3] = {156.38, -320.17, 3213.87};
-static float iP036[3] = {523.39, -303.81, 4424.57};
-static float iP037[3] = {574.66, 276.84, 4424.57};
-static float iP038[3] = {243.05, 492.50, 4424.57};
-static float iP039[3] = {-191.23, 520.13, 4424.57};
-static float iP040[3] = {-523.39, 304.01, 4424.57};
-static float iP041[3] = {-574.66, -231.83, 4424.57};
-static float iP042[3] = {-266.95, -578.17, 4424.57};
-static float iP043[3] = {211.14, -579.67, 4424.57};
-static float iP044[3] = {680.57, -370.27, 5943.46};
-static float iP045[3] = {834.01, 363.09, 5943.46};
-static float iP046[3] = {371.29, 614.13, 5943.46};
-static float iP047[3] = {-291.43, 621.86, 5943.46};
-static float iP048[3] = {-784.13, 362.60, 5943.46};
-static float iP049[3] = {-743.29, -325.82, 5943.46};
-static float iP050[3] = {-383.24, -804.77, 5943.46};
-static float iP051[3] = {283.47, -846.09, 5943.46};
-static float P012[3] = {156.48, -31.95, 924.54};
-static float P013[3] = {162.00, 110.22, 924.54};
-static float P014[3] = {88.16, 221.65, 924.54};
-static float P015[3] = {-65.21, 231.16, 924.54};
-static float P016[3] = {-156.48, 121.97, 924.54};
-static float P017[3] = {-162.00, -23.93, 924.54};
-static float P018[3] = {-88.16, -139.10, 924.54};
-static float P019[3] = {65.21, -148.61, 924.54};
-static float P020[3] = {246.87, -98.73, 1783.04};
-static float P021[3] = {253.17, 127.76, 1783.04};
-static float P022[3] = {132.34, 270.77, 1783.04};
-static float P023[3] = {-97.88, 285.04, 1783.04};
-static float P024[3] = {-222.97, 139.80, 1783.04};
-static float P025[3] = {-225.29, -86.68, 1783.04};
-static float P026[3] = {-108.44, -224.15, 1783.04};
-static float P027[3] = {97.88, -221.56, 1783.04};
-static float P028[3] = {410.55, -200.66, 3213.87};
-static float P029[3] = {432.19, 148.42, 3213.87};
-static float P030[3] = {200.66, 410.55, 3213.87};
-static float P031[3] = {-148.42, 432.19, 3213.87};
-static float P032[3] = {-407.48, 171.88, 3213.87};
-static float P033[3] = {-432.19, -148.42, 3213.87};
-static float P034[3] = {-148.88, -309.74, 3213.87};
-static float P035[3] = {156.38, -320.17, 3213.87};
-static float P036[3] = {523.39, -303.81, 4424.57};
-static float P037[3] = {574.66, 276.84, 4424.57};
-static float P038[3] = {243.05, 492.50, 4424.57};
-static float P039[3] = {-191.23, 520.13, 4424.57};
-static float P040[3] = {-523.39, 304.01, 4424.57};
-static float P041[3] = {-574.66, -231.83, 4424.57};
-static float P042[3] = {-266.95, -578.17, 4424.57};
-static float P043[3] = {211.14, -579.67, 4424.57};
-static float P044[3] = {680.57, -370.27, 5943.46};
-static float P045[3] = {834.01, 363.09, 5943.46};
-static float P046[3] = {371.29, 614.13, 5943.46};
-static float P047[3] = {-291.43, 621.86, 5943.46};
-static float P048[3] = {-784.13, 362.60, 5943.46};
-static float P049[3] = {-743.29, -325.82, 5943.46};
-static float P050[3] = {-383.24, -804.77, 5943.46};
-static float P051[3] = {283.47, -846.09, 5943.46};
-static float P052[3] = {599.09, -332.24, 7902.59};
-static float P053[3] = {735.48, 306.26, 7911.92};
-static float P054[3] = {321.55, 558.53, 7902.59};
-static float P055[3] = {-260.54, 559.84, 7902.59};
-static float P056[3] = {-698.66, 320.83, 7902.59};
-static float P057[3] = {-643.29, -299.16, 7902.59};
-static float P058[3] = {-341.47, -719.30, 7902.59};
-static float P059[3] = {252.57, -756.12, 7902.59};
-static float P060[3] = {458.39, -265.31, 9355.44};
-static float P062[3] = {224.04, 438.98, 9364.77};
-static float P063[3] = {-165.71, 441.27, 9355.44};
-static float P065[3] = {-473.99, -219.71, 9355.44};
-static float P066[3] = {-211.97, -479.87, 9355.44};
-static float P067[3] = {192.86, -504.03, 9355.44};
-static float iP068[3] = {-112.44, 9.25, -64.42};
-static float iP069[3] = {1155.63, 0.00, -182.46};
-static float iP070[3] = {-1143.13, 0.00, -181.54};
-static float iP071[3] = {1424.23, 0.00, -322.09};
-static float iP072[3] = {-1368.01, 0.00, -310.38};
-static float iP073[3] = {1255.57, 2.31, 114.05};
-static float iP074[3] = {-1149.38, 0.00, 117.12};
-static float iP075[3] = {718.36, 0.00, 433.36};
-static float iP076[3] = {-655.90, 0.00, 433.36};
-static float P068[3] = {-112.44, 9.25, -64.42};
-static float P069[3] = {1155.63, 0.00, -182.46};
-static float P070[3] = {-1143.13, 0.00, -181.54};
-static float P071[3] = {1424.23, 0.00, -322.09};
-static float P072[3] = {-1368.01, 0.00, -310.38};
-static float P073[3] = {1255.57, 2.31, 114.05};
-static float P074[3] = {-1149.38, 0.00, 117.12};
-static float P075[3] = {718.36, 0.00, 433.36};
-static float P076[3] = {-655.90, 0.00, 433.36};
-static float P077[3] = {1058.00, -2.66, 7923.51};
-static float P078[3] = {-1016.51, -15.47, 7902.87};
-static float P079[3] = {-1363.99, -484.50, 7593.38};
-static float P080[3] = {1478.09, -861.47, 7098.12};
-static float P081[3] = {1338.06, -284.68, 7024.15};
-static float P082[3] = {-1545.51, -860.64, 7106.60};
-static float P083[3] = {1063.19, -70.46, 7466.60};
-static float P084[3] = {-1369.18, -288.11, 7015.34};
-static float P085[3] = {1348.44, -482.50, 7591.41};
-static float P086[3] = {-1015.45, -96.80, 7474.86};
-static float P087[3] = {731.04, 148.38, 7682.58};
-static float P088[3] = {-697.03, 151.82, 7668.81};
-static float P089[3] = {-686.82, 157.09, 7922.29};
-static float P090[3] = {724.73, 147.75, 7931.39};
-static float iP091[3] = {0.00, 327.10, 2346.55};
-static float iP092[3] = {0.00, 552.28, 2311.31};
-static float iP093[3] = {0.00, 721.16, 2166.41};
-static float iP094[3] = {0.00, 693.42, 2388.80};
-static float iP095[3] = {0.00, 389.44, 2859.97};
-static float P091[3] = {0.00, 327.10, 2346.55};
-static float P092[3] = {0.00, 552.28, 2311.31};
-static float P093[3] = {0.00, 721.16, 2166.41};
-static float P094[3] = {0.00, 693.42, 2388.80};
-static float P095[3] = {0.00, 389.44, 2859.97};
-static float iP096[3] = {222.02, -183.67, 10266.89};
-static float iP097[3] = {-128.90, -182.70, 10266.89};
-static float iP098[3] = {41.04, 88.31, 10659.36};
-static float iP099[3] = {-48.73, 88.30, 10659.36};
-static float P096[3] = {222.02, -183.67, 10266.89};
-static float P097[3] = {-128.90, -182.70, 10266.89};
-static float P098[3] = {41.04, 88.31, 10659.36};
-static float P099[3] = {-48.73, 88.30, 10659.36};
-static float P100[3] = {0.00, 603.42, 9340.68};
-static float P104[3] = {-9.86, 567.62, 7858.65};
-static float P105[3] = {31.96, 565.27, 7908.46};
-static float P106[3] = {22.75, 568.13, 7782.83};
-static float P107[3] = {58.93, 568.42, 7775.94};
-static float P108[3] = {55.91, 565.59, 7905.86};
-static float P109[3] = {99.21, 566.00, 7858.65};
-static float P110[3] = {-498.83, 148.14, 9135.10};
-static float P111[3] = {-495.46, 133.24, 9158.48};
-static float P112[3] = {-490.82, 146.23, 9182.76};
-static float P113[3] = {-489.55, 174.11, 9183.66};
-static float P114[3] = {-492.92, 189.00, 9160.28};
-static float P115[3] = {-497.56, 176.02, 9136.00};
-static float P116[3] = {526.54, 169.68, 9137.70};
-static float P117[3] = {523.49, 184.85, 9161.42};
-static float P118[3] = {518.56, 171.78, 9186.06};
-static float P119[3] = {516.68, 143.53, 9186.98};
-static float P120[3] = {519.73, 128.36, 9163.26};
-static float P121[3] = {524.66, 141.43, 9138.62};
-/* *INDENT-ON* */
-
-void
-Whale001(void)
-{
-
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N074);
- glVertex3fv(P074);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N072);
- glVertex3fv(P072);
- glNormal3fv(N074);
- glVertex3fv(P074);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N072);
- glVertex3fv(P072);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N074);
- glVertex3fv(P074);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N074);
- glVertex3fv(P074);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N070);
- glVertex3fv(P070);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N076);
- glVertex3fv(P076);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N068);
- glVertex3fv(P068);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N010);
- glVertex3fv(P010);
- glEnd();
-}
-
-void
-Whale002(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glNormal3fv(N073);
- glVertex3fv(P073);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N071);
- glVertex3fv(P071);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N073);
- glVertex3fv(P073);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N009);
- glVertex3fv(P009);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N011);
- glVertex3fv(P011);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N073);
- glVertex3fv(P073);
- glNormal3fv(N075);
- glVertex3fv(P075);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N069);
- glVertex3fv(P069);
- glNormal3fv(N071);
- glVertex3fv(P071);
- glNormal3fv(N073);
- glVertex3fv(P073);
- glEnd();
-}
-
-void
-Whale003(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N001);
- glVertex3fv(P001);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glEnd();
-}
-
-void
-Whale004(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N015);
- glVertex3fv(P015);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N016);
- glVertex3fv(P016);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N017);
- glVertex3fv(P017);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N014);
- glVertex3fv(P014);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N013);
- glVertex3fv(P013);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N018);
- glVertex3fv(P018);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N019);
- glVertex3fv(P019);
- glNormal3fv(N012);
- glVertex3fv(P012);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glEnd();
-}
-
-void
-Whale005(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N022);
- glVertex3fv(P022);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N023);
- glVertex3fv(P023);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N024);
- glVertex3fv(P024);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N021);
- glVertex3fv(P021);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N020);
- glVertex3fv(P020);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N025);
- glVertex3fv(P025);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N026);
- glVertex3fv(P026);
- glNormal3fv(N027);
- glVertex3fv(P027);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glEnd();
-}
-
-void
-Whale006(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N093);
- glVertex3fv(P093);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N093);
- glVertex3fv(P093);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N091);
- glVertex3fv(P091);
- glNormal3fv(N092);
- glVertex3fv(P092);
- glNormal3fv(N094);
- glVertex3fv(P094);
- glNormal3fv(N095);
- glVertex3fv(P095);
- glEnd();
-}
-
-void
-Whale007(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N030);
- glVertex3fv(P030);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N029);
- glVertex3fv(P029);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N028);
- glVertex3fv(P028);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N035);
- glVertex3fv(P035);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N034);
- glVertex3fv(P034);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N031);
- glVertex3fv(P031);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N032);
- glVertex3fv(P032);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N033);
- glVertex3fv(P033);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glEnd();
-}
-
-void
-Whale008(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N043);
- glVertex3fv(P043);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N042);
- glVertex3fv(P042);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N036);
- glVertex3fv(P036);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N041);
- glVertex3fv(P041);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N040);
- glVertex3fv(P040);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N037);
- glVertex3fv(P037);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N038);
- glVertex3fv(P038);
- glNormal3fv(N039);
- glVertex3fv(P039);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glEnd();
-}
-
-void
-Whale009(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N051);
- glVertex3fv(P051);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N044);
- glVertex3fv(P044);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N050);
- glVertex3fv(P050);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N049);
- glVertex3fv(P049);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N048);
- glVertex3fv(P048);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N045);
- glVertex3fv(P045);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N046);
- glVertex3fv(P046);
- glNormal3fv(N047);
- glVertex3fv(P047);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
-}
-
-void
-Whale010(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N080);
- glVertex3fv(P080);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N090);
- glVertex3fv(P090);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N080);
- glVertex3fv(P080);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N081);
- glVertex3fv(P081);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N085);
- glVertex3fv(P085);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N083);
- glVertex3fv(P083);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N087);
- glVertex3fv(P087);
- glNormal3fv(N077);
- glVertex3fv(P077);
- glNormal3fv(N090);
- glVertex3fv(P090);
- glEnd();
-}
-
-void
-Whale011(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N082);
- glVertex3fv(P082);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N088);
- glVertex3fv(P088);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N089);
- glVertex3fv(P089);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N086);
- glVertex3fv(P086);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N078);
- glVertex3fv(P078);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N084);
- glVertex3fv(P084);
- glNormal3fv(N082);
- glVertex3fv(P082);
- glNormal3fv(N079);
- glVertex3fv(P079);
- glEnd();
-}
-
-void
-Whale012(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N059);
- glVertex3fv(P059);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N058);
- glVertex3fv(P058);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N057);
- glVertex3fv(P057);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N056);
- glVertex3fv(P056);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N053);
- glVertex3fv(P053);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N052);
- glVertex3fv(P052);
- glEnd();
-}
-
-void
-Whale013(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N096);
- glVertex3fv(P096);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glNormal3fv(N096);
- glVertex3fv(P096);
- glNormal3fv(N098);
- glVertex3fv(P098);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N066);
- glVertex3fv(P066);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N067);
- glVertex3fv(P067);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N096);
- glVertex3fv(P096);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N060);
- glVertex3fv(P060);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N096);
- glVertex3fv(P096);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N096);
- glVertex3fv(P096);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glNormal3fv(N098);
- glVertex3fv(P098);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N065);
- glVertex3fv(P065);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N097);
- glVertex3fv(P097);
- glNormal3fv(N099);
- glVertex3fv(P099);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P005);
- glVertex3fv(P006);
- glVertex3fv(P099);
- glVertex3fv(P098);
- glEnd();
-}
-
-void
-Whale014(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N004);
- glVertex3fv(P004);
- glNormal3fv(N005);
- glVertex3fv(P005);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P006);
- glVertex3fv(P005);
- glVertex3fv(P004);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N006);
- glVertex3fv(P006);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N008);
- glVertex3fv(P008);
- glNormal3fv(N004);
- glVertex3fv(P004);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N004);
- glVertex3fv(P004);
- glEnd();
-}
-
-void
-Whale015(void)
-{
- glBegin(GL_POLYGON);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N055);
- glVertex3fv(P055);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N003);
- glVertex3fv(P003);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N054);
- glVertex3fv(P054);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N063);
- glVertex3fv(P063);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glEnd();
- glBegin(GL_POLYGON);
- glNormal3fv(N100);
- glVertex3fv(P100);
- glNormal3fv(N002);
- glVertex3fv(P002);
- glNormal3fv(N062);
- glVertex3fv(P062);
- glEnd();
-}
-
-void
-Whale016(void)
-{
- glBegin(GL_POLYGON);
- glVertex3fv(P104);
- glVertex3fv(P105);
- glVertex3fv(P106);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P107);
- glVertex3fv(P108);
- glVertex3fv(P109);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P110);
- glVertex3fv(P111);
- glVertex3fv(P112);
- glVertex3fv(P113);
- glVertex3fv(P114);
- glVertex3fv(P115);
- glEnd();
- glBegin(GL_POLYGON);
- glVertex3fv(P116);
- glVertex3fv(P117);
- glVertex3fv(P118);
- glVertex3fv(P119);
- glVertex3fv(P120);
- glVertex3fv(P121);
- glEnd();
-}
-
-void
-DrawWhale(fishRec * fish)
-{
- float seg0, seg1, seg2, seg3, seg4, seg5, seg6, seg7;
- float pitch, thrash, chomp;
-
- fish->htail = (int) (fish->htail - (int) (5.0 * fish->v)) % 360;
-
- thrash = 70.0 * fish->v;
-
- seg0 = 1.5 * thrash * sin((fish->htail) * RRAD);
- seg1 = 2.5 * thrash * sin((fish->htail + 10.0) * RRAD);
- seg2 = 3.7 * thrash * sin((fish->htail + 15.0) * RRAD);
- seg3 = 4.8 * thrash * sin((fish->htail + 23.0) * RRAD);
- seg4 = 6.0 * thrash * sin((fish->htail + 28.0) * RRAD);
- seg5 = 6.5 * thrash * sin((fish->htail + 35.0) * RRAD);
- seg6 = 6.5 * thrash * sin((fish->htail + 40.0) * RRAD);
- seg7 = 6.5 * thrash * sin((fish->htail + 55.0) * RRAD);
-
- pitch = fish->v * sin((fish->htail - 160.0) * RRAD);
-
- chomp = 0.0;
- if (fish->v > 2.0) {
- chomp = -(fish->v - 2.0) * 200.0;
- }
- P012[1] = iP012[1] + seg5;
- P013[1] = iP013[1] + seg5;
- P014[1] = iP014[1] + seg5;
- P015[1] = iP015[1] + seg5;
- P016[1] = iP016[1] + seg5;
- P017[1] = iP017[1] + seg5;
- P018[1] = iP018[1] + seg5;
- P019[1] = iP019[1] + seg5;
-
- P020[1] = iP020[1] + seg4;
- P021[1] = iP021[1] + seg4;
- P022[1] = iP022[1] + seg4;
- P023[1] = iP023[1] + seg4;
- P024[1] = iP024[1] + seg4;
- P025[1] = iP025[1] + seg4;
- P026[1] = iP026[1] + seg4;
- P027[1] = iP027[1] + seg4;
-
- P028[1] = iP028[1] + seg2;
- P029[1] = iP029[1] + seg2;
- P030[1] = iP030[1] + seg2;
- P031[1] = iP031[1] + seg2;
- P032[1] = iP032[1] + seg2;
- P033[1] = iP033[1] + seg2;
- P034[1] = iP034[1] + seg2;
- P035[1] = iP035[1] + seg2;
-
- P036[1] = iP036[1] + seg1;
- P037[1] = iP037[1] + seg1;
- P038[1] = iP038[1] + seg1;
- P039[1] = iP039[1] + seg1;
- P040[1] = iP040[1] + seg1;
- P041[1] = iP041[1] + seg1;
- P042[1] = iP042[1] + seg1;
- P043[1] = iP043[1] + seg1;
-
- P044[1] = iP044[1] + seg0;
- P045[1] = iP045[1] + seg0;
- P046[1] = iP046[1] + seg0;
- P047[1] = iP047[1] + seg0;
- P048[1] = iP048[1] + seg0;
- P049[1] = iP049[1] + seg0;
- P050[1] = iP050[1] + seg0;
- P051[1] = iP051[1] + seg0;
-
- P009[1] = iP009[1] + seg6;
- P010[1] = iP010[1] + seg6;
- P075[1] = iP075[1] + seg6;
- P076[1] = iP076[1] + seg6;
-
- P001[1] = iP001[1] + seg7;
- P011[1] = iP011[1] + seg7;
- P068[1] = iP068[1] + seg7;
- P069[1] = iP069[1] + seg7;
- P070[1] = iP070[1] + seg7;
- P071[1] = iP071[1] + seg7;
- P072[1] = iP072[1] + seg7;
- P073[1] = iP073[1] + seg7;
- P074[1] = iP074[1] + seg7;
-
- P091[1] = iP091[1] + seg3 * 1.1;
- P092[1] = iP092[1] + seg3;
- P093[1] = iP093[1] + seg3;
- P094[1] = iP094[1] + seg3;
- P095[1] = iP095[1] + seg3 * 0.9;
-
- P099[1] = iP099[1] + chomp;
- P098[1] = iP098[1] + chomp;
- P097[1] = iP097[1] + chomp;
- P096[1] = iP096[1] + chomp;
-
- glPushMatrix();
-
- glRotatef(pitch, 1.0, 0.0, 0.0);
-
- glTranslatef(0.0, 0.0, 8000.0);
-
- glRotatef(180.0, 0.0, 1.0, 0.0);
-
- glScalef(3.0, 3.0, 3.0);
-
- glEnable(GL_CULL_FACE);
-
- Whale001();
- Whale002();
- Whale003();
- Whale004();
- Whale005();
- Whale006();
- Whale007();
- Whale008();
- Whale009();
- Whale010();
- Whale011();
- Whale012();
- Whale013();
- Whale014();
- Whale015();
- Whale016();
-
- glDisable(GL_CULL_FACE);
-
- glPopMatrix();
-}
diff --git a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c
deleted file mode 100644
index b7794b3b6..000000000
--- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c
+++ /dev/null
@@ -1,179 +0,0 @@
-
-/* Simple program: Create a blank window, wait for keypress, quit.
-
- Please see the SDL documentation for details on using the SDL API:
- /Developer/Documentation/SDL/docs.html
-*/
-
-#include
-#include
-#include
-#include
-
-#include "SDL.h"
-
-extern void Atlantis_Init ();
-extern void Atlantis_Reshape (int w, int h);
-extern void Atlantis_Animate ();
-extern void Atlantis_Display ();
-
-static SDL_Surface *gScreen;
-
-static void initAttributes ()
-{
- // Setup attributes we want for the OpenGL context
-
- int value;
-
- // Don't set color bit sizes (SDL_GL_RED_SIZE, etc)
- // Mac OS X will always use 8-8-8-8 ARGB for 32-bit screens and
- // 5-5-5 RGB for 16-bit screens
-
- // Request a 16-bit depth buffer (without this, there is no depth buffer)
- value = 16;
- SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, value);
-
-
- // Request double-buffered OpenGL
- // The fact that windows are double-buffered on Mac OS X has no effect
- // on OpenGL double buffering.
- value = 1;
- SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, value);
-}
-
-static void printAttributes ()
-{
- // Print out attributes of the context we created
- int nAttr;
- int i;
-
- int attr[] = { SDL_GL_RED_SIZE, SDL_GL_BLUE_SIZE, SDL_GL_GREEN_SIZE,
- SDL_GL_ALPHA_SIZE, SDL_GL_BUFFER_SIZE, SDL_GL_DEPTH_SIZE };
-
- char *desc[] = { "Red size: %d bits\n", "Blue size: %d bits\n", "Green size: %d bits\n",
- "Alpha size: %d bits\n", "Color buffer size: %d bits\n",
- "Depth bufer size: %d bits\n" };
-
- nAttr = sizeof(attr) / sizeof(int);
-
- for (i = 0; i < nAttr; i++) {
-
- int value;
- SDL_GL_GetAttribute (attr[i], &value);
- printf (desc[i], value);
- }
-}
-
-static void createSurface (int fullscreen)
-{
- Uint32 flags = 0;
-
- flags = SDL_OPENGL;
- if (fullscreen)
- flags |= SDL_FULLSCREEN;
-
- // Create window
- gScreen = SDL_SetVideoMode (640, 480, 0, flags);
- if (gScreen == NULL) {
-
- fprintf (stderr, "Couldn't set 640x480 OpenGL video mode: %s\n",
- SDL_GetError());
- SDL_Quit();
- exit(2);
- }
-}
-
-static void initGL ()
-{
- Atlantis_Init ();
- Atlantis_Reshape (gScreen->w, gScreen->h);
-}
-
-static void drawGL ()
-{
- Atlantis_Animate ();
- Atlantis_Display ();
-}
-
-static void mainLoop ()
-{
- SDL_Event event;
- int done = 0;
- int fps = 24;
- int delay = 1000/fps;
- int thenTicks = -1;
- int nowTicks;
-
- while ( !done ) {
-
- /* Check for events */
- while ( SDL_PollEvent (&event) ) {
- switch (event.type) {
-
- case SDL_MOUSEMOTION:
- break;
- case SDL_MOUSEBUTTONDOWN:
- break;
- case SDL_KEYDOWN:
- /* Any keypress quits the app... */
- case SDL_QUIT:
- done = 1;
- break;
- default:
- break;
- }
- }
-
- // Draw at 24 hz
- // This approach is not normally recommended - it is better to
- // use time-based animation and run as fast as possible
- drawGL ();
- SDL_GL_SwapBuffers ();
-
- // Time how long each draw-swap-delay cycle takes
- // and adjust delay to get closer to target framerate
- if (thenTicks > 0) {
- nowTicks = SDL_GetTicks ();
- delay += (1000/fps - (nowTicks-thenTicks));
- thenTicks = nowTicks;
- if (delay < 0)
- delay = 1000/fps;
- }
- else {
- thenTicks = SDL_GetTicks ();
- }
-
- SDL_Delay (delay);
- }
-}
-
-int main(int argc, char *argv[])
-{
- // Init SDL video subsystem
- if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
-
- fprintf(stderr, "Couldn't initialize SDL: %s\n",
- SDL_GetError());
- exit(1);
- }
-
- // Set GL context attributes
- initAttributes ();
-
- // Create GL context
- createSurface (0);
-
- // Get GL context attributes
- printAttributes ();
-
- // Init GL state
- initGL ();
-
- // Draw, get events...
- mainLoop ();
-
- // Cleanup
- SDL_Quit();
-
- return 0;
-}
diff --git a/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/English.lproj/InfoPlist.strings
deleted file mode 100644
index 6e721b0ef..000000000
Binary files a/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/Info.plist b/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/Info.plist
deleted file mode 100644
index e4332041b..000000000
--- a/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/Info.plist
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-