trying to git gha workflow to work

This commit is contained in:
izzy2lost
2025-12-08 03:05:45 -05:00
parent 6dd5081b43
commit 853d1d467e
7 changed files with 151 additions and 25 deletions
+2 -2
View File
@@ -468,6 +468,8 @@ 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
@@ -592,8 +594,6 @@ if (ENABLE_WAYLAND)
# PUBLIC because wayland-client.h is included in VulkanAPI.h
target_link_libraries(CemuCafe PUBLIC Wayland::Client)
endif()
if (NOT ANDROID)
if (ENABLE_VCPKG)
if(WIN32)
set(PKG_CONFIG_EXECUTABLE "${VCPKG_INSTALLED_DIR}/x64-windows/tools/pkgconf/pkgconf.exe")
@@ -1,15 +1,12 @@
#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>();
@@ -18,7 +15,6 @@ namespace nsyshid::backend
AttachBackend(backendLibusb);
}
}
#endif
// add emulated backend
{
auto backendEmulated = std::make_shared<backend::emulated::BackendEmulated>();
+3 -12
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 java.util.HexFormat
import javax.xml.bind.DatatypeConverter
plugins {
alias(libs.plugins.android.application)
@@ -46,7 +46,7 @@ val cemuDataFilesFolder = "../../../bin"
android {
namespace = "com.izzy2lost.weeu"
compileSdk = 36
ndkVersion = "28.2.13676358"
ndkVersion = "29.0.14206865"
defaultConfig {
applicationId = "com.izzy2lost.weeu"
minSdk = 31
@@ -116,19 +116,10 @@ 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",
@@ -207,7 +198,7 @@ abstract class ComputeCemuDataFilesHashTask : DefaultTask() {
md.reset()
fileHashes.forEach { md.update(it) }
hashFile.writeText(HexFormat.of().formatHex(md.digest()).uppercase())
hashFile.writeText(DatatypeConverter.printHexBinary(md.digest()))
}
}
+2
View File
@@ -0,0 +1,2 @@
'build_android.bat' is not recognized as an internal or external command,
operable program or batch file.