disable static building for now (causing more headaches than it should)

update keys.json with new info
This commit is contained in:
Neo 2023-06-02 07:09:40 -07:00
parent 19cce11bc2
commit 6b85db12c9
2 changed files with 10 additions and 8 deletions

View File

@ -2,7 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
PROJECT(WindowsXPKg) PROJECT(WindowsXPKg)
SET(CMAKE_CXX_STANDARD 17) 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) FIND_PACKAGE(OpenSSL REQUIRED)
IF(!OPENSSL_FOUND) IF(!OPENSSL_FOUND)
@ -20,8 +21,8 @@ CPMAddPackage(
CONFIGURE_FILE(keys.json keys.json COPYONLY) CONFIGURE_FILE(keys.json keys.json COPYONLY)
SET(BUILD_SHARED_LIBS OFF) #SET(BUILD_SHARED_LIBS OFF)
SET(CMAKE_EXE_LINKER_FLAGS "-static") #SET(CMAKE_EXE_LINKER_FLAGS "-static")
ADD_EXECUTABLE(xpkey src/main.cpp src/xp.cpp src/key.cpp src/util.cpp src/cli.cpp) 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_INCLUDE_DIRECTORIES(xpkey PUBLIC crypto)
TARGET_LINK_LIBRARIES(xpkey PUBLIC OpenSSL::Crypto nlohmann_json::nlohmann_json) TARGET_LINK_LIBRARIES(xpkey PUBLIC OpenSSL::Crypto nlohmann_json::nlohmann_json)

View File

@ -1,17 +1,18 @@
{ {
"Products": { "Products": {
"Windows 98 SE (OEM)": ["02","03"], "Windows 98": ["02","03"],
"Office 2000": ["04","05"], "Office 2000": ["04","05"],
"Windows Embedded POSReady 2009": ["0D", "0D"], "Windows Embedded POSReady 2009": ["0D", "0D"],
"Windows 2000 Retail": ["12","13"], "Windows 2000": ["12","13"],
"Windows ME Retail": ["1C","1D"], "Windows ME": ["1C","1D"],
"Windows XP Pro Retail": ["2C","2D"], "Windows XP Home": ["2A", "2B"],
"Windows XP Pro": ["2C","2D"],
"Windows XP Pro VLK": ["2E","2F"], "Windows XP Pro VLK": ["2E","2F"],
"Windows XP Starter Edition": ["32", "33"], "Windows XP Starter Edition": ["32", "33"],
"Halo: Combat Evolved": ["50","51"], "Halo: Combat Evolved": ["50","51"],
"Visual Studio 2005": ["52", "53"], "Visual Studio 2005": ["52", "53"],
"Windows XP Pro 64 Bit Edition VLK": ["64","65"], "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": { "BINK": {
"00": { "00": {