Wii: Fix Mapster32. It runs now.

git-svn-id: https://svn.eduke32.com/eduke32@3582 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-03-21 09:49:12 +00:00
parent bdc4f7cd68
commit ec1923b417
7 changed files with 31 additions and 17 deletions

View file

@ -64,9 +64,7 @@ EDUKE32 ?= eduke32$(EXESUFFIX)
MAPSTER32 ?= mapster32$(EXESUFFIX)
EDUKE32_TARGET:=$(EDUKE32)
ifneq ($(PLATFORM),WII)
MAPSTER32_TARGET:=$(MAPSTER32)
endif
MAPSTER32_TARGET:=$(MAPSTER32)
ifndef EBACKTRACEDLL
EBACKTRACEDLL = ebacktrace1.dll

View file

@ -68,7 +68,11 @@ double vid_gamma_3d=-1, vid_contrast_3d=-1, vid_brightness_3d=-1;
int32_t xdim2d = 640, ydim2d = 480, xdimgame = 640, ydimgame = 480, bppgame = 8;
int32_t forcesetup = 1;
#ifndef GEKKO
int32_t g_maxCacheSize = 24<<20;
#else
int32_t g_maxCacheSize = 8<<20;
#endif
static int16_t oldmousebstatus = 0;
char game_executable[BMAX_PATH] = DEFAULT_GAME_LOCAL_EXEC;

View file

@ -1,7 +1,7 @@
@echo off
setlocal ENABLEEXTENSIONS DISABLEDELAYEDEXPANSION
set targets=eduke32
set targets=eduke32 mapster32
set PATH=C:\devkitPro\devkitPPC\bin;C:\devkitPro\msys\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
pushd "%~dp0.."
@ -38,7 +38,7 @@ for %%G in (%targets%) do "echo.exe" -e " <version>%rev%</version>\n <rele
:: However, do throw in the licenses:
if exist "package\*.txt" copy /y "package\*.txt" "apps\eduke32\"
:: xcopy /e /q /y /EXCLUDE:%wiidir%\xcopy_exclude.txt package apps\mapster32\
xcopy /e /q /y /EXCLUDE:%wiidir%\xcopy_exclude.txt package apps\mapster32\
"ls.exe" -l -R apps
7z.exe a -mx9 -t7z eduke32-wii-%rev%.7z apps -xr!*.svn*

View file

@ -8820,6 +8820,8 @@ int32_t ExtPreInit(int32_t argc,const char **argv)
{
wm_setapptitle("Mapster32");
G_ExtPreInit();
#ifdef _WIN32
{
extern int32_t (*check_filename_casing_fn)(void);
@ -10295,6 +10297,8 @@ int32_t ExtInit(void)
"EDuke32 Settings"
#elif defined(__APPLE__)
"Library/Application Support/EDuke32"
#elif defined(GEKKO)
"apps/eduke32"
#else
".eduke32"
#endif

View file

@ -199,6 +199,23 @@ void G_MultiPskyInit(void)
//////////
#ifdef GEKKO
#include "gctypes.h" // for bool
void L2Enhance();
void CON_EnableGecko(int channel,int safe);
bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice);
#endif
void G_ExtPreInit(void)
{
#ifdef GEKKO
L2Enhance();
CON_EnableGecko(1, 1);
Bprintf("Console started\n");
fatInit(28, true);
#endif
}
void G_AddSearchPaths(void)
{
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

View file

@ -51,6 +51,8 @@ extern void G_MultiPskyInit(void);
//////////
extern void G_ExtPreInit(void);
extern void G_AddSearchPaths(void);
#endif

View file

@ -10055,12 +10055,6 @@ static int32_t check_filename_casing(void)
}
#endif
#ifdef GEKKO
void L2Enhance();
void CON_EnableGecko(int channel,int safe);
bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice);
#endif
#ifdef LUNATIC
const char *g_sizes_of_what[] = {
"sectortype", "walltype", "spritetype", "spriteext_t",
@ -10103,12 +10097,7 @@ int32_t app_main(int32_t argc, const char **argv)
Bassert(sizeof(actor_t)==128);
Bassert(sizeof(DukePlayer_t)%4 == 0);
#ifdef GEKKO
L2Enhance();
CON_EnableGecko(1, 1);
printf("Console started\n");
fatInit(28, true);
#endif
G_ExtPreInit();
#ifdef _WIN32
if (argc > 1)