Merge commit 'dc96270ca5e882e41f6b657be14a20e8bd2ad501'
All checks were successful
Build / build (push) Successful in 3m14s

This commit is contained in:
Gary Talent 2024-12-21 20:13:20 -06:00
commit bf5be00c12
29 changed files with 39 additions and 31 deletions

View File

@ -10,7 +10,11 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF) option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF)
endif() endif()
option(NFD_BUILD_TESTS "Build tests for nfd" ${nfd_ROOT_PROJECT}) option(NFD_BUILD_TESTS "Build tests for nfd" ${nfd_ROOT_PROJECT})
option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT}) # DrinkingTea: begin
if(NOT DEFINED NFD_INSTALL)
option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT})
endif()
# DrinkingTea: end
set(nfd_PLATFORM Undefined) set(nfd_PLATFORM Undefined)
if(WIN32) if(WIN32)
@ -21,7 +25,9 @@ elseif(UNIX AND NOT APPLE)
set(nfd_PLATFORM PLATFORM_UNIX) set(nfd_PLATFORM PLATFORM_UNIX)
endif() endif()
message("nfd Platform: ${nfd_PLATFORM}") # DrinkingTea: begin
#message("nfd Platform: ${nfd_PLATFORM}")
# DrinkingTea: end
set(nfd_COMPILER Undefined) set(nfd_COMPILER Undefined)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
@ -33,7 +39,9 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "C
set(nfd_COMPILER COMPILER_GNU) set(nfd_COMPILER COMPILER_GNU)
endif() endif()
message("nfd Compiler: ${nfd_COMPILER}") # DrinkingTea: begin
#message("nfd Compiler: ${nfd_COMPILER}")
# DrinkingTea: end
# Use latest C++ by default (should be the best one), but let user override it # Use latest C++ by default (should be the best one), but let user override it
if(NOT DEFINED CMAKE_CXX_STANDARD) if(NOT DEFINED CMAKE_CXX_STANDARD)

View File

@ -2,4 +2,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 4, "length" : 4,
"primitiveType" : 1, "primitiveType" : 1,
"typeName" : "B.int32" "typeName" : "B.int32"
} }

View File

@ -2,4 +2,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 1, "length" : 1,
"primitiveType" : 1, "primitiveType" : 1,
"typeName" : "B.int8" "typeName" : "B.int8"
} }

View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 4, "primitiveType" : 4,
"typeName" : "B.string" "typeName" : "B.string"
} }

View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 2, "length" : 2,
"typeName" : "B.uint16" "typeName" : "B.uint16"
} }

View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 8, "length" : 8,
"typeName" : "B.uint64" "typeName" : "B.uint64"
} }

View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.TypeDescriptor;1;{ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"length" : 1, "length" : 1,
"typeName" : "B.uint8" "typeName" : "B.uint8"
} }

View File

@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.CompactPalette", "typeName" : "net.drinkingtea.nostalgia.core.CompactPalette",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -25,4 +25,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.CompactTileSheet", "typeName" : "net.drinkingtea.nostalgia.core.CompactTileSheet",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -36,4 +36,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic", "typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -9,4 +9,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo", "typeName" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo",
"typeVersion" : 3 "typeVersion" : 3
} }

View File

@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette.PalettePage", "typeName" : "net.drinkingtea.nostalgia.core.Palette.PalettePage",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -16,4 +16,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 2 "typeVersion" : 2
} }

View File

@ -31,4 +31,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 3 "typeVersion" : 3
} }

View File

@ -28,4 +28,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeName" : "net.drinkingtea.nostalgia.core.Palette",
"typeVersion" : 4 "typeVersion" : 4
} }

View File

@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.PaletteColor", "typeName" : "net.drinkingtea.nostalgia.core.PaletteColor",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -39,4 +39,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -39,4 +39,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 3 "typeVersion" : 3
} }

View File

@ -43,4 +43,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
"typeVersion" : 4 "typeVersion" : 4
} }

View File

@ -17,4 +17,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 2 "typeVersion" : 2
} }

View File

@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 3 "typeVersion" : 3
} }

View File

@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
"typeVersion" : 4 "typeVersion" : 4
} }

View File

@ -38,4 +38,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.SceneDoc", "typeName" : "net.drinkingtea.nostalgia.scene.SceneDoc",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -85,4 +85,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.SceneStatic", "typeName" : "net.drinkingtea.nostalgia.scene.SceneStatic",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -30,4 +30,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.nostalgia.scene.TileDoc", "typeName" : "net.drinkingtea.nostalgia.scene.TileDoc",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -6,4 +6,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"8" "8"
], ],
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -17,4 +17,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 6, "primitiveType" : 6,
"typeName" : "net.drinkingtea.ox.FileAddress.Data", "typeName" : "net.drinkingtea.ox.FileAddress.Data",
"typeVersion" : 1 "typeVersion" : 1
} }

View File

@ -13,4 +13,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{
"primitiveType" : 5, "primitiveType" : 5,
"typeName" : "net.drinkingtea.ox.FileAddress", "typeName" : "net.drinkingtea.ox.FileAddress",
"typeVersion" : 1 "typeVersion" : 1
} }