android: move cmakelist

2018-12-24 15:02:47 -06:00 · 2018-12-24 15:02:47 -06:00 · d4646938e9
parent 4f23d5d69e
commit d4646938e9
2 changed files with 4 additions and 3 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -15,9 +15,10 @@ if (ENABLE_QT)
    add_subdirectory(citra_qt)
 endif()
 if (ANDROID)
-    add_subdirectory(android/app)
+    add_subdirectory(android/app/src/main/cpp)
+else()
+    add_subdirectory(dedicated_room)
 endif()
 if (ENABLE_WEB_SERVICE)
    add_subdirectory(web_service)
 endif()
-add_subdirectory(dedicated_room)
--- a/src/android/app/src/main/cpp/CMakeLists.txt
+++ b/src/android/app/src/main/cpp/CMakeLists.txt
@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)

 add_library(citra-android STATIC
-            src/main/cpp/dummy.cpp
+            dummy.cpp
            )

 # find Android's log library