From d7a1d19fdf8e26ecba73c7a5bec15528a22cfe93 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Tue, 2 May 2017 18:31:39 -0500
Subject: [PATCH] Change the way studio is linked

---
 Dockerfile                    |  2 +-
 src/studio/CMakeLists.txt     |  2 +-
 src/studio/lib/CMakeLists.txt | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abdc7eee..c7ff06d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 \
diff --git a/src/studio/CMakeLists.txt b/src/studio/CMakeLists.txt
index 0e871afe..8fa29598 100644
--- a/src/studio/CMakeLists.txt
+++ b/src/studio/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_libraries(
 		${OxStd_LIBRARY}
 		NostalgiaCommon
 		NostalgiaCore
-		NostalgiaStudio
+		NostalgiaStudioStatic
 		NostalgiaStudioJson
 )
 
diff --git a/src/studio/lib/CMakeLists.txt b/src/studio/lib/CMakeLists.txt
index aa69c984..84163a56 100644
--- a/src/studio/lib/CMakeLists.txt
+++ b/src/studio/lib/CMakeLists.txt
@@ -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}
 )