diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-05 08:22:32 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-05 08:22:32 +0800 |
| commit | a160ac9d8531f1702ad60a196d0d1914a0f683b9 (patch) | |
| tree | eeff95ea3ee7a84918767d831c799be53ba7163b | |
| parent | 1562dff7b21610c8a2114f946d73b33ce4db56ee (diff) | |
Get colladadom 2.3 build method to work on Fedora
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | patches/collada-dom-v2.3-r7.patch | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -73,7 +73,7 @@ $ megapahit ### Fedora ``` -$ sudo dnf install cmake gcc-c++ patchelf apr-util-devel boost-devel collada-dom-devel expat-devel fltk-devel mesa-libGLU-devel hunspell-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xmlrpc-epi-devel xxhash-devel +$ sudo dnf install cmake gcc-c++ patchelf apr-util-devel boost-devel collada-dom-devel expat-devel fltk-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xmlrpc-epi-devel xxhash-devel $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1" $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=OFF -DUSE_FMODSTUDIO:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON ../indra $ make -j`nproc` diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index a8d2687f8c..dc603d8af4 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -57,7 +57,7 @@ index 17fbaea..93b8256 100644 -add_library(collada14dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files}) +add_library(collada14dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files}) +target_compile_options(collada14dom PRIVATE -+ "-Wno-error=unused-result" ++ "-Wno-error=unused-result" "-Wno-cast-user-defined" +) +target_include_directories(collada14dom PRIVATE + ${colladadom_SOURCE_DIR}/include |