From f9bc90d009d7c96d97e4bfa7a5679e01dddd5dfd Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 28 Sep 2021 21:51:34 +0200 Subject: Created best-guess cmake stubs Structure of the project as whole is... questionable. It looks that the directories are intermingled even if they appear separated. This is a first guess to have at least something in place. --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 CMakeLists.txt (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..aa56f7f --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.21) +project(Starshatter) +add_subdirectory(Datafile) +# /DirectX contains only pre-compiled third-party library (and looks like a workaround). +# /Doc contains various documentation and pre-generated Doxygen docs. +add_subdirectory(FoundationEx) +# add_subdirectory(libpng) # is a third-party library. +add_subdirectory(Magic2) +add_subdirectory(NetEx) +add_subdirectory(nGenEx) +# /oggvorbis contains only pre-compiled third-party library. +# add_subdirectory(Opcode) # is a third-party library. +# /Parser looks unused. +add_subdirectory(Stars45) +# /Starshatter contains VS-related files. +# add_subdirectory(zlib) # is a third-party library. -- cgit v1.1 From 38f6ab06a3bde13f0837c89d3eabfa30ef8faabf Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 28 Sep 2021 22:38:50 +0200 Subject: Downgraded required cmake by minor release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index aa56f7f..1d166fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21) +cmake_minimum_required(VERSION 3.20) project(Starshatter) add_subdirectory(Datafile) # /DirectX contains only pre-compiled third-party library (and looks like a workaround). -- cgit v1.1 From 252409240827e63b47c492d12718c4514c72ae02 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 29 Sep 2021 22:33:32 +0200 Subject: Enabled zlib and libpng in cmake root --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d166fd..b2e4025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(Datafile) # /DirectX contains only pre-compiled third-party library (and looks like a workaround). # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) -# add_subdirectory(libpng) # is a third-party library. +add_subdirectory(libpng) # is a third-party library. add_subdirectory(Magic2) add_subdirectory(NetEx) add_subdirectory(nGenEx) @@ -13,4 +13,4 @@ add_subdirectory(nGenEx) # /Parser looks unused. add_subdirectory(Stars45) # /Starshatter contains VS-related files. -# add_subdirectory(zlib) # is a third-party library. +add_subdirectory(zlib) # is a third-party library. -- cgit v1.1 From a0c941cf39c527c6610e43fb249d4ae777cd309a Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 29 Sep 2021 22:54:28 +0200 Subject: Enabled ogg and vorbis builds --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b2e4025..05fe0f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,10 @@ add_subdirectory(libpng) # is a third-party library. add_subdirectory(Magic2) add_subdirectory(NetEx) add_subdirectory(nGenEx) -# /oggvorbis contains only pre-compiled third-party library. +add_subdirectory(ogg) # is a third-party library. # add_subdirectory(Opcode) # is a third-party library. # /Parser looks unused. add_subdirectory(Stars45) # /Starshatter contains VS-related files. +add_subdirectory(vorbis) # is a third-party library. add_subdirectory(zlib) # is a third-party library. -- cgit v1.1 From 5e2e129e61020c18e6579c3a4496b15915bdfd9a Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 29 Sep 2021 22:58:07 +0200 Subject: Added Parser dir to cmake tree --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 05fe0f5..8cf8eda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ add_subdirectory(NetEx) add_subdirectory(nGenEx) add_subdirectory(ogg) # is a third-party library. # add_subdirectory(Opcode) # is a third-party library. -# /Parser looks unused. +add_subdirectory(Parser) add_subdirectory(Stars45) # /Starshatter contains VS-related files. add_subdirectory(vorbis) # is a third-party library. -- cgit v1.1 From adb8f1fcf0172c4c4299703efea1d0744d03b5e7 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 10:48:15 +0200 Subject: Added Opcode to cmake tree --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cf8eda..7e90c88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(Magic2) add_subdirectory(NetEx) add_subdirectory(nGenEx) add_subdirectory(ogg) # is a third-party library. -# add_subdirectory(Opcode) # is a third-party library. +add_subdirectory(Opcode) # is a third-party library. add_subdirectory(Parser) add_subdirectory(Stars45) # /Starshatter contains VS-related files. -- cgit v1.1 From c9b298cf8da03e6a9825eade5b764b0ed4804dc1 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 13:31:47 +0200 Subject: Removed notes regarding removed directx and starshatter directories --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e90c88..fbed4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.20) project(Starshatter) add_subdirectory(Datafile) -# /DirectX contains only pre-compiled third-party library (and looks like a workaround). # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) add_subdirectory(libpng) # is a third-party library. @@ -12,6 +11,5 @@ add_subdirectory(ogg) # is a third-party library. add_subdirectory(Opcode) # is a third-party library. add_subdirectory(Parser) add_subdirectory(Stars45) -# /Starshatter contains VS-related files. add_subdirectory(vorbis) # is a third-party library. add_subdirectory(zlib) # is a third-party library. -- cgit v1.1 From 966fe28c59f59fc8be795c8215b9352435982445 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 16:46:36 +0200 Subject: Merged nGenEx and Parser into Stars45 --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fbed4ca..7d9da28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,8 @@ add_subdirectory(FoundationEx) add_subdirectory(libpng) # is a third-party library. add_subdirectory(Magic2) add_subdirectory(NetEx) -add_subdirectory(nGenEx) add_subdirectory(ogg) # is a third-party library. add_subdirectory(Opcode) # is a third-party library. -add_subdirectory(Parser) add_subdirectory(Stars45) add_subdirectory(vorbis) # is a third-party library. add_subdirectory(zlib) # is a third-party library. -- cgit v1.1 From 01bd9be930937561e1226417328137ea104a89e2 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 18:49:07 +0200 Subject: Partially fixed Magic2 build --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') 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) -- cgit v1.1 From 07f08477e85ab37957fddc4714d4706f13b2357a Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 18:50:49 +0200 Subject: Disabled Magic2 build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d4f5977..9e2805e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) add_subdirectory(libpng) # is a third-party library. -add_subdirectory(Magic2) +# add_subdirectory(Magic2) # TODO: AFX/MFC will be useless, port it to e.g., Qt right away. add_subdirectory(NetEx) add_subdirectory(ogg) # is a third-party library. add_subdirectory(Opcode) # is a third-party library. -- cgit v1.1 From c2d2c3551501110fddd78674d5435bfaa70382a3 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 20:21:32 +0200 Subject: Windows SDK variables are now cached to ease configuration --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e2805e..1387ab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +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") +set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86" CACHE FILEPATH "Path to Windows SDK libraries") +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um" CACHE FILEPATH "Path to Windows SDK header files") add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) -- cgit v1.1