Move japro-assets into base folder for OS X builds

Bucky21659 · Bucky21659 · commit 7d71d2f7c6d7 · 2018-12-20T12:32:11.000-07:00
fs_basegame is still bugged and I don't have a machine to test a fix on
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 )
 	{

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ static rserr_t GLimp_SetMode(glconfig_t glConfig, const windowDesc_t windowDes`
`335`	`335`	`Uint32 flags = SDL_WINDOW_SHOWN;`
`336`	`336`	`SDL_DisplayMode desktopMode;`
`337`	`337`	`int display = 0;`
`338`		`- int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED;`
	`338`	`+ int x = SDL_WINDOWPOS_CENTERED, y = SDL_WINDOWPOS_CENTERED;`
`339`	`339`
`340`	`340`	`if ( windowDesc->api == GRAPHICS_API_OPENGL )`
`341`	`341`	`{`