drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

Change the way studio is linked

Browse Source
This commit is contained in:
Gary Talent 2017-05-02 18:31:39 -05:00
parent be9655c0b1
commit d7a1d19fdf
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -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 && \ RUN git clone https://github.com/wombatant/ox.git /usr/local/src/ox && \
cd /usr/local/src/ox && \ cd /usr/local/src/ox && \
git checkout -b install 7bce077ea81d7dbe10f7ba33eec0e061453f3f12 git checkout -b install 796241cda614d232b09e571e625005562150a4fc
# setup build dirs # setup build dirs
RUN mkdir -p \ RUN mkdir -p \

2
src/studio/CMakeLists.txt
View File

@ -20,7 +20,7 @@ target_link_libraries(
${OxStd_LIBRARY} ${OxStd_LIBRARY}
NostalgiaCommon NostalgiaCommon
NostalgiaCore NostalgiaCore
NostalgiaStudio NostalgiaStudioStatic
NostalgiaStudioJson NostalgiaStudioJson
) )

24
src/studio/lib/CMakeLists.txt
View File

@ -6,16 +6,36 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
add_library( add_library(
NostalgiaStudio NostalgiaStudioStatic
SHARED
newwizard.cpp newwizard.cpp
project.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( target_link_libraries(
NostalgiaStudio NostalgiaStudio
Qt5::Core Qt5::Core
Qt5::Widgets Qt5::Widgets
NostalgiaStudioStatic
${OxFS_LIBRARY} ${OxFS_LIBRARY}
${OxStd_LIBRARY} ${OxStd_LIBRARY}
) )