mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-11 18:50:46 +00:00
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:
parent
bdc4f7cd68
commit
ec1923b417
7 changed files with 31 additions and 17 deletions
|
@ -64,9 +64,7 @@ EDUKE32 ?= eduke32$(EXESUFFIX)
|
||||||
MAPSTER32 ?= mapster32$(EXESUFFIX)
|
MAPSTER32 ?= mapster32$(EXESUFFIX)
|
||||||
|
|
||||||
EDUKE32_TARGET:=$(EDUKE32)
|
EDUKE32_TARGET:=$(EDUKE32)
|
||||||
ifneq ($(PLATFORM),WII)
|
MAPSTER32_TARGET:=$(MAPSTER32)
|
||||||
MAPSTER32_TARGET:=$(MAPSTER32)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef EBACKTRACEDLL
|
ifndef EBACKTRACEDLL
|
||||||
EBACKTRACEDLL = ebacktrace1.dll
|
EBACKTRACEDLL = ebacktrace1.dll
|
||||||
|
|
|
@ -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 xdim2d = 640, ydim2d = 480, xdimgame = 640, ydimgame = 480, bppgame = 8;
|
||||||
int32_t forcesetup = 1;
|
int32_t forcesetup = 1;
|
||||||
|
|
||||||
|
#ifndef GEKKO
|
||||||
int32_t g_maxCacheSize = 24<<20;
|
int32_t g_maxCacheSize = 24<<20;
|
||||||
|
#else
|
||||||
|
int32_t g_maxCacheSize = 8<<20;
|
||||||
|
#endif
|
||||||
|
|
||||||
static int16_t oldmousebstatus = 0;
|
static int16_t oldmousebstatus = 0;
|
||||||
char game_executable[BMAX_PATH] = DEFAULT_GAME_LOCAL_EXEC;
|
char game_executable[BMAX_PATH] = DEFAULT_GAME_LOCAL_EXEC;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
@echo off
|
@echo off
|
||||||
setlocal ENABLEEXTENSIONS DISABLEDELAYEDEXPANSION
|
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%
|
set PATH=C:\devkitPro\devkitPPC\bin;C:\devkitPro\msys\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
|
||||||
|
|
||||||
pushd "%~dp0.."
|
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:
|
:: However, do throw in the licenses:
|
||||||
if exist "package\*.txt" copy /y "package\*.txt" "apps\eduke32\"
|
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
|
"ls.exe" -l -R apps
|
||||||
7z.exe a -mx9 -t7z eduke32-wii-%rev%.7z apps -xr!*.svn*
|
7z.exe a -mx9 -t7z eduke32-wii-%rev%.7z apps -xr!*.svn*
|
||||||
|
|
|
@ -8820,6 +8820,8 @@ int32_t ExtPreInit(int32_t argc,const char **argv)
|
||||||
{
|
{
|
||||||
wm_setapptitle("Mapster32");
|
wm_setapptitle("Mapster32");
|
||||||
|
|
||||||
|
G_ExtPreInit();
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
{
|
{
|
||||||
extern int32_t (*check_filename_casing_fn)(void);
|
extern int32_t (*check_filename_casing_fn)(void);
|
||||||
|
@ -10295,6 +10297,8 @@ int32_t ExtInit(void)
|
||||||
"EDuke32 Settings"
|
"EDuke32 Settings"
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
"Library/Application Support/EDuke32"
|
"Library/Application Support/EDuke32"
|
||||||
|
#elif defined(GEKKO)
|
||||||
|
"apps/eduke32"
|
||||||
#else
|
#else
|
||||||
".eduke32"
|
".eduke32"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -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)
|
void G_AddSearchPaths(void)
|
||||||
{
|
{
|
||||||
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
|
|
|
@ -51,6 +51,8 @@ extern void G_MultiPskyInit(void);
|
||||||
|
|
||||||
//////////
|
//////////
|
||||||
|
|
||||||
|
extern void G_ExtPreInit(void);
|
||||||
|
|
||||||
extern void G_AddSearchPaths(void);
|
extern void G_AddSearchPaths(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -10055,12 +10055,6 @@ static int32_t check_filename_casing(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GEKKO
|
|
||||||
void L2Enhance();
|
|
||||||
void CON_EnableGecko(int channel,int safe);
|
|
||||||
bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LUNATIC
|
#ifdef LUNATIC
|
||||||
const char *g_sizes_of_what[] = {
|
const char *g_sizes_of_what[] = {
|
||||||
"sectortype", "walltype", "spritetype", "spriteext_t",
|
"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(actor_t)==128);
|
||||||
Bassert(sizeof(DukePlayer_t)%4 == 0);
|
Bassert(sizeof(DukePlayer_t)%4 == 0);
|
||||||
|
|
||||||
#ifdef GEKKO
|
G_ExtPreInit();
|
||||||
L2Enhance();
|
|
||||||
CON_EnableGecko(1, 1);
|
|
||||||
printf("Console started\n");
|
|
||||||
fatInit(28, true);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (argc > 1)
|
if (argc > 1)
|
||||||
|
|
Loading…
Reference in a new issue