Merge remote-tracking branch 'upstream/master' into develop

.github/workflows/build.yml

@@ -437,8 +437,8 @@ jobs:
 
     - name: Copy premake files
       run: |
-        cp -r premake/* .
-        cp -r resource/* .
+        cp -pr premake/* .
+        cp -pr resource/* .
 
     - name: Use premake to generate make files (apt packages)
       if: matrix.static-link != true
@@ -670,8 +670,8 @@ jobs:
 
     - name: Copy premake files
       run: |
-        cp -r premake/* .
-        cp -r resource/* .
+        cp -pr premake/* .
+        cp -pr resource/* .
 
     - name: Use premake to generate make files (Homebrew packages)
       if: matrix.static-link != true

gframe/deck_manager.cpp

@@ -342,7 +342,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
 		return false;
 	std::stringstream deckStream;
 	SaveDeck(deck, deckStream);
-	std::fwrite(deckStream.str().c_str(), 1, deckStream.str().length(), fp);
+	std::fputs(deckStream.str().c_str(), fp);
 	std::fclose(fp);
 	return true;
 }

gframe/gframe.cpp

@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
 	std::setlocale(LC_CTYPE, ".UTF-8");
 #elif defined(__APPLE__)
 	std::setlocale(LC_CTYPE, "UTF-8");
-#elif !defined(_WIN32)
+#else
 	std::setlocale(LC_CTYPE, "");
 #endif
 #ifdef __APPLE__

gframe/premake5.lua

@@ -30,7 +30,7 @@ project "YGOPro"
     end
 
     if BUILD_FREETYPE then
-        includedirs { "../freetype/include" }
+        includedirs { "../freetype/custom", "../freetype/include" }
     else
         includedirs { FREETYPE_INCLUDE_DIR }
         libdirs { FREETYPE_LIB_DIR }

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.
+ * YGOPro only uses modules that are needed for TrueType and OpenType fonts.
  *
  */
 

premake/freetype/custom/ygopro/ftoption.h

@@ -5,7 +5,7 @@
  *   User-selectable configuration macros (specification only).
  *
  * This file is customized for YGOPro to include only the necessary
- * configuration options for the TrueType font driver.
+ * configuration options for the TrueType and OpenType font driver.
  *
  * See the original FreeType source code for more information.
  * /include/freetype/config/ftoption.h