Merge branch 'master' into another

.travis.yml

@@ -22,10 +22,13 @@ before_install:
 - git submodule update --init --recursive
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
   brew update;
-  brew install freetype libevent sqlite dylibbundler p7zip;
-  sudo rm -rf /usr/local/include/unistring;
-  sudo rm -rf /usr/local/include/lzma;
-  sudo rm -f /usr/local/include/CGAL/stddef.h; fi
+  brew install freetype libevent sqlite dylibbundler;
+  sudo cp -r /usr/local/include/freetype2 ./freetype2;
+  sudo cp -r /usr/local/include/event2 ./event2;
+  sudo rm -rf /usr/local/include/*;
+  sudo cp -r ./freetype2 /usr/local/include/freetype2;
+  sudo cp -r ./event2 /usr/local/include/event2;
+  fi
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cp libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; cd .. ; fi
 

CMakeLists.txt

 project (ygo)
 
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.8)
 
 if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "Setting build type to 'Debug' as none was specified.")
@@ -15,6 +15,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 include (AutoFiles)
 
 include (platform/settings)

cmake/compiler/gcc.cmake

-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 add_definitions ( "-fexceptions" "-fomit-frame-pointer" "-fno-strict-aliasing" "-Wno-format-security" )

cmake/compiler/msvc.cmake

@@ -3,3 +3,4 @@ add_definitions ( "-D_UNICODE" "-DUNICODE" "/utf-8" )
 
 include (MSVCMultipleProcessCompile)
 include (MSVCStaticRuntime)
+include (MSVCJustMyCodeDebugging)

cmake/macros/MSVCJustMyCodeDebugging.cmake

+# - Enable Just My Code debugging on MSVC
+#
+#  include(MSVCJustMyCodeDebugging)
+#
+# Requires these CMake modules:
+#  ListCombinations.cmake
+#
+# The cmake property VS_JUST_MY_CODE_DEBUGGING introduced in CMake 3.15
+# also add /JMC to Release configuration, which is inappropriate
+
+if(MSVC AND NOT "${MSVC_VERSION}" LESS 1918)
+	# Only available in VS 2017 15.8 and newer
+	include(ListCombinations)
+	list_combinations(_varnames
+		PREFIXES
+		CMAKE_CXX_FLAGS_
+		SUFFIXES
+		DEBUG
+		RELWITHDEBINFO)
+	foreach(_var ${_varnames})
+		set(${_var} "${${_var}} /JMC")
+	endforeach()
+endif()

cmake/platform/xcode.cmake

 set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
-set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

gframe/CMakeLists.txt

@@ -16,7 +16,11 @@ endif ()
 
 if (MSVC)
     add_executable (ygopro WIN32 ${AUTO_FILES_RESULT})
-    set_target_properties (ygopro PROPERTIES LINK_FLAGS /ENTRY:"mainCRTStartup")
+    set_target_properties (ygopro PROPERTIES
+        LINK_FLAGS /ENTRY:"mainCRTStartup"
+        VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    )
+    set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ygopro)
 else ()
     add_executable (ygopro ${AUTO_FILES_RESULT})
 endif ()

gframe/game.cpp

@@ -116,7 +116,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Fortune", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Yume", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
@@ -492,10 +492,10 @@ bool Game::Initialize() {
 	wANNumber->setVisible(false);
 	cbANNumber =  env->addComboBox(rect<s32>(40, 30, 190, 50), wANNumber, -1);
 	cbANNumber->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
-	for(int i = 0; i < 12; ++i) {
-		myswprintf(strbuf, L"%d", i + 1);
-		btnANNumber[i] = env->addButton(rect<s32>(20 + 50 * (i % 4), 40 + 50 * (i / 4), 60 + 50 * (i % 4), 80 + 50 * (i / 4)), wANNumber, BUTTON_ANNUMBER_1 + i, strbuf);
-		btnANNumber[i]->setIsPushButton(true);
+	for(int i = 0; i < 12; ++i) {
+		myswprintf(strbuf, L"%d", i + 1);
+		btnANNumber[i] = env->addButton(rect<s32>(20 + 50 * (i % 4), 40 + 50 * (i / 4), 60 + 50 * (i % 4), 80 + 50 * (i / 4)), wANNumber, BUTTON_ANNUMBER_1 + i, strbuf);
+		btnANNumber[i]->setIsPushButton(true);
 	}
 	btnANNumberOK = env->addButton(rect<s32>(80, 60, 150, 85), wANNumber, BUTTON_ANNUMBER_OK, dataManager.GetSysString(1211));
 	//announce card

ocgcore @ eb2739d9

-Subproject commit a27637a88d49538df889f6f9e178536b14725daa
+Subproject commit eb2739d92a629f477a77c6ec2fc5f71535b315d9

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro Another"
 VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro Another"
-VALUE "FileVersion", "Fortune"
-VALUE "ProductVersion", "Fortune"
+VALUE "FileVersion", "Yume"
+VALUE "ProductVersion", "Yume"
 END
 END
 BLOCK "VarFileInfo"

script @ a15e0304

-Subproject commit bd3b671c2a5e8314dcf18b4907cf44da82418339
+Subproject commit a15e0304ffa16cb1c7547df2d3c8c08b31c58398