From 7d71d2f7c6d76ca832ba2a65b23f20da750ac95e Mon Sep 17 00:00:00 2001 From: Bucky21659 Date: Thu, 20 Dec 2018 12:32:11 -0700 Subject: [PATCH] Move japro-assets into base folder for OS X builds fs_basegame is still bugged and I don't have a machine to test a fix on --- scripts/travis/build.sh | 1 + shared/sdl/sdl_window.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 2d81cc841b..925e898dce 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -63,6 +63,7 @@ fi case "${host}" in (macosx-universal-clang) ( cd $(pwd)/build/DESTDIR/prefix/JediAcademy/ && \ + mv eternaljk base && \ tar czvf eternaljk-macos-"${arch}".tar.gz * && \ mv eternaljk-macos-"${arch}".tar.gz $(pwd)/../../../../ && \ cd ../../ && \ diff --git a/shared/sdl/sdl_window.cpp b/shared/sdl/sdl_window.cpp index 9e2a86253d..7c563c2def 100644 --- a/shared/sdl/sdl_window.cpp +++ b/shared/sdl/sdl_window.cpp @@ -335,7 +335,7 @@ static rserr_t GLimp_SetMode(glconfig_t *glConfig, const windowDesc_t *windowDes Uint32 flags = SDL_WINDOW_SHOWN; SDL_DisplayMode desktopMode; int display = 0; - int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED; + int x = SDL_WINDOWPOS_CENTERED, y = SDL_WINDOWPOS_CENTERED; if ( windowDesc->api == GRAPHICS_API_OPENGL ) {