From 6b85db12c9417b07a1d78272fac178ce7eaa10b2 Mon Sep 17 00:00:00 2001
From: Neo <321592+Neo-Desktop@users.noreply.github.com>
Date: Fri, 2 Jun 2023 07:09:40 -0700
Subject: [PATCH] disable static building for now (causing more headaches than
 it should) update keys.json with new info

---
 CMakeLists.txt |  7 ++++---
 keys.json      | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d9df2c..d600916 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
 PROJECT(WindowsXPKg)
 SET(CMAKE_CXX_STANDARD 17)
 
-SET(OPENSSL_USE_STATIC_LIBS TRUE)
+# TODO: commenting out static builds for now
+#SET(OPENSSL_USE_STATIC_LIBS TRUE)
 FIND_PACKAGE(OpenSSL REQUIRED)
 
 IF(!OPENSSL_FOUND)
@@ -20,8 +21,8 @@ CPMAddPackage(
 
 CONFIGURE_FILE(keys.json keys.json COPYONLY)
 
-SET(BUILD_SHARED_LIBS OFF)
-SET(CMAKE_EXE_LINKER_FLAGS "-static")
+#SET(BUILD_SHARED_LIBS OFF)
+#SET(CMAKE_EXE_LINKER_FLAGS "-static")
 ADD_EXECUTABLE(xpkey src/main.cpp src/xp.cpp src/key.cpp src/util.cpp src/cli.cpp)
 TARGET_INCLUDE_DIRECTORIES(xpkey PUBLIC crypto)
 TARGET_LINK_LIBRARIES(xpkey PUBLIC OpenSSL::Crypto nlohmann_json::nlohmann_json)
diff --git a/keys.json b/keys.json
index 4980617..c44746b 100644
--- a/keys.json
+++ b/keys.json
@@ -1,17 +1,18 @@
 {
   "Products": {
-    "Windows 98 SE (OEM)": ["02","03"],
+    "Windows 98": ["02","03"],
     "Office 2000": ["04","05"],
     "Windows Embedded POSReady 2009": ["0D", "0D"],
-    "Windows 2000 Retail": ["12","13"],
-    "Windows ME Retail": ["1C","1D"],
-    "Windows XP Pro Retail": ["2C","2D"],
+    "Windows 2000": ["12","13"],
+    "Windows ME": ["1C","1D"],
+    "Windows XP Home": ["2A", "2B"],
+    "Windows XP Pro": ["2C","2D"],
     "Windows XP Pro VLK": ["2E","2F"],
     "Windows XP Starter Edition": ["32", "33"],
     "Halo: Combat Evolved": ["50","51"],
     "Visual Studio 2005": ["52", "53"],
     "Windows XP Pro 64 Bit Edition VLK": ["64","65"],
-    "Windows XP Pro 64 Bit Edition Retail": ["66","67"]
+    "Windows XP Pro 64 Bit Edition": ["66","67"]
   },
   "BINK": {
     "00": {