Change the way studio is linked
This commit is contained in:
parent
be9655c0b1
commit
d7a1d19fdf
@ -10,7 +10,7 @@ RUN dnf install -y qt5-devel llvm libasan
|
||||
|
||||
RUN git clone https://github.com/wombatant/ox.git /usr/local/src/ox && \
|
||||
cd /usr/local/src/ox && \
|
||||
git checkout -b install 7bce077ea81d7dbe10f7ba33eec0e061453f3f12
|
||||
git checkout -b install 796241cda614d232b09e571e625005562150a4fc
|
||||
|
||||
# setup build dirs
|
||||
RUN mkdir -p \
|
||||
|
@ -20,7 +20,7 @@ target_link_libraries(
|
||||
${OxStd_LIBRARY}
|
||||
NostalgiaCommon
|
||||
NostalgiaCore
|
||||
NostalgiaStudio
|
||||
NostalgiaStudioStatic
|
||||
NostalgiaStudioJson
|
||||
)
|
||||
|
||||
|
@ -6,16 +6,36 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
add_library(
|
||||
NostalgiaStudio
|
||||
SHARED
|
||||
NostalgiaStudioStatic
|
||||
newwizard.cpp
|
||||
project.cpp
|
||||
)
|
||||
|
||||
set_property(
|
||||
TARGET
|
||||
NostalgiaStudioStatic
|
||||
PROPERTY
|
||||
POSITION_INDEPENDENT_CODE ON
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaStudioStatic
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
${OxFS_LIBRARY}
|
||||
${OxStd_LIBRARY}
|
||||
)
|
||||
|
||||
add_library(
|
||||
NostalgiaStudio
|
||||
SHARED
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaStudio
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
NostalgiaStudioStatic
|
||||
${OxFS_LIBRARY}
|
||||
${OxStd_LIBRARY}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user