diff --git a/deps/nfde/CMakeLists.txt b/deps/nfde/CMakeLists.txt index bdaa8de1..1c4bf69a 100644 --- a/deps/nfde/CMakeLists.txt +++ b/deps/nfde/CMakeLists.txt @@ -10,7 +10,11 @@ if(NOT DEFINED BUILD_SHARED_LIBS) option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF) endif() 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) if(WIN32) @@ -21,7 +25,9 @@ elseif(UNIX AND NOT APPLE) set(nfd_PLATFORM PLATFORM_UNIX) endif() -message("nfd Platform: ${nfd_PLATFORM}") +# DrinkingTea: begin +#message("nfd Platform: ${nfd_PLATFORM}") +# DrinkingTea: end set(nfd_COMPILER Undefined) 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) 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 if(NOT DEFINED CMAKE_CXX_STANDARD) diff --git a/sample_project/.nostalgia/type_descriptors/B.int32;0 b/sample_project/.nostalgia/type_descriptors/B.int32;0 index 5acc44f2..c584116b 100644 --- a/sample_project/.nostalgia/type_descriptors/B.int32;0 +++ b/sample_project/.nostalgia/type_descriptors/B.int32;0 @@ -2,4 +2,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "length" : 4, "primitiveType" : 1, "typeName" : "B.int32" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/B.int8;0 b/sample_project/.nostalgia/type_descriptors/B.int8;0 index a011811d..2019e3cb 100644 --- a/sample_project/.nostalgia/type_descriptors/B.int8;0 +++ b/sample_project/.nostalgia/type_descriptors/B.int8;0 @@ -2,4 +2,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "length" : 1, "primitiveType" : 1, "typeName" : "B.int8" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/B.string;0 b/sample_project/.nostalgia/type_descriptors/B.string;0 index f658c642..a6e483b1 100644 --- a/sample_project/.nostalgia/type_descriptors/B.string;0 +++ b/sample_project/.nostalgia/type_descriptors/B.string;0 @@ -1,4 +1,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 4, "typeName" : "B.string" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/B.uint16;0 b/sample_project/.nostalgia/type_descriptors/B.uint16;0 index 1330cf9d..e6addc31 100644 --- a/sample_project/.nostalgia/type_descriptors/B.uint16;0 +++ b/sample_project/.nostalgia/type_descriptors/B.uint16;0 @@ -1,4 +1,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "length" : 2, "typeName" : "B.uint16" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/B.uint64;0 b/sample_project/.nostalgia/type_descriptors/B.uint64;0 index 458ed704..78dfe059 100644 --- a/sample_project/.nostalgia/type_descriptors/B.uint64;0 +++ b/sample_project/.nostalgia/type_descriptors/B.uint64;0 @@ -1,4 +1,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "length" : 8, "typeName" : "B.uint64" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/B.uint8;0 b/sample_project/.nostalgia/type_descriptors/B.uint8;0 index 44d41b3d..f7bad112 100644 --- a/sample_project/.nostalgia/type_descriptors/B.uint8;0 +++ b/sample_project/.nostalgia/type_descriptors/B.uint8;0 @@ -1,4 +1,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "length" : 1, "typeName" : "B.uint8" -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactPalette;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactPalette;1 index 4d2d0bc4..d8c2cafc 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactPalette;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactPalette;1 @@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.CompactPalette", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactTileSheet;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactTileSheet;1 index bb9db516..dd0c5143 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactTileSheet;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.CompactTileSheet;1 @@ -25,4 +25,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.CompactTileSheet", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1 index 14275371..2684c4f0 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1 @@ -36,4 +36,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3 index 1c2ad7df..a149b434 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3 @@ -9,4 +9,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo", "typeVersion" : 3 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1 index 503ed998..01356320 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1 @@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette.PalettePage", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1 index 0336e780..5bcee5ae 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1 @@ -16,4 +16,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2 index eb0ad425..93fbc82c 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2 @@ -20,4 +20,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeVersion" : 2 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3 index 56f85fc0..3438dc0b 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3 @@ -31,4 +31,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeVersion" : 3 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4 index 9aff393c..668216e9 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4 @@ -28,4 +28,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.Palette", "typeVersion" : 4 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1 index 816e7191..d9d6aac9 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1 @@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.PaletteColor", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1 index 949b9656..b32cb2b7 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1 @@ -39,4 +39,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3 index 01125bb1..26bf5d64 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3 @@ -39,4 +39,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeVersion" : 3 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4 index 185778a9..78d1d7b1 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4 @@ -43,4 +43,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet", "typeVersion" : 4 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2 index 17be8f66..4d55e8ee 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2 @@ -17,4 +17,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeVersion" : 2 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3 index 3bb34484..75c7523e 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3 @@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeVersion" : 3 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4 index 9dc2b451..4acb515a 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4 @@ -21,4 +21,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.core.TileSheet", "typeVersion" : 4 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1 index 07dabd5b..f1fa0e33 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1 @@ -38,4 +38,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.scene.SceneDoc", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1 index 8482e494..09276455 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1 @@ -85,4 +85,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.scene.SceneStatic", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1 index 3853479b..5a7fa3df 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1 @@ -30,4 +30,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.nostalgia.scene.TileDoc", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1 index dc047dcd..e2677522 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1 @@ -6,4 +6,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "8" ], "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1 index cb981fac..32e18245 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1 @@ -17,4 +17,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 6, "typeName" : "net.drinkingtea.ox.FileAddress.Data", "typeVersion" : 1 -} +} \ No newline at end of file diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1 b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1 index 43361af1..e30b37b5 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1 +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1 @@ -13,4 +13,4 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "primitiveType" : 5, "typeName" : "net.drinkingtea.ox.FileAddress", "typeVersion" : 1 -} +} \ No newline at end of file