From ee7f06efa58c3bd7b3a2a3e96ca5824f76977ea9 Mon Sep 17 00:00:00 2001
From: Karutoh <NelsonArron@outlook.com>
Date: Mon, 1 Jul 2024 19:39:05 -0700
Subject: [PATCH] Caught up with updates.

---
 .idea/misc.xml  |  3 +++
 CMakeLists.txt  | 53 +++++++++++++++++++++++++++++++++++++++++++------
 Levels/Game.cpp |  2 +-
 Main.cpp        |  5 ++++-
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c2cdd87..96620d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CMakePythonSetting">
+    <option name="pythonIntegrationState" value="YES" />
+  </component>
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
   <component name="DiscordProjectSettings">
     <option name="show" value="ASK" />
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1408d50..211b19e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,15 +33,56 @@ add_executable(Pong
     Main.cpp
 )
 
+find_package(ZLIB REQUIRED)
+if (ZLIB_FOUND)
+    message(STATUS "ZLIB was found.")
+else ()
+    message(STATUS "ZLIB was not found.")
+endif ()
+
+find_package(OpenSSL REQUIRED)
+if (OpenSSL_FOUND)
+    message(STATUS "OpenSSL was found.")
+else ()
+    message(STATUS "OpenSSL was not found.")
+endif ()
+
 if (IS_OS_WINDOWS)
     add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR)
+
+    target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHS/include)
+    target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHE/include)
+    target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/EHC/include)
+    target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/LWE/include)
+    target_include_directories(Pong PUBLIC $ENV{VULKAN_SDK}/include)
+
+    message("VK Include Path: $ENV{VULKAN_SDK}/include")
+
+    target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHS/lib")
+    target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHE/lib")
+    target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/EHC/lib")
+    target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/LWE/lib")
+    target_link_directories(Pong PUBLIC $ENV{VULKAN_SDK}/lib)
+
+    target_link_libraries(Pong PUBLIC vulkan-1 ws2_32 avrt)
+
+    set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/LWE")
 elseif (IS_OS_LINUX)
     add_compile_definitions(VK_USE_PLATFORM_XCB_KHR EHS_WS_XCB)
+
+    find_package(Vulkan REQUIRED)
+    if (Vulkan_FOUND)
+        message(STATUS "Vulkan was found.")
+    else ()
+        message(STATUS "Vulkan was not found.")
+    endif ()
+
+    target_include_directories(Pong PUBLIC ${USER_HOME_DIRECTORY}/.local/include)
+
+    target_link_directories(Pong PUBLIC "${USER_HOME_DIRECTORY}/.local/lib")
+
+    target_link_libraries(Pong PUBLIC Vulkan::Headers)
+    target_link_libraries(Pong xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound Vulkan::Headers Vulkan::Vulkan)
 endif()
 
-target_link_directories(Pong PRIVATE "${USER_HOME_DIRECTORY}/.local/lib")
-target_include_directories(Pong PRIVATE "${USER_HOME_DIRECTORY}/.local/include")
-
-find_package(Vulkan REQUIRED)
-
-target_link_libraries(Pong PRIVATE Vulkan::Headers Vulkan::Vulkan xcb xcb-cursor xcb-xfixes xcb-xinput LWE EHC EHE EHS z asound)
\ No newline at end of file
+target_link_libraries(Pong PRIVATE LWE EHC EHE EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
\ No newline at end of file
diff --git a/Levels/Game.cpp b/Levels/Game.cpp
index 841f828..191e4f4 100644
--- a/Levels/Game.cpp
+++ b/Levels/Game.cpp
@@ -76,7 +76,7 @@ void Game::Setup(lwe::GpuInterface *inf)
 	lwe::RenderWindow* win = gl->GetWindow();
 
 	// Adding Systems Here
-	//AddSystem(new lwe::AudioSystem());
+	AddSystem(new lwe::AudioSystem());
 	AddSystem(new lwe::Portrait2DSystem());
 	AddSystem(new lwe::RigidBodySystem());
 
diff --git a/Main.cpp b/Main.cpp
index 9f6a154..a6a6315 100644
--- a/Main.cpp
+++ b/Main.cpp
@@ -13,6 +13,8 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
 	*appVerId = "Release";
 	*appVer = {1, 0, 0};
 
+	ehs::Log::EnableImmediateMode(true);
+
 	ehs::Console::Attach();
 
 	#if defined(EHS_OS_WINDOWS)
@@ -23,7 +25,7 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
 
 	lwe::GpuInstance::AddExtension(VK_KHR_SURFACE_EXTENSION_NAME);
 
-	lwe::GpuInstance::Initialize(true);
+	lwe::GpuInstance::Initialize(false);
 
 	lwe::GpuDevice primary = lwe::GpuDevice::GetBest();
 
@@ -38,6 +40,7 @@ ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVe
 
 	lwe::RenderWindow win(&inf, &queue);
 	win.Create_8(*appName, {0, 0}, {1024, 768});
+	win.Show();
 
 	lwe::GameLoop gl(&win, 6, 0);
 	gl.AddLevel(new Game());