aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack <66967891+ASpoonPlaysGames@users.noreply.github.com>2024-01-03 23:32:20 +0000
committerGitHub <noreply@github.com>2024-01-04 00:32:20 +0100
commitdcf6e1b1fd93d3afa7e0c5869c16d9760a3b4ece (patch)
tree8da0099a9e9d2253bf164224cc4374adafadca08
parenteda88bd1707aa1f736cec41b61ed73aa15585271 (diff)
downloadNorthstarLauncher-dcf6e1b1fd93d3afa7e0c5869c16d9760a3b4ece.tar.gz
NorthstarLauncher-dcf6e1b1fd93d3afa7e0c5869c16d9760a3b4ece.zip
Use .def for function exports (#625)v1.21.4-rc1v1.21.4
Cherry-picked from primedev Co-authored-by: F1F7Y <filip.bartos07@proton.me>
-rw-r--r--primedev/Northstar.cmake2
-rw-r--r--primedev/Northstar.def4
-rw-r--r--primedev/dllmain.cpp1
-rw-r--r--primedev/dllmain.h3
4 files changed, 5 insertions, 5 deletions
diff --git a/primedev/Northstar.cmake b/primedev/Northstar.cmake
index 50b6adfd..433326c2 100644
--- a/primedev/Northstar.cmake
+++ b/primedev/Northstar.cmake
@@ -150,8 +150,8 @@ add_library(
"util/wininfo.cpp"
"util/wininfo.h"
"dllmain.cpp"
- "dllmain.h"
"ns_version.h"
+ "Northstar.def"
)
target_link_libraries(
diff --git a/primedev/Northstar.def b/primedev/Northstar.def
new file mode 100644
index 00000000..4e3c5318
--- /dev/null
+++ b/primedev/Northstar.def
@@ -0,0 +1,4 @@
+LIBRARY dedicated
+
+EXPORTS
+ InitialiseNorthstar @1
diff --git a/primedev/dllmain.cpp b/primedev/dllmain.cpp
index 3d9bdc97..a656dac7 100644
--- a/primedev/dllmain.cpp
+++ b/primedev/dllmain.cpp
@@ -1,4 +1,3 @@
-#include "dllmain.h"
#include "logging/logging.h"
#include "logging/crashhandler.h"
#include "core/memalloc.h"
diff --git a/primedev/dllmain.h b/primedev/dllmain.h
deleted file mode 100644
index 0debf379..00000000
--- a/primedev/dllmain.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-extern "C" __declspec(dllexport) bool InitialiseNorthstar();