mirror of
https://github.com/FWGS/xash3d-fwgs.git
synced 2026-08-11 14:42:05 +08:00
Include android project into the sources
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
[submodule "hlsdk-portable"]
|
||||
path = app/src/main/cpp/hlsdk-portable
|
||||
url = https://github.com/FWGS/hlsdk-portable
|
||||
branch = mobile_hacks
|
||||
[submodule "xash3d-fwgs"]
|
||||
path = app/src/main/cpp/xash3d-fwgs
|
||||
url = https://github.com/FWGS/xash3d-fwgs
|
||||
[submodule "SDL"]
|
||||
path = app/src/main/cpp/SDL
|
||||
url = https://github.com/libsdl-org/SDL
|
||||
branch = release-2.24.1
|
||||
@@ -31,7 +31,7 @@ android {
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
version = "3.22.1"
|
||||
path = file("${project.projectDir}/src/main/cpp/CMakeLists.txt")
|
||||
path = file("${project.projectDir}/CMakeLists.txt")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,9 +75,9 @@ android {
|
||||
|
||||
sourceSets {
|
||||
getByName("main") {
|
||||
assets.srcDir("${project.projectDir}/src/main/cpp/xash3d-fwgs/3rdparty/extras/xash-extras")
|
||||
assets.srcDir("${project.projectDir}/../../3rdparty/xash-extras")
|
||||
assets.srcDir("${project.projectDir}/../moddb")
|
||||
java.srcDir("${project.projectDir}/src/main/cpp/SDL/android-project/app/src/main/java")
|
||||
java.srcDir("${project.projectDir}/../../3rdparty/SDL/android-project/app/src/main/java")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,4 +127,4 @@ fun getBuildNum(): Int {
|
||||
val qBuildNum = releaseDate.until(now, ChronoUnit.DAYS)
|
||||
val minuteOfDay = now.hour * 60 + now.minute
|
||||
return (qBuildNum * 10000 + minuteOfDay).toInt()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.6)
|
||||
|
||||
project(XASH_ANDROID)
|
||||
|
||||
# armeabi-v7a requires cpufeatures library
|
||||
include(AndroidNdkModules)
|
||||
android_ndk_import_module_cpufeatures()
|
||||
|
||||
find_package(PythonInterp 2.7 REQUIRED)
|
||||
|
||||
get_filename_component(C_COMPILER_ID ${CMAKE_C_COMPILER} NAME_WE)
|
||||
get_filename_component(CXX_COMPILER_ID ${CMAKE_CXX_COMPILER} NAME_WE)
|
||||
|
||||
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
|
||||
set(BUILD_TYPE "debug")
|
||||
else()
|
||||
set(BUILD_TYPE "release")
|
||||
endif()
|
||||
|
||||
set(CMAKE_VERBOSE_MAKEFILE ON)
|
||||
|
||||
set(WAF_CC "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET}")
|
||||
set(WAF_CXX "${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET}")
|
||||
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E env
|
||||
CC=${WAF_CC} CXX=${WAF_CXX}
|
||||
AR=${CMAKE_AR} STRIP=${CMAKE_STRIP}
|
||||
${PYTHON_EXECUTABLE} waf configure -vvv -T ${BUILD_TYPE} cmake
|
||||
--check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID}
|
||||
-s "${CMAKE_CURRENT_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/xash3d-fwgs"
|
||||
)
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
set(64BIT ON CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
add_subdirectory("hlsdk-portable")
|
||||
add_subdirectory("SDL")
|
||||
add_subdirectory("xash3d-fwgs")
|
||||
add_subdirectory("xash3d-fwgs/3rdparty/mainui")
|
||||
Submodule android/app/src/main/cpp/SDL deleted from 2eef7ca475
Submodule android/app/src/main/cpp/hlsdk-portable deleted from 0d8a19fd82
Submodule android/app/src/main/cpp/xash3d-fwgs deleted from 1c84a5c8ad
Reference in New Issue
Block a user