From 3d3926c08b553d96a04044c25883009ec675d937 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 18 Aug 2023 20:30:57 +0900 Subject: [PATCH] windows build --- buildapp/build_app_windows_x86.sh | 1 + buildapp/terrarumwindows_x86/Terrarum.c | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/buildapp/build_app_windows_x86.sh b/buildapp/build_app_windows_x86.sh index a820f5bc7..5f247fb14 100755 --- a/buildapp/build_app_windows_x86.sh +++ b/buildapp/build_app_windows_x86.sh @@ -35,6 +35,7 @@ mv $DESTDIR/assets_release $DESTDIR/assets cp "../out/TerrarumBuild.jar" $DESTDIR/out/ # Temporary solution: zip everything +rm "out/TerrarumWindows.x86.zip" zip -r -9 -l "out/TerrarumWindows.x86.zip" $DESTDIR rm -rf $DESTDIR || true echo "Build successful: $DESTDIR" diff --git a/buildapp/terrarumwindows_x86/Terrarum.c b/buildapp/terrarumwindows_x86/Terrarum.c index a98a4b2f6..da9f06ec0 100644 --- a/buildapp/terrarumwindows_x86/Terrarum.c +++ b/buildapp/terrarumwindows_x86/Terrarum.c @@ -3,22 +3,9 @@ #include int main() { - STARTUPINFOW si; - PROCESS_INFORMATION pi; - - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - ZeroMemory(&pi, sizeof(pi)); - - if (CreateProcessW( - ".\\out\\runtime-windows-x86\\bin\\Terrarum.exe -jar .\\out\\TerrarumBuild.jar", - NULL, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) { - - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } + ShellExecute(NULL, "open", "\".\\out\\runtime-windows-x86\\bin\\Terrarum.exe\"", "-jar \".\\out\\TerrarumBuild.jar\"", NULL, SW_HIDE); return 0; + //return system(".\\out\\runtime-windows-x86\\bin\\Terrarum.exe -jar .\\out\\TerrarumBuild.jar"); } \ No newline at end of file