Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: GCC14 compatible build #1023

Merged
merged 10 commits into from
Sep 5, 2024
Merged

FIX: GCC14 compatible build #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
21e1fe0
FIX: GCC14 compatible build
perroboc Sep 3, 2024
aed4fdc
gitignore: added linux release files
perroboc Sep 3, 2024
3a8483f
CMAKE: find glfw3 library name
perroboc Sep 3, 2024
3acb521
CMAKE: fix win32 not using find_package
perroboc Sep 3, 2024
eaa15ad
CMAKE: fix apple build
perroboc Sep 3, 2024
96e39a7
CMAKE: add libglfw3-dev to linux build
perroboc Sep 3, 2024
373b262
FIX: enable HiDPI scaling on linux
perroboc Sep 3, 2024
68ca5b9
GCC14: Fix linux use of lib64 libraries
perroboc Sep 4, 2024
88279d1
GCC14: use lib64 folder if it exists
perroboc Sep 4, 2024
4c3ae3d
github actions: Ubuntu lib/lib64 test
perroboc Sep 4, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
wget -q https://packages.microsoft.com/config/ubuntu/18.04/prod.list
sudo mv prod.list /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update
sudo apt-get install -y libpulse-dev libglvnd-dev libx11-dev libopenal-dev libvulkan-dev \
sudo apt-get install -y libpulse-dev libglvnd-dev libx11-dev libopenal-dev libvulkan-dev \
libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libgtk-3-dev ninja-build dotnet-sdk-3.1 \
xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev zenity

Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ Dev/release/runtimes/
Dev/release/resources/fonts/
Dev/release/resources/icons/
Dev/release/tools/
Dev/release/ref/
Dev/release/createdump
Dev/release/Effekseer*

Dev/Cpp/include/
Dev/Cpp/lib/
Expand All @@ -57,3 +60,5 @@ mono_crash.*.json
mono_crash.*.blob
Script/__pycache__/aceutils.cpython-37.pyc
Tool/fbxsdk

EffekseerTool/
50 changes: 33 additions & 17 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,13 @@ if(BUILD_VIEWER)
)
list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/include)
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/lib)
if(EXISTS "${ExternalProject_libpng_INSTALL_DIR}/lib64")
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libpng/lib64)
endif()

if(MSVC)
set(LIBPNG_LIB_DEBUG "libpng16_staticd")

set(LIBPNG_LIB_RELEASE "libpng16_static")
elseif(BUILD_WITH_POSTFIX)
set(LIBPNG_LIB_DEBUG "png16d")
Expand Down Expand Up @@ -282,6 +286,10 @@ if(BUILD_VIEWER)

list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/include)
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/lib)
if(EXISTS "${ExternalProject_libgd_INSTALL_DIR}/lib64")
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/libgd/lib64)
endif()


# OpenSoundMixer
ExternalProject_Add(
Expand Down Expand Up @@ -311,23 +319,28 @@ endif()
if(BUILD_VIEWER OR BUILD_TEST)
# glew
if(NOT APPLE)
ExternalProject_Add(
ExternalProject_glew
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Downloads/glew
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Build/glew
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Dev/3rdPartyPatch/glew-CMakeLists.txt <SOURCE_DIR>/CMakeLists.txt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew
-DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_CURRENT_SOURCE_DIR}/Dev/CFlagOverrides.cmake
-DEFK_USE_MSVC_RUNTIME_LIBRARY_DLL=${USE_MSVC_RUNTIME_LIBRARY_DLL}
-DSANITIZE_ENABLED=${SANITIZE_ENABLED}
-DBUILD_SHARED_LIBS=OFF
-DGLEW_BUILD_INFO=OFF
-DBUILD_UTILS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
)
list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/include)
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib)
ExternalProject_Add(
ExternalProject_glew
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Downloads/glew
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Build/glew
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Dev/3rdPartyPatch/glew-CMakeLists.txt <SOURCE_DIR>/CMakeLists.txt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew
-DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_CURRENT_SOURCE_DIR}/Dev/CFlagOverrides.cmake
-DEFK_USE_MSVC_RUNTIME_LIBRARY_DLL=${USE_MSVC_RUNTIME_LIBRARY_DLL}
-DSANITIZE_ENABLED=${SANITIZE_ENABLED}
-DBUILD_SHARED_LIBS=OFF
-DGLEW_BUILD_INFO=OFF
-DBUILD_UTILS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
)

list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/include)
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib)
if(EXISTS "${ExternalProject_glew_INSTALL_DIR}/lib64")
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glew/lib64)
endif()

endif()
endif()

Expand Down Expand Up @@ -360,6 +373,9 @@ if(BUILD_VIEWER OR BUILD_EXAMPLES OR BUILD_TEST)

list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/include)
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/lib)
if(EXISTS "${ExternalProject_glfw_INSTALL_DIR}/lib64")
list(APPEND EFK_THIRDPARTY_LIBRARY_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/Install/glfw/lib64)
endif()
endif()

list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/Dev/Cpp/3rdParty/flatbuffers/include)
Expand Down
2 changes: 1 addition & 1 deletion Dev/Cpp/3rdParty/flatbuffers/include/flatbuffers/stl_emulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ class span FLATBUFFERS_FINAL_CLASS {
private:
// This is a naive implementation with 'count_' member even if (Extent != dynamic_extent).
pointer const data_;
const size_type count_;
size_type count_; // https://github.com/google/flatbuffers/pull/7227
};

#if !defined(FLATBUFFERS_SPAN_MINIMAL)
Expand Down
6 changes: 6 additions & 0 deletions Dev/Cpp/EditorCommon/GUI/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ bool MainWindow::InitializeInternal(const char16_t* title, MainWindowState state
float yscale = 1.0f;
glfwGetMonitorContentScale(primary, &xscale, &yscale);
dpiScale_ = xscale;
#elif defined(__linux__)
GLFWmonitor* primary = glfwGetPrimaryMonitor();
float xscale = 1.0f;
float yscale = 1.0f;
glfwGetMonitorContentScale(primary, &xscale, &yscale);
dpiScale_ = xscale;
#endif

return true;
Expand Down
1 change: 1 addition & 0 deletions Dev/Cpp/EffekseerMaterialCompiler/GLSLGenerator/ShaderGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "../Common/ShaderGeneratorCommon.h"

#include <iostream>
#include <algorithm>
#undef min
#undef max

Expand Down
1 change: 1 addition & 0 deletions Dev/Cpp/EffekseerMaterialCompiler/Metal/EffekseerMaterialCompilerMetal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "../Common/ShaderGeneratorCommon.h"

#include <iostream>
#include <algorithm>

namespace Effekseer
{
Expand Down
2 changes: 2 additions & 0 deletions Dev/clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rm --force release/*.pdb
rm --force release/Effekseer
2 changes: 1 addition & 1 deletion Tool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif()

project(Tools)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)

if(MSVC)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
Expand Down
4 changes: 3 additions & 1 deletion docs/Development/HowToBuild.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ Requirements
- g++
- [.Net6.0 SDK](https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu)

- libx11-dev libgl1-mesa-dev libxrandr-dev libxi-dev x11proto-xf86vidmode-dev libx11-xcb-dev xorg-dev libglu1-mesa-dev libpulse-dev libgtk-3-dev libopenal-dev python3-distutils zenity
- Required packages:
- Ubuntu: `libx11-dev libgl1-mesa-dev libxrandr-dev libxi-dev x11proto-xf86vidmode-dev libx11-xcb-dev xorg-dev libglu1-mesa-dev libpulse-dev libgtk-3-dev libopenal-dev python3-distutils zenity`
- Fedora 40: `gtk3-devel pulseaudio-libs-devel openal-soft-devel mesa-libGLU-devel libX11-devel libxcb-devel libXi-devel libXrandr-devel mesa-libGL-devel python3 dotnet zenity ninja-build`

Get code and resources
----------
Expand Down
Empty file modified release_tool.sh
100644 → 100755
View file
Open in desktop
Empty file.
Loading