Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Synced with trunk.

  • Loading branch information
bobbens committed Jul 20, 2008
1 parent 8867662 commit 15959408ae96d17c7520f87d6ad7340d3e4d909b
@@ -18,3 +18,6 @@ before running configure.
There is a web interface to the subversion repository at:
http://www.libsdl.org/cgi/viewvc.cgi

There is an RSS feed available at that URL, for those that want to
track commits in real time.

Large diffs are not rendered by default.

@@ -0,0 +1,48 @@
<?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">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.testwm2</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
<?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">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.testwm2</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>

Large diffs are not rendered by default.

@@ -122,6 +122,7 @@
/* Enable OpenGL support */
#define SDL_VIDEO_OPENGL 1
#define SDL_VIDEO_OPENGL_CGL 1
#define SDL_VIDEO_RENDER_OGL 1

/* Enable assembly routines */
#define SDL_ASSEMBLY_ROUTINES 1
@@ -127,7 +127,6 @@ struct SDL_Window

int display;
SDL_Renderer *renderer;
SDL_GLContext context;

void *userdata;
void *driverdata;
@@ -2525,12 +2525,6 @@ SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context)
if (!context) {
window = NULL;
}
if (window) {
if (window->context == context) {
return 0;
}
window->context = context;
}
return _this->GL_MakeCurrent(_this, window, context);
}

@@ -288,7 +288,7 @@ - (CGLContextObj)CGLContextObj;
{
NSAutoreleasePool *pool;
NSOpenGLContext *nscontext;
long value;
GLint value;
int status;

pool = [[NSAutoreleasePool alloc] init];
@@ -312,7 +312,7 @@ - (CGLContextObj)CGLContextObj;
{
NSAutoreleasePool *pool;
NSOpenGLContext *nscontext;
long value;
GLint value;
int status;

pool = [[NSAutoreleasePool alloc] init];

0 comments on commit 1595940

Please sign in to comment.