Merge branch 'main' into primedev-refactor/def-files

ASpoonPlaysGames · Dec 27, 2023 · 8e71fb6 · 8e71fb6
2 parents 8fd154f + f5ab6fb
commit 8e71fb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/primedev/Northstar.cmake b/primedev/Northstar.cmake
@@ -150,7 +150,7 @@ add_library(NorthstarDLL SHARED
             "util/wininfo.h"
             "dllmain.cpp"
             "ns_version.h"
-			"Northstar.def"
+            "Northstar.def"
 )
 
 target_link_libraries(NorthstarDLL PRIVATE

diff --git a/primedev/dllmain.h b/primedev/dllmain.h
@@ -0,0 +1,3 @@
+#pragma once
+
+extern "C" __declspec(dllexport) bool InitialiseNorthstar();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#pragma once

		extern "C" __declspec(dllexport) bool InitialiseNorthstar();