OSDN Git Service

[Build][CMake] .
authorK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 3 Jan 2023 21:14:28 +0000 (06:14 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 3 Jan 2023 21:14:28 +0000 (06:14 +0900)
source/cmake/config.cmake
source/setup-scripts/additional_defines_llvm_generic.sh
source/src/qt/CMakeLists.txt

index a945eee..844c8f1 100644 (file)
@@ -552,13 +552,13 @@ function(ADD_VM VM_NAME EXE_NAME VMDEF)
        endif()
        if(USE_DEVICES_SHARED_LIB)
                set(BUNDLE_LIBS
-                       ${BUNDLE_LIBS}
                        CSPosd
                        CSPcommon_vm
                        CSPfmgen
                        CSPgui
                        CSPemu_utils
                        CSPavio
+                       ${BUNDLE_LIBS}
                )
        else()
                set(BUNDLE_LIBS
index 5f5f3fd..6b6a730 100644 (file)
@@ -72,3 +72,6 @@ if [ __x__"${BUILD_TYPE}" != __x__Debug ] ; then
        fi
        EXE_LDOPTS+=(-fwhole-program-vtables)
 fi
+#EXE_LDOPTS+=(-Wl,--allow-shlib-undefined)
+
+
index 55782fc..20dae1a 100644 (file)
@@ -1,5 +1,5 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 8.9.0)
+SET(THIS_LIB_VERSION 8.9.1)
 
 set(s_qt_osd_headers
        osd_base.h