macos fixes

GrigoryGraborenko · Oct 3, 2024 · 829d3b6 · 829d3b6
1 parent ab7d46c
commit 829d3b6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-Examples/Empty_WebGPU_Jumbo/ProjectSettings.cmake
-Examples/Empty_WebGPU_QT_Jumbo/ProjectSettings.cmake
+ProjectSettings.cmake
+UserSettings.cmake
diff --git a/CMake/Jumbo.txt b/CMake/Jumbo.txt
@@ -92,6 +92,9 @@ if (APPLE)
     target_link_libraries(${PROJECT_NAME}
         ${SDL2_LIBRARY}
         SDL2_image::SDL2_image
+        "-framework Foundation"
+        "-framework IOKit"
+        "-framework Metal"
         "-framework QuartzCore"
         "-framework IOSurface"
     )
@@ -201,9 +204,9 @@ file(GLOB_RECURSE GeneratedList *.cxx *.hxx)
 
 # all files from neshny
 if (WEBGPU)
-    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.* ${NESHNY_DIR}/Src/WebGPU/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.wgsl)
+    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.h ${NESHNY_DIR}/Src/*.cpp ${NESHNY_DIR}/Src/WebGPU/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.wgsl)
 else()
-    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.* ${NESHNY_DIR}/Src/OpenGL/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.*)
+    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.h ${NESHNY_DIR}/Src/*.cpp ${NESHNY_DIR}/Src/OpenGL/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.*)
 endif()
 
 list(APPEND FullList ${HeaderList} ${SourceList} ${ShaderList})

diff --git a/Examples/Empty_WebGPU_Jumbo/src/main.cpp b/Examples/Empty_WebGPU_Jumbo/src/main.cpp
@@ -19,6 +19,10 @@ using namespace Neshny;
 
 int main(int, char**) {
 
+#ifdef __APPLE__
+	std::filesystem::current_path(GetMacOSExecutableDir());
+#endif
+
 	Core::Singleton().SetResourceDirs(g_ShaderBaseDirs);
 #if !defined _DEBUG || defined __EMSCRIPTEN__
 	Core::Singleton().SetEmbeddedFiles(g_EmbeddedFiles);

diff --git a/Src/NeshnyUtils.cpp b/Src/NeshnyUtils.cpp
@@ -134,4 +134,20 @@ void ImGuiTextColoredUnformatted(std::string str, ImVec4 text_col) {
     ImGui::PopStyleColor();
 }
 
+#ifdef __APPLE__
+////////////////////////////////////////////////////////////////////////////////
+std::string GetMacOSExecutableDir() {
+	char path[1024];
+	uint32_t size = sizeof(path);
+	if (_NSGetExecutablePath(path, &size) != 0)
+		return "";
+	std::string result(path, size);
+	auto end_slash = result.find_last_of('/');
+	if (end_slash == std::string::npos) {
+		return result;
+	}
+	return std::string(path, end_slash);
+}
+#endif
+
 } // namespace Neshny
diff --git a/Src/NeshnyUtils.h b/Src/NeshnyUtils.h
@@ -1,6 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
+#ifdef __APPLE__
+	#include <mach-o/dyld.h>
+#endif
 namespace Neshny {
 
 #define STRING2(x) #x
@@ -61,6 +64,9 @@ std::string JoinStrings(const std::list<std::string>& list, std::string_view ins
 bool StringContains(std::string_view str, std::string_view search, bool case_insensitive = false);
 std::string SrcStr(const std::source_location location = std::source_location::current());
 void ImGuiTextColoredUnformatted(std::string str, ImVec4 text_col);
+#ifdef __APPLE__
+	std::string GetMacOSExecutableDir();
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 template <class T>