Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,19 @@ jobs:
name: mac_iOS
path: ./Dev/Plugin/Assets/Effekseer/Plugins

linux:
name: linux Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build Linux plugin in Docker
run: sh ci/build_linux_plugin_in_docker.sh
- name: Upload math result for linux
uses: actions/upload-artifact@v4
with:
name: Linux
path: ./Dev/Plugin/Assets/Effekseer/Plugins

windows:
name: windows Build
runs-on: windows-latest
Expand Down Expand Up @@ -181,7 +194,7 @@ jobs:
merge:
name: merge
runs-on: ubuntu-latest
needs: [android, mac_ios, windows, webgl_2-0-19,webgl_3-1-8,webgl_3-1-38]
needs: [android, mac_ios, linux, windows, webgl_2-0-19,webgl_3-1-8,webgl_3-1-38]
steps:
- uses: actions/checkout@v4
- name: Download Android
Expand All @@ -196,6 +209,11 @@ jobs:
name: mac_iOS
path: mac_iOS

- name: Download Linux
uses: actions/download-artifact@v4.1.7
with:
name: Linux
path: Linux

- name: Download mac_ios
uses: actions/download-artifact@v4.1.7
Expand Down Expand Up @@ -232,6 +250,7 @@ jobs:
mv WebGL_2-0-19/WebGL/2.0.19-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/2.0.19-64bit/
mv WebGL_3-1-8/WebGL/3.1.8-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.8-64bit/
mv WebGL_3-1-38/WebGL/3.1.38-64bit/libEffekseerUnity.bc Dev/Plugin/Assets/Effekseer/Plugins/WebGL/3.1.38-64bit/
mv Linux/Linux/x86_64/libEffekseerUnity.so Dev/Plugin/Assets/Effekseer/Plugins/Linux/x86_64/
mv Windows/x86/EffekseerUnity.dll Dev/Plugin/Assets/Effekseer/Plugins/x86/
mv Windows/x86_64/EffekseerUnity.dll Dev/Plugin/Assets/Effekseer/Plugins/x86_64/
- name: Upload math result
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Dev/Cpp/webgl/MakeFile

Dev/Plugin/*.sln
Dev/Plugin/*.csproj
Dev/build_linux/

Sample/*/Build/
Sample/*/Assets/Plugins/
Expand Down
20 changes: 19 additions & 1 deletion Dev/Cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ if(APPLE)
target_compile_options(EffekseerUnity PUBLIC -fembed-bitcode)
endif()

if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN)
set(srcs
${effekseer_src}
${effekseer_gl_src})

add_library(EffekseerUnity SHARED
${srcs}
)

target_link_libraries(EffekseerUnity PRIVATE
Effekseer
EffekseerRendererGL)

find_package(OpenGL REQUIRED)
target_link_libraries(EffekseerUnity PRIVATE
${OPENGL_LIBRARIES})
endif()

list(APPEND EFK_INCLUDES ../Effekseer/Dev/Cpp/)
list(APPEND EFK_INCLUDES ../Effekseer/Dev/Cpp/Effekseer/)
list(APPEND EFK_INCLUDES ../Effekseer/Dev/Cpp/EffekseerRendererCommon/)
Expand All @@ -119,4 +137,4 @@ install(
EXPORT ${PROJECT_NAME}-export
FILE ${PROJECT_NAME}-config.cmake
DESTINATION lib/cmake
EXPORT_LINK_INTERFACE_LIBRARIES)
EXPORT_LINK_INTERFACE_LIBRARIES)
Loading