From c07ebd8728f89b0db621da6a2c512b33345df444 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 23 Jun 2024 01:34:30 +0200 Subject: Restructure primelauncher cmake logic (#727) Move primelauncher cmake logic into its subdirectory allowing everything related to it to be self contained --- primedev/CMakeLists.txt | 2 +- primedev/Launcher.cmake | 28 ---------------------------- primedev/primelauncher/CMakeLists.txt | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 primedev/Launcher.cmake create mode 100644 primedev/primelauncher/CMakeLists.txt (limited to 'primedev') diff --git a/primedev/CMakeLists.txt b/primedev/CMakeLists.txt index 31dda4b2..a33fd351 100644 --- a/primedev/CMakeLists.txt +++ b/primedev/CMakeLists.txt @@ -1,3 +1,3 @@ include(Northstar.cmake) -include(Launcher.cmake) +add_subdirectory(primelauncher) add_subdirectory(wsockproxy) diff --git a/primedev/Launcher.cmake b/primedev/Launcher.cmake deleted file mode 100644 index d23c7c4b..00000000 --- a/primedev/Launcher.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# NorthstarLauncher - -add_executable(NorthstarLauncher "primelauncher/main.cpp" "primelauncher/resources.rc") - -target_compile_definitions(NorthstarLauncher PRIVATE UNICODE _UNICODE) - -target_link_libraries( - NorthstarLauncher - PRIVATE shlwapi.lib - kernel32.lib - user32.lib - gdi32.lib - winspool.lib - comdlg32.lib - advapi32.lib - shell32.lib - ole32.lib - oleaut32.lib - uuid.lib - odbc32.lib - odbccp32.lib - ws2_32.lib - ) - -set_target_properties( - NorthstarLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR} LINK_FLAGS - "/MANIFEST:NO /DEBUG /STACK:8000000" - ) diff --git a/primedev/primelauncher/CMakeLists.txt b/primedev/primelauncher/CMakeLists.txt new file mode 100644 index 00000000..f36781a9 --- /dev/null +++ b/primedev/primelauncher/CMakeLists.txt @@ -0,0 +1,28 @@ +# NorthstarLauncher + +add_executable(NorthstarLauncher "main.cpp" "resources.rc") + +target_compile_definitions(NorthstarLauncher PRIVATE UNICODE _UNICODE) + +target_link_libraries( + NorthstarLauncher + PRIVATE shlwapi.lib + kernel32.lib + user32.lib + gdi32.lib + winspool.lib + comdlg32.lib + advapi32.lib + shell32.lib + ole32.lib + oleaut32.lib + uuid.lib + odbc32.lib + odbccp32.lib + ws2_32.lib + ) + +set_target_properties( + NorthstarLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR} LINK_FLAGS + "/MANIFEST:NO /DEBUG /STACK:8000000" + ) -- cgit v1.2.3