r3082 - in trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A: . Headers Resources
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 2 08:31:22 EST 2008
Author: div0
Date: 2008-01-02 08:31:21 -0500 (Wed, 02 Jan 2008)
New Revision: 3082
Removed:
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_amiga.h
Modified:
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
Log:
OS X: SDL 1.2.13
Deleted: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_amiga.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_amiga.h 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_amiga.h 2008-01-02 13:31:21 UTC (rev 3082)
@@ -1,80 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken at libsdl.org
-*/
-
-#ifndef _SDL_config_amiga_h
-#define _SDL_config_amiga_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_AHI 1
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_DUMMY 1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DUMMY 1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_AMIGA 1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY 1
-
-/* Enable various threading systems */
-#define SDL_THREAD_AMIGA 1
-
-/* Enable various timer systems */
-#define SDL_TIMER_AMIGA 1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_CYBERGRAPHICS 1
-#define SDL_VIDEO_DRIVER_DUMMY 1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL 1
-
-#endif /* _SDL_config_amiga_h */
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h 2008-01-02 13:31:21 UTC (rev 3082)
@@ -122,9 +122,13 @@
#define SDL_BUTTON_RIGHT 3
#define SDL_BUTTON_WHEELUP 4
#define SDL_BUTTON_WHEELDOWN 5
+#define SDL_BUTTON_X1 6
+#define SDL_BUTTON_X2 7
#define SDL_BUTTON_LMASK SDL_BUTTON(SDL_BUTTON_LEFT)
#define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE)
#define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT)
+#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1)
+#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2)
/* Ends C function definitions when using C++ */
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h 2008-01-02 13:31:21 UTC (rev 3082)
@@ -174,6 +174,8 @@
# define alloca _alloca
# elif defined(__WATCOMC__)
# include <malloc.h>
+# elif defined(__BORLANDC__)
+# include <malloc.h>
# elif defined(__DMC__)
# include <stdlib.h>
# elif defined(__AIX__)
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h 2008-01-02 13:31:21 UTC (rev 3082)
@@ -37,7 +37,7 @@
*/
#define SDL_MAJOR_VERSION 1
#define SDL_MINOR_VERSION 2
-#define SDL_PATCHLEVEL 12
+#define SDL_PATCHLEVEL 13
typedef struct SDL_version {
Uint8 major;
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h 2008-01-02 13:31:21 UTC (rev 3082)
@@ -90,8 +90,8 @@
#elif !defined(__WINS__)
#undef DECLSPEC
#define DECLSPEC __declspec(dllexport)
-#endif //EKA2
-#endif //__SYMBIAN32__
+#endif /* !EKA2 */
+#endif /* __SYMBIAN32__ */
/* Force structure packing at 4 byte alignment.
This is necessary if the header is included in code which has structure
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
===================================================================
--- trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist 2008-01-02 13:26:51 UTC (rev 3081)
+++ trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist 2008-01-02 13:31:21 UTC (rev 3082)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -17,10 +17,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.9</string>
+ <string>1.2.13</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>1.2.10</string>
+ <string>1.2.13</string>
</dict>
</plist>
Modified: trunk/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list