Commit graph

249 commits

Author SHA1 Message Date
Ryan C. Gordon
6fb707a2a2 Whoops, fixed previous VC6 support patch.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402373
2007-06-21 18:48:13 +00:00
Ryan C. Gordon
be8f728aaa Fixes for Visual C++ 6.0 with and without the Processor Pack.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402371
2007-06-21 18:20:59 +00:00
Ryan C. Gordon
1e4e388318 Make sure __inline__ isn't defined before #defining it, since some compilers
(like Sun Studio) have this as a predefined macro.

   Fixes Bugzilla #434.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402354
2007-06-15 07:19:05 +00:00
Ryan C. Gordon
e883b665af Use system memset/memcpy on Mac OS X, since Apple hand-tunes these for each
processor they ship (and thus, it's likely to beat our code on PowerPC and
 Intel and whatever variants or new archs show up later).

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402323
2007-06-03 06:52:06 +00:00
Ryan C. Gordon
a144a3d025 Committed PulseAudio driver. Thanks, Stephan!
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402310
2007-05-13 23:12:46 +00:00
Ryan C. Gordon
3ce0d260d0 Const correctness patch for SDL_MapRGB and SDL_MapRGBA.
Fixes Bugzilla #421.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402298
2007-04-04 09:40:40 +00:00
Ryan C. Gordon
c6a106ad29 Adjusted to handle different constness in older versions of iconv.
Fixes Bugzilla #419.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402292
2007-03-30 20:09:55 +00:00
Ryan C. Gordon
357970bfe2 Fixed Mac OS X config header when compiling with -Wundef.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402288
2007-03-28 00:36:35 +00:00
Ryan C. Gordon
db2fe20ace From: Laurence Passmore
Date: Mon, 26 Mar 2007 23:22:45 +0100
To: "A list for developers using the SDL library. \(includes SDL-announce\)" <sdl@lists.libsdl.org>
Subject: [SDL] SDL_config_macosx.h: MAC_OS_X_VERSION_MIN_REQUIRED

Hi,

I just compiled my SDL application on Mac OS X with -Wundef and it
threw a number of errors. Of note was:

     SDL_config_macosx.h: 34
     warning: "MAC_OS_X_VERSION_MIN_REQUIRED" is not defined

Line 34 is:

     #if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined (__POWERPC__)) )

Now according to this mailing on the Apple developer lists:

     http://lists.apple.com/archives/Xcode-users/2005/May/msg00602.html

that particular #define was removed from the gcc compiler defaults
and AvailabilityMacros.h (/usr/include/AvailabilityMacros.h) should
be pulled in directly instead.

Would someone closer to the Mac OS X version of SDL be willing to
make that change please? Thanks.

Laurence Passmore
Homeworld SDL @ www.homeworldsdl.org

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402286
2007-03-27 00:37:51 +00:00
Ryan C. Gordon
d969c7e221 Minor const correctness patch to SDL_iconv.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402275
2007-02-16 03:50:42 +00:00
Ryan C. Gordon
8b407756dc Patched fbcon to compile on newer Linux kernels that don't #define PAGE_SIZE,
since a memory page's size may vary on various architectures and kernel
 configurations.

Will use getpagesize() if it exists, the PAGE_SIZE #define from older kernels
 if that doesn't, and #error out if that's not there either...but it's
 probably 4096 in that case. We may revisit this.

   Fixes Bugzilla #392.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402273
2007-02-15 23:50:45 +00:00
Ryan C. Gordon
9a1cd1510c Digital Mars has stdint.h, so use the header on Windows with that compiler.
Fixes Bugzilla #376.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402261
2007-02-12 11:45:18 +00:00
Ryan C. Gordon
8bc3ad08b2 Patched to compile on BeOS and old, old GCC releases.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402257
2007-02-05 06:44:51 +00:00
Ryan C. Gordon
880be03a0d Wrapped some macro params in parentheses for alloca wrappers.
Thansk, Suzuki Masahiro.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402240
2006-11-29 10:30:05 +00:00
Ryan C. Gordon
74852e1d64 A few more AmigaOS things.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402214
2006-10-29 04:08:50 +00:00
Ryan C. Gordon
79b94d85d1 Removed broken AmigaOS support.
Fixes Bugzilla #337.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402213
2006-10-29 03:58:27 +00:00
Sam Lantinga
dd8038b0e4 Bumped the version in subversion to 1.2.12
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402108
2006-09-24 00:10:59 +00:00
Sam Lantinga
8460b069f6 Fixed bug #278
Added the GFX_Display to the wminfo structure, contributed by Eric

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402107
2006-09-24 00:08:28 +00:00
Sam Lantinga
8c7a772ffd Updated the version to 1.2.11
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401901
2006-06-25 18:07:34 +00:00
Sam Lantinga
59b92bf98c --HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401899
2006-06-25 17:14:39 +00:00
Sam Lantinga
2c01718695 Fixed including stdint.h with gcc on Win32
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401898
2006-06-25 17:12:08 +00:00
Sam Lantinga
739db2c78e Fixed bug #256
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401871
2006-06-21 07:35:02 +00:00
Sam Lantinga
f2d67baf34 Moved DirectInput joystick code to 1.3 branch
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401821
2006-05-21 17:26:40 +00:00
Sam Lantinga
fe915b7a0a Closed bug #74
Added DirectInput joystick code, contributed by Glenn Maynard.

This fixes a problem with the Windows Multimedia joystick driver
not showing all 6 axes on a GameCube controller converter, which
was donated by Jacob Kolding.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401820
2006-05-21 16:47:41 +00:00
Sam Lantinga
90a334ec54 Fixed thread callback calling conventions, updated OS/2 DLL name to SDL12.dll
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401815
2006-05-17 18:57:04 +00:00
Sam Lantinga
84d5ff0f28 Fixed alloca declaration for MPW
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401790
2006-05-14 05:20:36 +00:00
Sam Lantinga
69d1266caa Hey, whaddy know! MacOS Classic has 64-bit types!
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401789
2006-05-13 16:30:59 +00:00
Sam Lantinga
ee2930d6da Fixed bug #221
The Carbon build on Mac OS X uses the toolbox video driver, not quartz.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401764
2006-05-10 07:25:37 +00:00
Sam Lantinga
e4a7253ac3 Prevent both __MACOS__ and __MACOSX__ from being defined in Codewarrior
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401762
2006-05-10 07:08:41 +00:00
Sam Lantinga
3fc9b6a9da Fixed bug #218
Currently there are two Classic-only drivers defined in "SDL_config_macos.h",
and the ones in "SDL_config_macosx.h" are Mach-O/framework-only (i.e. not CFM)

As a workaround, I disabled CDROM and JOYSTICK when building SDL for CFM
Carbon.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401755
2006-05-09 15:14:48 +00:00
Sam Lantinga
9cdedc648e Fixed bug #203
Disable screensaver and DPMS blanking while SDL app is running.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401742
2006-05-08 06:38:13 +00:00
Sam Lantinga
b4ba6518d6 Fixed bug #215
The current SVN trunk is missing the SDLCALL specifier at numerous locations.

It has to be added for all (possibly user provided) callbacks.

I stumbled over this while creating a makefile for the OpenWatcom compiler for
Win32.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401728
2006-05-07 03:40:06 +00:00
Sam Lantinga
b74b770864 Patch from Dmitry Yakimov to fix building on WinCE
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401719
2006-05-03 04:11:38 +00:00
Sam Lantinga
46eecc57a6 We want to wrap HAVE_ALLOCA_H, not HAVE_ALLOCA. :)
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401707
2006-04-30 08:57:02 +00:00
Ryan C. Gordon
12d7c190c2 fatbuild fixes:
- A change to define CXX in fatbuild, which comforts the configure script a little, even if we don't use C++ anywhere.
- Some code to see how many CPU cores exist and parallelize make across them.
- CFLAGS that apply to both archs are specified seperately (-O3, -pipe, etc)
- -fvisibility=hidden for the gcc4 builds
- a "clean", "clean-ppc" and "clean-x86" command
- Fix to SDL_config_macosx.h for the HAVE_ALLOCA_H thing.

Now builds on an Intel Mac.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401678
2006-04-27 11:18:03 +00:00
Sam Lantinga
37adc6aae8 Implemented bug #5
Added SDL_GL_ACCELERATED_VISUAL to guarantee hardware acceleration.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401672
2006-04-27 08:39:51 +00:00
Sam Lantinga
b32d3f9c24 Implemented bug #2, 117:
Date: Mon, 21 Mar 2005 12:06:14 +0100
From: Per Inge Mathisen
Subject: Re: [SDL] Outstanding patches?

The patch adds support for setting SDL_GL_SWAP_CONTROL to Windows and
X11. In Windows you can also query this enum to check that it is
working, or see what the default is - such functionality does not
exist in GLX. For more information on the standards implemented:
http://oss.sgi.com/projects/ogl-sample/registry/SGI/swap_control.txt
http://oss.sgi.com/projects/ogl-sample/registry/EXT/wgl_swap_control.txt

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401671
2006-04-27 07:59:16 +00:00
Sam Lantinga
a0fa14aca9 subversion conversion complete!
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401658
2006-04-26 20:30:11 +00:00
Sam Lantinga
4b9dfebabd Miscellaneous Mac OS X fixes
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401645
2006-04-17 03:34:28 +00:00
Sam Lantinga
2072cdd857 Make sure code is only compiled if the appropriate subsystem is enabled
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401642
2006-04-14 04:46:47 +00:00
Sam Lantinga
50f2cfc3c2 Fixed MacOS X and Solaris detection
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401638
2006-04-13 14:59:34 +00:00
Sam Lantinga
7a15c646b5 Fixed bug #185
The SDL platform header shouldn't dictate the OS target API for other
applications.  The build system should define the target API for building
SDL internally.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401635
2006-04-13 14:14:06 +00:00
Sam Lantinga
dfa643c31b Fixed bug #176
[I'm fixing this for the public headers, but I'm not going to bother for the SDL library code (yet)]

To clarify: Normaly, GCC (or, to be precise, the preprocessor) will ignore
this, and compile the code happily. However, one can specify -Wundef to get a
warning about this.

One can probably argue whether to consider this a bug or not; but I think that
(a) from a semantic point of view, using "#if FOO" when FOO is not defined is
strange, and (b) since it is possible to trigger a warning about this, and a
trivial fix exists, it should be corrected.

I can think of two alternative patches, BTW:
1) Simply use #define HAVE_FOO 0, instead of not defining HAVE_FOO at all
2) Change
  #if HAVE_FOO
to
  #if HAVE_FOO+0
which always does the right thing.

But I think I still prefer the attached patch :-).

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401633
2006-04-13 13:38:40 +00:00
Sam Lantinga
be0f0ff107 Fixes bug #195:
The proper name of Apple's operating system is "Mac OS X" not "MacOS X", as can
bee seen in many places, for example http://www.apple.com/macosx/). This
contrasts the naming of the old operating system, which was called "MacOS" and
today is often refered to as "MacOS Classic".

The attached patches fixes the misuse of the name "MacOS X" in both the SDL12
and sdlweb CVS modules.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401628
2006-04-13 13:08:26 +00:00
Sam Lantinga
8445eb17d1 From Anders F Bjorklund:
The current definition of int32_t, uint32_t, uintptr_t
doesn't match what the Mac system headers already have...

Since it's an old 16/32 bit platform, the system headers
expect the types to use "long" and not "int" like they do.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401627
2006-04-12 14:38:47 +00:00
Sam Lantinga
0478af81b2 From Anders F Bjorklund:
When switching to "UNIX-style paths" as needed for the new includes,
including <GL/gl.h> and <GL/glu.h> doesn't work anymore on Mac OS...

The two headers are really located in the OpenGL SDK 1.2 CFM like this:
OpenGL:Headers:gl.h
OpenGL:Headers:glu.h

There are also some compat copies, that *used* to work with Mac paths:
OpenGL:Headers:GL/gl.h
OpenGL:Headers:GL/glu.h

The easiest fix is to make SDL_opengl.h include the proper header names,
by adding a special case for the MACOS platform in addition to the MACOSX

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401626
2006-04-12 14:37:05 +00:00
Sam Lantinga
764d343924 A less rude way of doing the same thing...
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401615
2006-03-23 21:55:13 +00:00
Sam Lantinga
88dd069862 These files should be included from SDL_config.h (so they get SDL_platform.h)
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401614
2006-03-23 21:52:47 +00:00
Sam Lantinga
e847bdc465 Fixed bug #175
Removed obsolete .cvsignore files... whee!

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401612
2006-03-23 21:39:58 +00:00
Sam Lantinga
c9bbe9f6c2 *** empty log message ***
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401611
2006-03-23 21:39:02 +00:00