X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=6feb753adb1ede88e8d3d90030a78684ee678407;hb=265a4c1c07f001dce197024c77ecad3d6aa9b111;hp=946ac6dff1cd6d5079a552692af9782b1e4a0943;hpb=4af25b80ace1e391f8886771bdf16c1db2a850f6;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 946ac6d..6feb753 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,6 @@ ELSEIF(ANDROID OR BLACKBERRY)
         src/android/fg_gamemode_android.c
         src/android/fg_joystick_android.c
         src/android/fg_spaceball_android.c
-        src/android/fg_structure_android.c
     )
     IF(ANDROID)
         LIST(APPEND FREEGLUT_SRCS
@@ -141,6 +140,7 @@ ELSEIF(ANDROID OR BLACKBERRY)
             src/android/fg_main_android.h
             src/android/fg_runtime_android.c
             src/android/fg_state_android.c
+            src/android/fg_structure_android.c
             src/android/fg_window_android.c
         )
     ELSE()
@@ -150,6 +150,7 @@ ELSEIF(ANDROID OR BLACKBERRY)
             src/x11/fg_input_devices_x11.c
             src/blackberry/fg_main_blackberry.c
             src/blackberry/fg_state_blackberry.c
+            src/blackberry/fg_structure_blackberry.c
             src/blackberry/fg_window_blackberry.c
         )
     ENDIF()
@@ -268,10 +269,16 @@ IF(ANDROID)
     # -llog for native Android logging
     LIST(APPEND LIBS android log)
 ELSEIF(BLACKBERRY)
-    # -lbps for event loop
-    # -lslog2 for logging
-    # -screen for native screen
-    LIST(APPEND LIBS bps slog2 screen)
+    if(PLAYBOOK)
+        # -lbps for event loop
+        # -screen for native screen
+        LIST(APPEND LIBS bps screen)
+    ELSE()
+        # -lbps for event loop
+        # -lslog2 for logging
+        # -screen for native screen
+        LIST(APPEND LIBS bps slog2 screen)
+    ENDIF()
 ENDIF()
 
 INCLUDE(CheckFunctionExists)
@@ -486,7 +493,11 @@ ELSEIF(FREEGLUT_GLES2)
   IF(ANDROID)
     SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL -lm")
   ELSEIF(BLACKBERRY)
-    SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -lGLESv2 -lEGL -lm")
+    IF(PLAYBOOK)
+      SET(PC_LIBS_PRIVATE "-lbps -lscreen -lGLESv2 -lEGL -lm")
+    ELSE()
+      SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -lGLESv2 -lEGL -lm")
+    ENDIF()
   ELSE()
     SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL -lm")
   ENDIF()
@@ -494,7 +505,11 @@ ELSEIF(FREEGLUT_GLES1)
   IF(ANDROID)
     SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL -lm")
   ELSEIF(BLACKBERRY)
-    SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -lGLESv1_CM -lEGL -lm")
+    IF(PLAYBOOK)
+      SET(PC_LIBS_PRIVATE "-lbps -lscreen -lGLESv1_CM -lEGL -lm")
+    ELSE()
+      SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -lGLESv1_CM -lEGL -lm")
+    ENDIF()
   ELSE()
     SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL -lm")
   ENDIF()