mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 17:01:51 +00:00
Fix Lunatic build on Windows.
- Make _buildargv[_buildargc] NULL. - With SDL layer, pass argv and argc directly and get rid of _build* ones. - Add tilesiz* to dynsymlists. git-svn-id: https://svn.eduke32.com/eduke32@3573 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
38ee330c93
commit
c397759217
6 changed files with 9 additions and 14 deletions
|
@ -14,9 +14,6 @@ extern "C" {
|
|||
|
||||
#define SYSTEM_POOL_SIZE (64 * 1048576)
|
||||
|
||||
extern int32_t _buildargc;
|
||||
extern const char **_buildargv;
|
||||
|
||||
extern char quitevent, appactive;
|
||||
|
||||
extern int32_t vsync;
|
||||
|
|
|
@ -70,8 +70,6 @@ int32_t startwin_settitle(const char *s) { UNREFERENCED_PARAMETER(s); return 0;
|
|||
#define MWHEELTICKS 10
|
||||
static uint32_t mwheelup, mwheeldown;
|
||||
|
||||
int32_t _buildargc = 1;
|
||||
const char **_buildargv = NULL;
|
||||
extern int32_t app_main(int32_t argc, const char *argv[]);
|
||||
|
||||
char quitevent=0, appactive=1, novideo=0;
|
||||
|
@ -231,9 +229,6 @@ int32_t main(int32_t argc, char *argv[])
|
|||
#endif
|
||||
startwin_open();
|
||||
|
||||
_buildargc = argc;
|
||||
_buildargv = (const char **)argv;
|
||||
|
||||
maybe_redirect_outputs();
|
||||
|
||||
#ifdef USE_OPENGL
|
||||
|
@ -242,7 +237,7 @@ int32_t main(int32_t argc, char *argv[])
|
|||
#endif
|
||||
|
||||
baselayer_init();
|
||||
r = app_main(_buildargc, _buildargv);
|
||||
r = app_main(argc, argv);
|
||||
|
||||
startwin_close();
|
||||
#ifdef HAVE_GTK2
|
||||
|
|
|
@ -78,8 +78,8 @@
|
|||
static mutex_t m_initprintf;
|
||||
static int32_t winlayer_have_ATI = 0;
|
||||
|
||||
int32_t _buildargc = 0;
|
||||
const char **_buildargv = NULL;
|
||||
static int32_t _buildargc = 0;
|
||||
static const char **_buildargv = NULL;
|
||||
static char *argvbuf = NULL;
|
||||
extern int32_t app_main(int32_t argc, const char **argv);
|
||||
|
||||
|
@ -413,13 +413,14 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
|
|||
}
|
||||
*wp = 0;
|
||||
|
||||
_buildargv = (const char **)Bmalloc(sizeof(char *)*_buildargc);
|
||||
_buildargv = (const char **)Bmalloc(sizeof(char *)*(_buildargc+1));
|
||||
wp = argvbuf;
|
||||
for (i=0; i<_buildargc; i++,wp++)
|
||||
{
|
||||
_buildargv[i] = wp;
|
||||
while (*wp) wp++;
|
||||
}
|
||||
_buildargv[_buildargc] = NULL;
|
||||
}
|
||||
|
||||
maybe_redirect_outputs();
|
||||
|
|
|
@ -8687,8 +8687,6 @@ static int32_t loaddefinitions_game(const char *fn, int32_t preload)
|
|||
}
|
||||
|
||||
#ifdef LUNATIC
|
||||
// TODO: In Windows, argv[argc] isn't NULL as demanded by C99. (See winlayer.c:
|
||||
// "carve up...").
|
||||
const char **g_argv;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -40,6 +40,8 @@ prevspritesect;
|
|||
prevspritestat;
|
||||
nextspritesect;
|
||||
nextspritestat;
|
||||
tilesizx;
|
||||
tilesizy;
|
||||
|
||||
headsectbunch;
|
||||
nextsectbunch;
|
||||
|
|
|
@ -40,6 +40,8 @@ prevspritesect;
|
|||
prevspritestat;
|
||||
nextspritesect;
|
||||
nextspritestat;
|
||||
tilesizx;
|
||||
tilesizy;
|
||||
|
||||
headsectbunch;
|
||||
nextsectbunch;
|
||||
|
|
Loading…
Reference in a new issue