wip

nesbox · May 16, 2024 · c750049 · c750049
1 parent 9321287
commit c750049
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,18 +15,15 @@ message("VERSION_HASH: ${VERSION_HASH}")
 configure_file("${PROJECT_SOURCE_DIR}/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/version.h")
 
 if(ANDROID OR EMSCRIPTEN OR N3DS OR RPI OR BAREMETALPI)
-    set(BUILD_LIBRETRO_DEFAULT OFF)
-    set(BUILD_PLAYER_DEFAULT OFF)
-    set(BUILD_TOOLS OFF)
     set(BUILD_STATIC_DEFAULT ON)
 else()
-    set(BUILD_LIBRETRO_DEFAULT ON)
-    set(BUILD_PLAYER_DEFAULT ON)
-    set(BUILD_TOOLS ON)
     set(BUILD_STATIC_DEFAULT OFF)
 endif()
 
+set(BUILD_PLAYER_DEFAULT OFF)
+set(BUILD_LIBRETRO_DEFAULT OFF)
 set(BUILD_TOUCH_INPUT_DEFAULT ${ANDROID})
+set(BUILD_TOOLS OFF)
 set(BUILD_WITH_ALL_DEFAULT OFF)
 
 option(BUILD_STATIC "Static runtime" ${BUILD_STATIC_DEFAULT})

diff --git a/cmake/lua.cmake b/cmake/lua.cmake
@@ -3,11 +3,6 @@
 ################################
 
 option(BUILD_WITH_LUA "Lua Enabled" ON)
-
-if(BUILD_WITH_MOON OR BUILD_WITH_FENNEL)
-    set(BUILD_WITH_LUA TRUE)
-endif()
-
 message("BUILD_WITH_LUA: ${BUILD_WITH_LUA}")
 
 if(BUILD_WITH_LUA)
@@ -63,7 +58,7 @@ if(BUILD_WITH_LUA)
 
     target_link_libraries(lua PRIVATE runtime luaapi)
 
-    target_compile_definitions(lua PRIVATE LUA_COMPAT_5_2)
+    target_compile_definitions(luaapi PRIVATE LUA_COMPAT_5_2)
 
     target_include_directories(luaapi 
         PUBLIC ${THIRDPARTY_DIR}/lua
@@ -79,7 +74,7 @@ if(BUILD_WITH_LUA)
     )
 
     if(N3DS)
-        target_compile_definitions(lua PUBLIC LUA_32BITS)
+        target_compile_definitions(luaapi PUBLIC LUA_32BITS)
     endif()
 
     target_compile_definitions(lua INTERFACE TIC_BUILD_WITH_LUA)