WIP Correcting library build dependencies

CMakeLists.txt

@@ -59,7 +59,21 @@ ENDIF (APPLE)
 
 add_subdirectory(kraken)
 
-add_library(kraken STATIC ${SRCS} ${KRAKEN_PUBLIC_HEADERS})
+add_public_header(hydra/include/aabb.h)
+add_public_header(hydra/include/hitinfo.h)
+add_public_header(hydra/include/hydra.h)
+add_public_header(hydra/include/matrix2.h)
+add_public_header(hydra/include/matrix2x3.h)
+add_public_header(hydra/include/matrix4.h)
+add_public_header(hydra/include/quaternion.h)
+add_public_header(hydra/include/scalar.h)
+add_public_header(hydra/include/triangle3.h)
+add_public_header(hydra/include/vector2.h)
+add_public_header(hydra/include/vector3.h)
+add_public_header(hydra/include/vector4.h)
+add_public_header(hydra/include/vector2i.h)
+
+add_library(kraken SHARED ${SRCS} ${KRAKEN_PUBLIC_HEADERS})
 
 set(Boost_USE_STATIC_LIBS        ON) # only find static libs
 set(Boost_USE_MULTITHREADED      ON)
@@ -75,13 +89,14 @@ add_subdirectory(hydra)
 include_directories(hydra/include)
 target_link_libraries(kraken hydra)
 
+
 # ---- OpenGL ----
 find_package(OpenGL REQUIRED)
 include_directories( ${OPENGL_INCLUDE_DIRS} )
 target_link_libraries(kraken ${OPENGL_LIBRARIES})
 
 # ---- GLAD ----
-set(GLAD_EXTENSIONS "GL_EXT_texture_filter_anisotropic, GL_EXT_texture_compression_s3tc, GL_S3_s3tc")
+set(GLAD_EXTENSIONS "GL_EXT_texture_filter_anisotropic,GL_EXT_texture_compression_s3tc, GL_S3_s3tc" CACHE STRING "Gl exts" FORCE)
 add_subdirectory(3rdparty/glad)
 include_directories(${GLAD_INCLUDE_DIRS})
 target_link_libraries(kraken glad)
@@ -105,10 +120,21 @@ PROPERTIES
   PUBLIC_HEADER "${KRAKEN_PUBLIC_HEADERS}"
   PRIVATE_HEADER "${PRIVATE_HEADER_FILES}"
   ARCHIVE_OUTPUT_DIRECTORY "archive"
-  LIBRARY_OUTPUT_DIRECTORY "lib"
+  LIBRARY_OUTPUT_DIRECTORY "lib${LIB_SUFFIX}"
   OUTPUT_NAME kraken
 )
 
+# install(TARGETS kraken DESTINATION ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+# install(FILES ${KRAKEN_PUBLIC_HEADERS} DESTINATION ${PROJECT_BINARY_DIR}/include)
+
+# INSTALL(TARGETS kraken 
+#        LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+#        ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+#        PUBLIC_HEADER DESTINATION "include"
+# )
+
+
+
 # add_custom_target(package
 #   COMMENT "Compressing..."
 #   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/archive"

kraken/CMakeLists.txt

@@ -21,9 +21,10 @@ add_sources(KRBundleManager.cpp)
 add_sources(KRCamera.cpp)
 add_sources(KRCollider.cpp)
 add_sources(KRContext.cpp)
+add_sources(KRStreamer.cpp)
 IF(APPLE)
   add_sources(KREngine.mm)
-  add_sources(KRStreamer.mm)
+  
   IF(IOS)
     add_sources(KRContext_ios.mm)
   ELSE()
@@ -55,7 +56,7 @@ add_sources(KRNode.cpp)
 add_sources(KROctree.cpp)
 add_sources(KROctreeNode.cpp)
 add_sources(KRParticleSystem.cpp)
-add_sources(KRParticleSystemNewtonian.h)
+add_sources(KRParticleSystemNewtonian.cpp)
 add_sources(KRPointLight.cpp)
 add_sources(KRRenderSettings.cpp)
 add_sources(KRResource+blend.cpp)
@@ -64,6 +65,7 @@ add_sources(KRResource+obj.cpp)
 add_sources(KRResource.cpp)
 add_sources(KRReverbZone.cpp)
 add_sources(KRScene.cpp)
+add_sources(KRSceneManager.cpp)
 add_sources(KRShader.cpp)
 add_sources(KRShaderManager.cpp)
 add_sources(KRSpotLight.cpp)
@@ -79,3 +81,5 @@ add_sources(KRTextureTGA.cpp)
 add_sources(KRUnknown.cpp)
 add_sources(KRUnknownManager.cpp)
 add_sources(KRViewport.cpp)
+add_sources(../3rdparty/tinyxml2/tinyxml2.cpp)
+add_sources(../3rdparty/forsyth/forsyth.cpp)

kraken/KRParticleSystemNewtonian.cpp

@@ -41,7 +41,7 @@ tinyxml2::XMLElement *KRParticleSystemNewtonian::saveXML( tinyxml2::XMLNode *par
 
 AABB KRParticleSystemNewtonian::getBounds()
 {
-    return AABB(-Vector3::One(), Vector3::One(), getModelMatrix());
+    return AABB::Create(-Vector3::One(), Vector3::One(), getModelMatrix());
 }
 
 void KRParticleSystemNewtonian::physicsUpdate(float deltaTime)

kraken/KRStreamer.cpp

@@ -41,7 +41,12 @@ KRStreamer::~KRStreamer()
 
 void KRStreamer::run()
 {
+
+#if defined(_WIN32) || defined(_WIN64)
+    // TODO - Set thread names on windows
+#else
    pthread_setname_np("Kraken - Streamer");
+#endif
 
     std::chrono::microseconds sleep_duration( 15000 );