zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some crap

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1666 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2010-07-05 01:45:29 +00:00
parent 013ac85e2d
commit 7be36ebcd4
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/Makefile
View file

@ -49,7 +49,8 @@ ifneq (0,$(RELEASE))
else else
# Debugging enabled # Debugging enabled
debug=-ggdb -O0 -DDEBUGGINGAIDS -fstack-protector-all debug=-ggdb -O0 -DDEBUGGINGAIDS -fstack-protector-all
LIBS=-lm -lssp -Wl,--enable-auto-import LIBS=-lm
ifneq (0,$(KRANDDEBUG)) ifneq (0,$(KRANDDEBUG))
debug+=-fno-inline -fno-inline-functions -fno-inline-functions-called-once debug+=-fno-inline -fno-inline-functions -fno-inline-functions-called-once
debug+=-DKRANDDEBUG=1 debug+=-DKRANDDEBUG=1
@ -87,6 +88,7 @@ include $(EROOT)/Makefile.shared
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
OBJ=obj_win OBJ=obj_win
EOBJ=eobj_win EOBJ=eobj_win
LIBS+= -lssp -Wl,--enable-auto-import
else else
LIBS+= -ldl -pthread LIBS+= -ldl -pthread
ifeq (1,$(PROFILER)) ifeq (1,$(PROFILER))

2
polymer/eduke32/build/include/compat.h
View file

@ -387,12 +387,14 @@ int32_t Bclosedir(BDIR *dir);
# define Brealloc nedrealloc # define Brealloc nedrealloc
# define Bfree nedfree # define Bfree nedfree
# define Bstrdup nedstrdup # define Bstrdup nedstrdup
# define Bmemalign nedmemalign
#else #else
# define Bmalloc malloc # define Bmalloc malloc
# define Bcalloc calloc # define Bcalloc calloc
# define Brealloc realloc # define Brealloc realloc
# define Bfree free # define Bfree free
# define Bstrdup strdup # define Bstrdup strdup
# define Bmemalign memalign
#endif #endif
# define Bopen open # define Bopen open
# define Bclose close # define Bclose close

2
polymer/eduke32/build/src/osd.c
View file

@ -1848,7 +1848,7 @@ int32_t OSD_RegisterFunction(const char *name, const char *help, int32_t (*func)
return -1; return -1;
} }
*/ */
Bfree((char *)symb->help); // Bfree((char *)symb->help);
symb->help = help; symb->help = help;
symb->func = func; symb->func = func;
return 0; return 0;

2
polymer/eduke32/source/global.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "duke3d.h" #include "duke3d.h"
const char *s_buildDate = "20100703"; const char *s_buildDate = "20100704";
char *MusicPtr = NULL; char *MusicPtr = NULL;
int32_t g_musicSize; int32_t g_musicSize;

3
polymer/eduke32/source/sdlmusic.c
View file

@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#if !defined _WIN32 // fork/exec based external midi player #if !defined _WIN32 // fork/exec based external midi player
#include <unistd.h> #include <unistd.h>
#include <malloc.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/wait.h> #include <sys/wait.h>
static char **external_midi_argv; static char **external_midi_argv;
@ -168,7 +167,7 @@ int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
sz = (numargs+2)*sizeof(char *) + (c-command+1); sz = (numargs+2)*sizeof(char *) + (c-command+1);
sz = ((sz+pagesize)/pagesize)*pagesize; sz = ((sz+pagesize)/pagesize)*pagesize;
external_midi_argv = memalign(pagesize, sz); external_midi_argv = Bmemalign(pagesize, sz);
if (!external_midi_argv) if (!external_midi_argv)
goto fallback; goto fallback;