make local build work

This commit is contained in:
izzy2lost
2025-10-23 15:22:46 -04:00
parent fa305ae1a2
commit 1d79871aa6
4 changed files with 35 additions and 15 deletions
+7
View File
@@ -125,6 +125,13 @@ if !JAVA_MAJOR! LSS 21 (
echo Java !JAVA_MAJOR! detected.
)
REM Set environment variable to use pre-installed vcpkg dependencies
set "VCPKG_ROOT=%CD%\dependencies\vcpkg"
set "ANDROID_NDK_HOME=C:\Android\ndk\28.2.13676358"
echo VCPKG_ROOT set to: %VCPKG_ROOT%
echo ANDROID_NDK_HOME set to: %ANDROID_NDK_HOME%
REM Build the Android app
echo.
echo ========================================
+13 -13
View File
@@ -468,8 +468,6 @@ add_library(CemuCafe
OS/libs/nsyshid/Whitelist.h
OS/libs/nsyshid/BackendEmulated.cpp
OS/libs/nsyshid/BackendEmulated.h
OS/libs/nsyshid/BackendLibusb.cpp
OS/libs/nsyshid/BackendLibusb.h
OS/libs/nsyshid/Dimensions.cpp
OS/libs/nsyshid/Dimensions.h
OS/libs/nsyshid/Infinity.cpp
@@ -595,17 +593,19 @@ if (ENABLE_WAYLAND)
target_link_libraries(CemuCafe PUBLIC Wayland::Client)
endif()
if (ENABLE_VCPKG)
if(WIN32)
set(PKG_CONFIG_EXECUTABLE "${VCPKG_INSTALLED_DIR}/x64-windows/tools/pkgconf/pkgconf.exe")
endif()
find_package(PkgConfig REQUIRED)
pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
target_link_libraries(CemuCafe PRIVATE PkgConfig::libusb)
else ()
find_package(libusb MODULE REQUIRED)
target_link_libraries(CemuCafe PRIVATE libusb::libusb)
endif ()
if (NOT ANDROID)
if (ENABLE_VCPKG)
if(WIN32)
set(PKG_CONFIG_EXECUTABLE "${VCPKG_INSTALLED_DIR}/x64-windows/tools/pkgconf/pkgconf.exe")
endif()
find_package(PkgConfig REQUIRED)
pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
target_link_libraries(CemuCafe PRIVATE PkgConfig::libusb)
else ()
find_package(libusb MODULE REQUIRED)
target_link_libraries(CemuCafe PRIVATE libusb::libusb)
endif ()
endif()
if(WIN32)
target_link_libraries(CemuCafe PRIVATE iphlpapi)
@@ -1,12 +1,15 @@
#include "nsyshid.h"
#include "Backend.h"
#include "BackendEmulated.h"
#ifndef __ANDROID__
#include "BackendLibusb.h"
#endif
namespace nsyshid::backend
{
void AttachDefaultBackends()
{
#ifndef __ANDROID__
// add libusb backend
{
auto backendLibusb = std::make_shared<backend::libusb::BackendLibusb>();
@@ -15,6 +18,7 @@ namespace nsyshid::backend
AttachBackend(backendLibusb);
}
}
#endif
// add emulated backend
{
auto backendEmulated = std::make_shared<backend::emulated::BackendEmulated>();
+11 -2
View File
@@ -2,7 +2,7 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn
import java.io.IOException
import java.security.MessageDigest
import java.util.regex.Pattern
import javax.xml.bind.DatatypeConverter
import java.util.HexFormat
plugins {
alias(libs.plugins.android.application)
@@ -116,10 +116,19 @@ android {
defaultConfig {
externalNativeBuild {
cmake {
// project.rootDir is src/android, so go up 2 levels to get to WeeU root
val weeURoot = project.rootDir.parentFile.parentFile
val vcpkgInstalledDir = File(weeURoot, "dependencies/vcpkg/installed").absolutePath
arguments(
"-DANDROID_STL=c++_shared",
"-DENABLE_VCPKG=ON",
"-DVCPKG_TARGET_ANDROID=ON",
"-DVCPKG_INSTALLED_DIR=$vcpkgInstalledDir",
"-DVCPKG_MANIFEST_MODE=OFF",
"-DVCPKG_MANIFEST_INSTALL=OFF",
"-DX_VCPKG_APPLOCAL_DEPS_INSTALL=OFF",
"-DPKG_CONFIG_EXECUTABLE=",
"-DENABLE_SDL=OFF",
"-DENABLE_WXWIDGETS=OFF",
"-DENABLE_OPENGL=OFF",
@@ -198,7 +207,7 @@ abstract class ComputeCemuDataFilesHashTask : DefaultTask() {
md.reset()
fileHashes.forEach { md.update(it) }
hashFile.writeText(DatatypeConverter.printHexBinary(md.digest()))
hashFile.writeText(HexFormat.of().formatHex(md.digest()).uppercase())
}
}