From ad2dc3f956f6296f2c6acca559505cf2e5e86af4 Mon Sep 17 00:00:00 2001 From: Rcmaniac25 Date: Fri, 24 Jan 2014 10:27:24 +0000 Subject: [PATCH] Minor order change in Android/BlackBerry CMake, one comment for BlackBerry window git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1654 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 4 ++-- src/blackberry/fg_window_blackberry.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 527370a..16661e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,8 +131,8 @@ ELSEIF(ANDROID OR BLACKBERRY) LIST(APPEND FREEGLUT_SRCS src/android/native_app_glue/android_native_app_glue.c src/android/native_app_glue/android_native_app_glue.h - src/android/fg_init_android.c src/android/fg_internal_android.h + src/android/fg_init_android.c src/android/fg_input_devices_android.c src/android/fg_main_android.c src/android/fg_main_android.h @@ -142,8 +142,8 @@ ELSEIF(ANDROID OR BLACKBERRY) ) ELSE() LIST(APPEND FREEGLUT_SRCS - src/blackberry/fg_init_blackberry.c src/blackberry/fg_internal_blackberry.h + src/blackberry/fg_init_blackberry.c src/x11/fg_input_devices_x11.c src/blackberry/fg_main_blackberry.c src/blackberry/fg_state_blackberry.c diff --git a/src/blackberry/fg_window_blackberry.c b/src/blackberry/fg_window_blackberry.c index ff0c08f..8c1a121 100644 --- a/src/blackberry/fg_window_blackberry.c +++ b/src/blackberry/fg_window_blackberry.c @@ -64,7 +64,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title, fgDisplay.pDisplay.single_native_window = sWindow; /* Set window properties */ - int screenFormat = SCREEN_FORMAT_RGBA8888; + int screenFormat = SCREEN_FORMAT_RGBA8888; //XXX Should this be determined by config? #ifdef GL_ES_VERSION_2_0 int screenUsage = SCREEN_USAGE_OPENGL_ES2; #elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1 -- 1.7.10.4