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
eternalcodes · Dec 20, 2018 · 7d71d2f · 7d71d2f
1 parent 2bad521
commit 7d71d2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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 )
 	{