fix(windows/linux): fix dirent.h compat, add Windows/Linux CMake branches, correct Core lib paths

Author: xiaoyvyv

.github/workflows/build_live2d.yml

@@ -67,6 +67,9 @@ jobs:
       - name: Setup MSVC & CMake
         uses: ilammy/msvc-dev-cmd@v1
 
+      - name: Install GLEW
+        run: choco install glew --yes
+
       - name: Build Windows dll
         shell: bash
         run: ./shared/core-native/scripts/build_windows.sh

shared/core-native/scripts/build_linux.sh

@@ -27,6 +27,7 @@ rm -rf "${BUILD_DIR}"
 
 cmake -S "${SCRIPT_DIR}/src/cpp" -B "${BUILD_DIR}" \
   "${EXTRA_CMAKE_FLAGS[@]}" \
+  -DLINUX_DESKTOP_BUILD=ON \
   -DCMAKE_BUILD_TYPE=Release
 cmake --build "${BUILD_DIR}" --config Release
 

shared/core-native/scripts/build_windows.sh

@@ -27,6 +27,7 @@ rm -rf "${BUILD_DIR}"
 
 cmake -S "${SCRIPT_DIR}/src/cpp" -B "${BUILD_DIR}" \
   "${EXTRA_CMAKE_FLAGS[@]}" \
+  -DWINDOWS_DESKTOP_BUILD=ON \
   -DCMAKE_BUILD_TYPE=Release
 cmake --build "${BUILD_DIR}" --config Release
 

shared/core-native/src/cpp/CMakeLists.txt

@@ -82,7 +82,94 @@ elseif(MACOS_DESKTOP_BUILD)
         Live2DCubismCore
         ${OPENGL_LIBRARIES}
     )
+elseif(WINDOWS_DESKTOP_BUILD OR (WIN32 AND NOT ANDROID))
+    add_compile_definitions(CSM_TARGET_WIN_GL WINDOWS_DESKTOP_BUILD)
+
+    find_package(OpenGL REQUIRED)
+    include_directories(${OPENGL_INCLUDE_DIR})
+
+    if(DEFINED ENV{JAVA_HOME})
+        include_directories(
+            "$ENV{JAVA_HOME}/include"
+            "$ENV{JAVA_HOME}/include/win32"
+        )
+    else()
+        find_package(JNI QUIET)
+        if(JNI_FOUND)
+            include_directories(${JNI_INCLUDE_DIRS})
+        endif()
+    endif()
+
+    find_package(GLEW QUIET)
+
+    add_library(Live2DCubismCore STATIC IMPORTED)
+    set_target_properties(Live2DCubismCore PROPERTIES IMPORTED_LOCATION
+        "${SDK_ROOT}/Core/lib/windows/x86_64/143/Live2DCubismCore_MD.lib"
+    )
+
+    add_library(live2d_native SHARED
+        live2d_renderer.cpp
+        live2d_jni.cpp
+        miniz.c
+        ${FRAMEWORK_SOURCES}
+    )
+
+    if(GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+        target_link_libraries(live2d_native
+            Live2DCubismCore
+            ${OPENGL_LIBRARIES}
+            ${GLEW_LIBRARIES}
+            opengl32
+        )
+    else()
+        target_link_libraries(live2d_native
+            Live2DCubismCore
+            ${OPENGL_LIBRARIES}
+            opengl32
+        )
+    endif()
+
+elseif(LINUX_DESKTOP_BUILD OR (UNIX AND NOT APPLE AND NOT ANDROID))
+    add_compile_definitions(CSM_TARGET_LINUX_GL LINUX_DESKTOP_BUILD)
+
+    find_package(OpenGL REQUIRED)
+    find_package(X11 REQUIRED)
+    include_directories(${OPENGL_INCLUDE_DIR} ${X11_INCLUDE_DIR})
+
+    if(DEFINED ENV{JAVA_HOME})
+        include_directories(
+            "$ENV{JAVA_HOME}/include"
+            "$ENV{JAVA_HOME}/include/linux"
+        )
+    else()
+        find_package(JNI QUIET)
+        if(JNI_FOUND)
+            include_directories(${JNI_INCLUDE_DIRS})
+        endif()
+    endif()
+
+    add_library(Live2DCubismCore STATIC IMPORTED)
+    set_target_properties(Live2DCubismCore PROPERTIES IMPORTED_LOCATION
+        "${SDK_ROOT}/Core/lib/linux/x86_64/libLive2DCubismCore.a"
+    )
+
+    add_library(live2d_native SHARED
+        live2d_renderer.cpp
+        live2d_jni.cpp
+        miniz.c
+        ${FRAMEWORK_SOURCES}
+    )
+
+    target_link_libraries(live2d_native
+        Live2DCubismCore
+        ${OPENGL_LIBRARIES}
+        ${X11_LIBRARIES}
+        GL
+    )
+
 else()
+    # Android
     add_compile_definitions(CSM_TARGET_ANDROID_ES2)
 
     add_library(Live2DCubismCore STATIC IMPORTED)

shared/core-native/src/cpp/live2d_renderer.cpp

@@ -10,7 +10,11 @@
 #include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
+#if defined(_WIN32)
+#include <windows.h>
+#else
 #include <dirent.h>
+#endif
 #include "miniz.h"
 
 #include <mutex>
@@ -33,6 +37,18 @@
 #include <cstdio>
 #define LOGI(...) do { printf("[Live2DNative] "); printf(__VA_ARGS__); printf("\n"); fflush(stdout); } while(0)
 #define LOGE(...) do { fprintf(stderr, "[Live2DNative] "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); fflush(stderr); } while(0)
+#elif defined(WINDOWS_DESKTOP_BUILD) || defined(_WIN32)
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <cstdio>
+#define LOGI(...) do { printf("[Live2DNative] "); printf(__VA_ARGS__); printf("\n"); fflush(stdout); } while(0)
+#define LOGE(...) do { fprintf(stderr, "[Live2DNative] "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); fflush(stderr); } while(0)
+#elif defined(LINUX_DESKTOP_BUILD) || defined(__linux__)
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <cstdio>
+#define LOGI(...) do { printf("[Live2DNative] "); printf(__VA_ARGS__); printf("\n"); fflush(stdout); } while(0)
+#define LOGE(...) do { fprintf(stderr, "[Live2DNative] "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); fflush(stderr); } while(0)
 #else
 #include <OpenGLES/ES2/gl.h>
 #include <cstdio>
@@ -864,6 +880,15 @@ bool live2d_load_model_from_zip(Live2DHandle handle, const char* zip_file_path,
     if (stat(checkExpectedPath.c_str(), &st) == 0) {
         jsonFilename = expectedJson;
     } else {
+#if defined(_WIN32)
+        std::string searchPath = targetDir + "\\*.model3.json";
+        WIN32_FIND_DATAA findData;
+        HANDLE hFind = FindFirstFileA(searchPath.c_str(), &findData);
+        if (hFind != INVALID_HANDLE_VALUE) {
+            jsonFilename = findData.cFileName;
+            FindClose(hFind);
+        }
+#else
         DIR* dir = opendir(targetDir.c_str());
         if (dir) {
             struct dirent* entry;
@@ -876,6 +901,7 @@ bool live2d_load_model_from_zip(Live2DHandle handle, const char* zip_file_path,
             }
             closedir(dir);
         }
+#endif
     }
 
     if (jsonFilename.empty()) {