Merge branch 'patch-premake-freetype' of github.com:mercury233/ygopro into develop

gframe/bufferio.h

@@ -162,7 +162,6 @@ public:
 		}
 		else
 			return 0;
-	
 	}
 };
 

gframe/config.h

@@ -13,7 +13,7 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 
-#if defined(_MSC_VER) or defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define mywcsncasecmp _wcsnicmp
 #define mystrncasecmp _strnicmp
 #else

gframe/duelclient.cpp

@@ -853,7 +853,6 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 			starttime = new_replay.pheader.base.start_time;
 		else
 			starttime = new_replay.pheader.base.seed;
-		
 		wchar_t timetext[40];
 		std::wcsftime(timetext, sizeof timetext / sizeof timetext[0], L"%Y-%m-%d %H-%M-%S", std::localtime(&starttime));
 		mainGame->ebRSName->setText(timetext);

premake/freetype/custom/ft2build.h

+/****************************************************************************
+ *
+ * ft2build.h
+ *
+ *   FreeType 2 build and setup macros.
+ *
+ * Use custom/ft2build.h instead of the default include/freetype/ft2build.h
+ * to customize the FreeType 2 build of YGOPro.
+ *
+ */
+
+#ifndef FT2_BUILD_MY_PLATFORM_H_
+#define FT2_BUILD_MY_PLATFORM_H_
+
+#define FT_CONFIG_OPTIONS_H  <ygopro/ftoption.h>
+#define FT_CONFIG_MODULES_H  <ygopro/ftmodule.h>
+
+#include <freetype/config/ftheader.h>
+
+#endif /* FT2_BUILD_MY_PLATFORM_H_ */

premake/freetype/custom/ygopro/ftmodule.h

+/*
+ * This file registers the FreeType modules compiled into the library.
+ *
+ * YGOPro only uses modules that are needed for TrueType fonts.
+ *
+ */
+
+FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
+FT_USE_MODULE( FT_Module_Class, psaux_module_class )
+FT_USE_MODULE( FT_Module_Class, psnames_module_class )
+FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
+
+/* EOF */

premake/freetype/custom/ygopro/ftoption.h

+/****************************************************************************
+ *
+ * ftoption.h
+ *
+ *   User-selectable configuration macros (specification only).
+ *
+ * This file is customized for YGOPro to include only the necessary
+ * configuration options for the TrueType font driver.
+ *
+ * See the original FreeType source code for more information.
+ * /include/freetype/config/ftoption.h
+ *
+ */
+
+#ifndef FTOPTION_H_
+#define FTOPTION_H_
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
+
+#undef FT_CONFIG_OPTION_FORCE_INT64
+
+#define FT_CONFIG_OPTION_INLINE_MULFIX
+
+#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+#define FT_CONFIG_OPTION_INCREMENTAL
+
+#define FT_RENDER_POOL_SIZE  16384L
+
+#define FT_MAX_MODULES  32
+
+#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+
+#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+#define TT_CONFIG_OPTION_COLOR_LAYERS
+
+#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+#define TT_CONFIG_CMAP_FORMAT_0
+#define TT_CONFIG_CMAP_FORMAT_2
+#define TT_CONFIG_CMAP_FORMAT_4
+#define TT_CONFIG_CMAP_FORMAT_6
+#define TT_CONFIG_CMAP_FORMAT_8
+#define TT_CONFIG_CMAP_FORMAT_10
+#define TT_CONFIG_CMAP_FORMAT_12
+#define TT_CONFIG_CMAP_FORMAT_13
+#define TT_CONFIG_CMAP_FORMAT_14
+
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
+
+#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES
+#define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES  1000000L
+#endif
+
+#define T1_MAX_SUBRS_CALLS  16
+
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1   500
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1   400
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2  1000
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2   275
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3  1667
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3   275
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4  2333
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4     0
+
+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define  TT_USE_BYTECODE_INTERPRETER
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+#define  TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+#endif
+#endif
+
+#ifdef TT_CONFIG_OPTION_COLOR_LAYERS
+#define  TT_SUPPORT_COLRV1
+#endif
+
+FT_END_HEADER
+
+#endif /* FTOPTION_H_ */
+
+
+/* END */

premake/freetype/premake5.lua

 project "freetype"
     kind "StaticLib"
 
-    includedirs { "include" }
+    includedirs { "custom", "include" }
     defines { "FT2_BUILD_LIBRARY" }
 
-    files { "src/autofit/autofit.c",
+    files {
+        "src/base/ftinit.c",
         "src/base/ftbase.c",
-            "src/base/ftbbox.c",
-            "src/base/ftbdf.c",
         "src/base/ftbitmap.c",
-            "src/base/ftcid.c",
-            "src/base/ftfstype.c",
-            "src/base/ftgasp.c",
-            "src/base/ftglyph.c",
-            "src/base/ftgxval.c",
-            "src/base/ftinit.c",
-            "src/base/ftmm.c",
-            "src/base/ftotval.c",
-            "src/base/ftpatent.c",
-            "src/base/ftpfr.c",
-            "src/base/ftstroke.c",
-            "src/base/ftsynth.c",
-            "src/base/fttype1.c",
-            "src/base/ftwinfnt.c",
-            "src/bdf/bdf.c",
-            "src/cache/ftcache.c",
         "src/cff/cff.c",
-            "src/cid/type1cid.c",
-            "src/gzip/ftgzip.c",
-            "src/lzw/ftlzw.c",
-            "src/pcf/pcf.c",
-            "src/pfr/pfr.c",
         "src/psaux/psaux.c",
         "src/pshinter/pshinter.c",
-            "src/psnames/psmodule.c",
-            "src/raster/raster.c",
+        "src/psnames/psnames.c",
         "src/sfnt/sfnt.c",
-            "src/sdf/sdf.c",
         "src/smooth/smooth.c",
         "src/truetype/truetype.c",
-            "src/type1/type1.c",
-            "src/type42/type42.c",
-            "src/winfonts/winfnt.c" }
-
-    if os.isfile("src/svg/svg.c") then
-        files { "src/svg/svg.c" }
-    end
+    }
 
     filter "system:windows"
         files { "builds/windows/ftsystem.c",

premake5.lua

@@ -219,7 +219,7 @@ if GetParam("no-dxsdk") then
 end
 if USE_DXSDK and os.istarget("windows") then
     if not os.getenv("DXSDK_DIR") then
-        print("DXSDK_DIR environment variable not set, it seems you don't have the DirectX SDK installed. DirectX mode will be disabled.")
+        print("Warning: DXSDK_DIR environment variable not set, it seems you don't have the DirectX SDK installed. DirectX mode will be disabled.")
         USE_DXSDK = false
     end
 end