Commit 02bee0dc authored by nanahira's avatar nanahira

test pure x64 build

parent 5015bba2
...@@ -177,7 +177,7 @@ bool Game::Initialize() { ...@@ -177,7 +177,7 @@ bool Game::Initialize() {
SetWindowsIcon(); SetWindowsIcon();
//main menu //main menu
wchar_t strbuf[256]; wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Yurika", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X PONPONPON", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf); wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false); wMainMenu->getCloseButton()->setVisible(false);
btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200)); btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
......
...@@ -34,17 +34,17 @@ project "ygopro" ...@@ -34,17 +34,17 @@ project "ygopro"
if USE_IRRKLANG then if USE_IRRKLANG then
links { "irrKlang" } links { "irrKlang" }
if not IRRKLANG_PRO then if not IRRKLANG_PRO then
libdirs { "../irrklang/lib/Win32-visualStudio" } libdirs { "../irrklang/lib/Winx64-visualStudio" }
end end
end end
links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" } links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
if IRRKLANG_PRO then if IRRKLANG_PRO then
configuration { "windows", "not vs2017", "not vs2019" } configuration { "windows", "not vs2017", "not vs2019" }
libdirs { "../irrklang/lib/Win32-visualStudio" } libdirs { "../irrklang/lib/Winx64-visualStudio" }
configuration { "windows", "vs2017" } configuration { "windows", "vs2017" }
libdirs { "../irrklang/lib/Win32-vs2017" } libdirs { "../irrklang/lib/Winx64-vs2017" }
configuration { "windows", "vs2019" } configuration { "windows", "vs2019" }
libdirs { "../irrklang/lib/Win32-vs2019" } libdirs { "../irrklang/lib/Winx64-vs2019" }
end end
configuration {"windows", "not vs*"} configuration {"windows", "not vs*"}
includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" } includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }
......
Subproject commit 7922811e373e9faf952b9dfc85ee818e0a89e1de Subproject commit 9b3458c7db51dbe52fdb7961cea504d4b705b908
...@@ -13,11 +13,11 @@ BLOCK "080404b0" ...@@ -13,11 +13,11 @@ BLOCK "080404b0"
BEGIN BEGIN
VALUE "FileDescription", "KoishiPro" VALUE "FileDescription", "KoishiPro"
VALUE "InternalName", "KoishiPro" VALUE "InternalName", "KoishiPro"
VALUE "LegalCopyright", "Copyright (C) 2021 Nanahira" VALUE "LegalCopyright", "Copyright (C) 2022 Nanahira"
VALUE "OriginalFilename", "ygopro.exe" VALUE "OriginalFilename", "ygopro.exe"
VALUE "ProductName", "KoishiPro" VALUE "ProductName", "KoishiPro"
VALUE "FileVersion", "Yurika" VALUE "FileVersion", "PONPONPON"
VALUE "ProductVersion", "Yurika" VALUE "ProductVersion", "PONPONPON"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
...@@ -4,6 +4,7 @@ solution "ygo" ...@@ -4,6 +4,7 @@ solution "ygo"
objdir "obj" objdir "obj"
configurations { "Release", "Debug" } configurations { "Release", "Debug" }
platforms { "x86_64", "x86" }
defines { "LUA_COMPAT_5_2" } defines { "LUA_COMPAT_5_2" }
configuration "windows" configuration "windows"
defines { "WIN32", "_WIN32" } defines { "WIN32", "_WIN32" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment