diff options
| author | Aki <please@ignore.pl> | 2021-10-01 18:49:07 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-01 18:49:07 +0200 |
| commit | 01bd9be930937561e1226417328137ea104a89e2 (patch) | |
| tree | 7395c9687122cd08e7807a6fb9b71947fc1ae2c0 | |
| parent | bd75249c8a45163b776ad0ce5e7b5dc97827c1da (diff) | |
| download | starshatter-01bd9be930937561e1226417328137ea104a89e2.zip starshatter-01bd9be930937561e1226417328137ea104a89e2.tar.gz starshatter-01bd9be930937561e1226417328137ea104a89e2.tar.bz2 | |
Partially fixed Magic2 build
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Magic2/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | Stars45/CMakeLists.txt | 5 |
3 files changed, 16 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d9da28..d4f5977 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(Starshatter) +set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86") +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) diff --git a/Magic2/CMakeLists.txt b/Magic2/CMakeLists.txt index 298ccb3..9901c4f 100644 --- a/Magic2/CMakeLists.txt +++ b/Magic2/CMakeLists.txt @@ -1,6 +1,7 @@ project(Magic2) +set(CMAKE_MFC_FLAG 1) add_executable( - Magic2 + Magic2 WIN32 AlphaInverse.cpp AlphaPalette.cpp Command.cpp @@ -33,11 +34,19 @@ add_executable( ) target_include_directories( Magic2 - PRIVATE . + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC $ENV{DXSDK_DIR}/Include + PUBLIC ${WINDOWSSDK_PATH} # FIXME + ) +target_precompile_headers( + Magic2 + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ) target_link_libraries( Magic2 PUBLIC FoundationEx - PUBLIC nGenEx - # TODO: PUBLIC? DirectX9 + ) +target_compile_definitions( + Magic2 + PRIVATE _AFXDLL ) diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index d80842b..be5c744 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -1,6 +1,6 @@ project(Stars45) add_executable( - Stars45 + Stars45 WIN32 ActiveWindow.cpp Archive.cpp Asteroid.cpp @@ -276,9 +276,6 @@ add_executable( WepView.cpp Window.cpp ) -set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86") -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") -set_target_properties(Stars45 PROPERTIES WIN32_EXECUTABLE Yes) target_include_directories( Stars45 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} |