--- a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj Fri Jun 07 21:47:23 2013 -0700
+++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj Fri Jun 07 21:50:29 2013 -0700
@@ -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 = "<group>";
@@ -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;
--- a/Xcode-iOS/Demos/Info.plist Fri Jun 07 21:47:23 2013 -0700
+++ b/Xcode-iOS/Demos/Info.plist Fri Jun 07 21:50:29 2013 -0700
@@ -24,5 +24,7 @@
<string>1.0</string>
<key>NSMainNibFile</key>
<string></string>
+ <key>UISupportedInterfaceOrientations</key>
+ <array/>
</dict>
</plist>
--- a/Xcode-iOS/Demos/src/rectangles.c Fri Jun 07 21:47:23 2013 -0700
+++ b/Xcode-iOS/Demos/src/rectangles.c Fri Jun 07 21:50:29 2013 -0700
@@ -37,50 +37,45 @@
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");
- }
-
- /* 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");
+ if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO*/) < 0)
+ {
+ printf("Unable to initialize SDL");
}
- renderer = SDL_CreateRenderer(window, -1, 0);
- if (!renderer) {
- fatalError("Could not create renderer");
+
+ 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;
+ }
}
-
- /* 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;
- }
- }
- 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_SHOWN | 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;
}
--- a/configure Fri Jun 07 21:47:23 2013 -0700
+++ b/configure Fri Jun 07 21:50:29 2013 -0700
@@ -15846,7 +15846,7 @@
host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
fi
for path in $gcc_bin_path $gcc_lib_path $env_lib_path $host_lib_path; do
- lib=`ls -- $path/$1 2>/dev/null | sort | sed 's/.*\/\(.*\)/\1/; q'`
+ lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`
if test x$lib != x; then
echo $lib
return