Merge commit 'dc96270ca5e882e41f6b657be14a20e8bd2ad501'

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)

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"
-}
+}

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"
-}
+}

sample_project/.nostalgia/type_descriptors/B.string;0

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

sample_project/.nostalgia/type_descriptors/B.uint16;0

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

sample_project/.nostalgia/type_descriptors/B.uint64;0

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

sample_project/.nostalgia/type_descriptors/B.uint8;0

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

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

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
-}
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1

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

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
-}
+}

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
-}
+}