From c8ed9805a68b5d843ed78efcc9d14350dade1e1c Mon Sep 17 00:00:00 2001 From: N3xoX1 Date: Sat, 15 Feb 2025 10:56:42 +1030 Subject: [PATCH] Move tz and microprofile in to 3rd_party --- external/boost | 2 +- nxemu.sln | 4 ++-- {external => src/3rd_party}/microprofile/README.md | 0 {external => src/3rd_party}/microprofile/microprofile.h | 0 {external => src/3rd_party}/microprofile/microprofile_html.h | 0 {external => src/3rd_party}/microprofile/microprofileui.h | 0 {external => src/3rd_party}/tz/tz.cpp | 0 {external => src/3rd_party}/tz/tz.h | 0 {external => src/3rd_party/tz}/tz.vcxproj | 4 ++-- {external => src/3rd_party/tz}/tz.vcxproj.filters | 4 ++-- src/nxemu-os/nxemu-os.vcxproj | 3 --- 11 files changed, 7 insertions(+), 10 deletions(-) rename {external => src/3rd_party}/microprofile/README.md (100%) rename {external => src/3rd_party}/microprofile/microprofile.h (100%) rename {external => src/3rd_party}/microprofile/microprofile_html.h (100%) rename {external => src/3rd_party}/microprofile/microprofileui.h (100%) rename {external => src/3rd_party}/tz/tz.cpp (100%) rename {external => src/3rd_party}/tz/tz.h (100%) rename {external => src/3rd_party/tz}/tz.vcxproj (93%) rename {external => src/3rd_party/tz}/tz.vcxproj.filters (92%) diff --git a/external/boost b/external/boost index f7341dc1..1edb25b1 160000 --- a/external/boost +++ b/external/boost @@ -1 +1 @@ -Subproject commit f7341dc1ee75ecd87d69c09d95c5dbc32c8b5a43 +Subproject commit 1edb25b11216d702f00c667000a4a83f2c3a79cd diff --git a/nxemu.sln b/nxemu.sln index 228d8d85..399dbdd6 100644 --- a/nxemu.sln +++ b/nxemu.sln @@ -50,7 +50,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl", "external\sdl.vcxproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb", "external\libusb.vcxproj", "{82A8D930-2514-48FA-B811-E5C402F2AB4A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tz", "external\tz.vcxproj", "{677CA72D-E9B7-4AA5-ADBA-1C02AC84F8B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tz", "src\3rd_party\tz\tz.vcxproj", "{677CA72D-E9B7-4AA5-ADBA-1C02AC84F8B0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -125,7 +125,7 @@ Global {9DEC236B-F924-4166-A1B1-002F3BF8F0EC} = {29EE6611-75A5-4A1D-A994-33A5EBB4F765} {C44840A5-59BC-4CA0-85C2-B51F0BA6E3BD} = {29EE6611-75A5-4A1D-A994-33A5EBB4F765} {82A8D930-2514-48FA-B811-E5C402F2AB4A} = {29EE6611-75A5-4A1D-A994-33A5EBB4F765} - {677CA72D-E9B7-4AA5-ADBA-1C02AC84F8B0} = {29EE6611-75A5-4A1D-A994-33A5EBB4F765} + {677CA72D-E9B7-4AA5-ADBA-1C02AC84F8B0} = {F9F8A94D-341A-46BD-A4DA-13CC33489942} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF860836-279D-4187-9FAF-4E2D4B9C59CF} diff --git a/external/microprofile/README.md b/src/3rd_party/microprofile/README.md similarity index 100% rename from external/microprofile/README.md rename to src/3rd_party/microprofile/README.md diff --git a/external/microprofile/microprofile.h b/src/3rd_party/microprofile/microprofile.h similarity index 100% rename from external/microprofile/microprofile.h rename to src/3rd_party/microprofile/microprofile.h diff --git a/external/microprofile/microprofile_html.h b/src/3rd_party/microprofile/microprofile_html.h similarity index 100% rename from external/microprofile/microprofile_html.h rename to src/3rd_party/microprofile/microprofile_html.h diff --git a/external/microprofile/microprofileui.h b/src/3rd_party/microprofile/microprofileui.h similarity index 100% rename from external/microprofile/microprofileui.h rename to src/3rd_party/microprofile/microprofileui.h diff --git a/external/tz/tz.cpp b/src/3rd_party/tz/tz.cpp similarity index 100% rename from external/tz/tz.cpp rename to src/3rd_party/tz/tz.cpp diff --git a/external/tz/tz.h b/src/3rd_party/tz/tz.h similarity index 100% rename from external/tz/tz.h rename to src/3rd_party/tz/tz.h diff --git a/external/tz.vcxproj b/src/3rd_party/tz/tz.vcxproj similarity index 93% rename from external/tz.vcxproj rename to src/3rd_party/tz/tz.vcxproj index e7061c84..4eeea484 100644 --- a/external/tz.vcxproj +++ b/src/3rd_party/tz/tz.vcxproj @@ -29,9 +29,9 @@ - + - + \ No newline at end of file diff --git a/external/tz.vcxproj.filters b/src/3rd_party/tz/tz.vcxproj.filters similarity index 92% rename from external/tz.vcxproj.filters rename to src/3rd_party/tz/tz.vcxproj.filters index 0ea68d68..d6010039 100644 --- a/external/tz.vcxproj.filters +++ b/src/3rd_party/tz/tz.vcxproj.filters @@ -15,12 +15,12 @@ - + Source Files - + Header Files diff --git a/src/nxemu-os/nxemu-os.vcxproj b/src/nxemu-os/nxemu-os.vcxproj index 3198a81e..8ca25501 100644 --- a/src/nxemu-os/nxemu-os.vcxproj +++ b/src/nxemu-os/nxemu-os.vcxproj @@ -980,9 +980,6 @@ {c44840a5-59bc-4ca0-85c2-b51f0ba6e3bd} - - {677ca72d-e9b7-4aa5-adba-1c02ac84f8b0} -