equal
deleted
inserted
replaced
32 |
32 |
33 set(ANDROID_NDK /home/richard/SoftDev/android/android-ndk-r5b) |
33 set(ANDROID_NDK /home/richard/SoftDev/android/android-ndk-r5b) |
34 set(ANDROID_SDK /home/richard/SoftDev/android/android-sdk-linux_86) |
34 set(ANDROID_SDK /home/richard/SoftDev/android/android-sdk-linux_86) |
35 set(FPC_DIR /home/richard/SoftDev/fpc-2.4.4) |
35 set(FPC_DIR /home/richard/SoftDev/fpc-2.4.4) |
36 set(SDL_DIR /home/richard/Downloads/android-project) |
36 set(SDL_DIR /home/richard/Downloads/android-project) |
37 set(LUA_DIR /home/richard/Downloads/lua-5.1.4) |
|
38 |
37 |
39 if(ANDROID_NDK AND ANDROID_SDK AND FPC_DIR) |
38 if(ANDROID_NDK AND ANDROID_SDK AND FPC_DIR) |
40 |
39 |
41 set(ANDROID_SDK_API_LVL 8) |
40 set(ANDROID_SDK_API_LVL 8) |
42 set(ANDROID_NDK_API_LVL 5) |
41 set(ANDROID_NDK_API_LVL 5) |
59 SDL_mixer |
58 SDL_mixer |
60 SDL_ttf |
59 SDL_ttf |
61 jpeg |
60 jpeg |
62 png |
61 png |
63 mikmod |
62 mikmod |
64 tremor |
|
65 freetype |
|
66 ) |
63 ) |
67 foreach(DIR ${DirsToCopy}) |
64 foreach(DIR ${DirsToCopy}) |
68 exec_program( |
65 exec_program( |
69 ${CMAKE_COMMAND} |
66 ${CMAKE_COMMAND} |
70 ARGS -E copy_directory |
67 ARGS -E copy_directory |
91 else(SDL_DIR) |
88 else(SDL_DIR) |
92 MESSAGE("Android port of SDL not moved..") |
89 MESSAGE("Android port of SDL not moved..") |
93 endif(SDL_DIR) |
90 endif(SDL_DIR) |
94 |
91 |
95 |
92 |
96 if(LUA_DIR) |
|
97 MESSAGE("Moving Lua dir..") |
|
98 |
|
99 exec_program( |
|
100 ${CMAKE_COMMAND} |
|
101 ARGS -E copy_directory |
|
102 ${LUA_DIR}/src |
|
103 ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/lua-5.1.4 |
|
104 ) |
|
105 MESSAGE("Lua has been moved.") |
|
106 |
|
107 exec_program(${HGCOMMAND} |
|
108 ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/lua-5.1.4/Android.mk |
|
109 ) |
|
110 exec_program(${HGCOMMAND} |
|
111 ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/lua-5.1.4/llex.c |
|
112 ) |
|
113 else(LUA_DIR) |
|
114 MESSAGE("Lua hasn't been moved..") |
|
115 endif(LUA_DIR) |
|
116 |
|
117 else(ANDROID_AND AND ANDROID_SDK AND FPC_DIR) |
93 else(ANDROID_AND AND ANDROID_SDK AND FPC_DIR) |
118 MESSAGE("Android port files not created, edit top of ${CMAKE_CURRENT_SOURCE_DIR}/CMakeList.txt to create android specific files") |
94 MESSAGE("Android port files not created, edit top of ${CMAKE_CURRENT_SOURCE_DIR}/CMakeList.txt to create android specific files") |
119 endif(ANDROID_NDK AND ANDROID_SDK AND FPC_DIR) |
95 endif(ANDROID_NDK AND ANDROID_SDK AND FPC_DIR) |
120 |
96 |
121 |
97 |