teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove built-in copy of nedmalloc and update nedmalloc.dll. Note that the built-in copy of nedmalloc hasn't been updated or enabled in a really long time as modern system allocators (Windows 7 and Linux 3.x at least) are no longer consistently beat by nedmalloc (but nor are they consistently faster). So, the dll remains for users of Windows XP because it may still improve performance there (while not likely degrading it on Vista/7).

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3086 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-10-15 00:17:30 +00:00
parent ca46dc76ec
commit a5f479787f
18 changed files with 1650 additions and 7917 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/Makefile.common
View file

@ -31,7 +31,6 @@ NOASM = 0
LINKED_GTK = 0
BUILD32_ON_64 ?= 0
# DO NOT SET THIS TO 1 AND COMMIT IT.
NEDMALLOC = 0
USE_LIBPNG ?= 1
USE_LIBVPX ?= 1

7
polymer/eduke32/build/Makefile
View file

@ -60,9 +60,6 @@ endif
UTILLIBS= -lm # -lpthread
UTILADDOBJS=
ifneq (0,$(NEDMALLOC))
UTILADDOBJS+= $(OBJ)/nedmalloc.$o
endif
ENGINEOBJS=
ifeq (0,$(NOASM))
@ -101,10 +98,6 @@ ifeq (1,$(POLYMER))
ENGINEOBJS+= $(OBJ)/polymer.$o
endif
ifeq (1,$(NEDMALLOC))
ENGINEOBJS+= $(OBJ)/nedmalloc.$o
endif
EDITOROBJS=$(OBJ)/build.$o \
$(OBJ)/config.$o

1
polymer/eduke32/build/Makefile.deps
View file

@ -28,7 +28,6 @@ $(OBJ)/winlayer.$o: $(SRC)/winlayer.c $(INC)/compat.h $(INC)/winlayer.h $(INC)/b
$(OBJ)/gtkbits.$o: $(SRC)/gtkbits.c $(INC)/baselayer.h $(INC)/build.h $(INC)/dynamicgtk.h
$(OBJ)/dynamicgtk.$o: $(SRC)/dynamicgtk.c $(INC)/dynamicgtk.h
$(OBJ)/polymer.$o: $(SRC)/polymer.c $(INC)/polymer.h $(INC)/compat.h $(INC)/build.h $(INC)/glbuild.h $(INC)/osd.h $(INC)/pragmas.h $(INC)/mdsprite.h $(INC)/polymost.h
$(OBJ)/nedmalloc.$o: $(SRC)/nedmalloc.c $(INC)/nedmalloc.h $(INC)/malloc.c.h
$(OBJ)/mutex.$o: $(SRC)/mutex.c $(INC)/mutex.h
$(OBJ)/rawinput.$o: $(SRC)/rawinput.c $(INC)/rawinput.h

32
polymer/eduke32/build/Makefile.msvc
View file

@ -9,7 +9,7 @@ OBJ=obj.msc
!endif
INC=include\ #
!ifndef CFLAGS
CFLAGS=/DUSE_OPENGL /DPOLYMER # /DNEDMALLOC
CFLAGS=/DUSE_OPENGL /DPOLYMER
!endif
o=obj
@ -131,59 +131,59 @@ $(OBJ)\$(EDITORLIB): $(EDITOROBJS)
lib $(flags_lib) /out:$@ /nologo $**
# the tools
kextract$(EXESUFFIX): $(OBJ)\kextract.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
kextract$(EXESUFFIX): $(OBJ)\kextract.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
kgroup$(EXESUFFIX): $(OBJ)\kgroup.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
kgroup$(EXESUFFIX): $(OBJ)\kgroup.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
transpal$(EXESUFFIX): $(OBJ)\transpal.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
transpal$(EXESUFFIX): $(OBJ)\transpal.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
wad2map$(EXESUFFIX): $(OBJ)\wad2map.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
wad2map$(EXESUFFIX): $(OBJ)\wad2map.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
wad2art$(EXESUFFIX): $(OBJ)\wad2art.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
wad2art$(EXESUFFIX): $(OBJ)\wad2art.$o $(OBJ)\pragmas.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
kmd2tool$(EXESUFFIX): $(OBJ)\kmd2tool.$o $(OBJ)\nedmalloc.$o
kmd2tool$(EXESUFFIX): $(OBJ)\kmd2tool.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
md2tool$(EXESUFFIX): $(OBJ)\md2tool.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
md2tool$(EXESUFFIX): $(OBJ)\md2tool.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
generateicon$(EXESUFFIX): $(OBJ)\generateicon.$o $(OBJ)\compat.$o $(OBJ)\pragmas.$o $(OBJ)\kplib.$o $(OBJ)\cache1d.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
generateicon$(EXESUFFIX): $(OBJ)\generateicon.$o $(OBJ)\compat.$o $(OBJ)\pragmas.$o $(OBJ)\kplib.$o $(OBJ)\cache1d.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
cacheinfo$(EXESUFFIX): $(OBJ)\cacheinfo.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\nedmalloc.$o
cacheinfo$(EXESUFFIX): $(OBJ)\cacheinfo.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
arttool$(EXESUFFIX): $(OBJ)\arttool.$o $(OBJ)\nedmalloc.$o
arttool$(EXESUFFIX): $(OBJ)\arttool.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
givedepth$(EXESUFFIX): $(OBJ)\givedepth.$o $(OBJ)\nedmalloc.$o
givedepth$(EXESUFFIX): $(OBJ)\givedepth.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
mkpalette$(EXESUFFIX): $(OBJ)\mkpalette.$o $(OBJ)\nedmalloc.$o
mkpalette$(EXESUFFIX): $(OBJ)\mkpalette.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
unpackssi$(EXESUFFIX): $(OBJ)\unpackssi.$o $(OBJ)\nedmalloc.$o
unpackssi$(EXESUFFIX): $(OBJ)\unpackssi.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
bsuite$(EXESUFFIX): $(OBJ)\bsuite.$o $(OBJ)\nedmalloc.$o
bsuite$(EXESUFFIX): $(OBJ)\bsuite.$o
$(LINK) /OUT:$@ /SUBSYSTEM:CONSOLE $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $@.manifest -outputresource:$@
@ -192,7 +192,7 @@ bsuite$(EXESUFFIX): $(OBJ)\bsuite.$o $(OBJ)\nedmalloc.$o
# PHONIES
clean:
-del /Q $(ENGINEOBJS) $(EDITOROBJS) $(OBJ)\kextract.$o $(OBJ)\kgroup.$o $(OBJ)\transpal.$o $(OBJ)\wad2art.$o $(OBJ)\wad2map.$o $(OBJ)\kmd2tool.$o $(OBJ)\md2tool.$o $(OBJ)\generateicon.$o $(OBJ)\cacheinfo.$o $(OBJ)\arttool.$o $(OBJ)\givedepth.$o $(OBJ)\mkpalette.$o $(OBJ)\unpackssi.$o $(OBJ)\bsuite.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\pragmas.$o $(OBJ)\kplib.$o $(OBJ)\cache1d.$o $(OBJ)\nedmalloc.$o
-del /Q $(ENGINEOBJS) $(EDITOROBJS) $(OBJ)\kextract.$o $(OBJ)\kgroup.$o $(OBJ)\transpal.$o $(OBJ)\wad2art.$o $(OBJ)\wad2map.$o $(OBJ)\kmd2tool.$o $(OBJ)\md2tool.$o $(OBJ)\generateicon.$o $(OBJ)\cacheinfo.$o $(OBJ)\arttool.$o $(OBJ)\givedepth.$o $(OBJ)\mkpalette.$o $(OBJ)\unpackssi.$o $(OBJ)\bsuite.$o $(OBJ)\compat.$o $(OBJ)\compat_tools.$o $(OBJ)\pragmas.$o $(OBJ)\kplib.$o $(OBJ)\cache1d.$o
veryclean: clean
-del /Q $(OBJ)\$(ENGINELIB) $(OBJ)\$(EDITORLIB) $(UTILS) *.map *.manifest *.pdb

5
polymer/eduke32/build/Makefile.shared
View file

@ -163,7 +163,6 @@ ifeq ($(PLATFORM),BSD)
ifneq ($(findstring i386, $(shell uname -m)), i386)
override NOASM=1
endif
override NEDMALLOC=0
STDCPPLIB=-lstdc++
endif
ifeq ($(PLATFORM),BEOS)
@ -277,10 +276,6 @@ ifneq (0,$(POLYMER))
endif
endif
ifneq (0,$(NEDMALLOC))
BUILDCFLAGS+= -DNEDMALLOC
endif
ifneq ($(EXESUFFIX_OVERRIDE),)
EXESUFFIX=$(EXESUFFIX_OVERRIDE)
endif

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

@ -39,10 +39,6 @@
# endif
#endif
#ifdef NEDMALLOC
# include "nedmalloc.h"
#endif
#ifndef TRUE
# define TRUE 1
#endif
@ -476,21 +472,12 @@ static inline uint16_t system_15bit_rand(void) { return ((uint16_t)rand())&0x7ff
# define Bassert assert
# define Brand rand
# define Balloca alloca
# ifdef NEDMALLOC
# define Bmalloc nedmalloc
# define Bcalloc nedcalloc
# define Brealloc nedrealloc
# define Bfree nedfree
# define Bstrdup nedstrdup
# define Bmemalign nedmemalign
# else
# define Bmalloc malloc
# define Bcalloc calloc
# define Brealloc realloc
# define Bfree free
# define Bstrdup strdup
# define Bmemalign memalign
# endif
# define Bopen open
# define Bclose close
# define Bwrite write

5871
polymer/eduke32/build/include/malloc.c.h
View file

File diff suppressed because it is too large Load diff

1919
polymer/eduke32/build/include/nedmalloc.h
View file

File diff suppressed because it is too large Load diff

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

@ -383,7 +383,7 @@ int32_t baselayer_init(void)
void makeasmwriteable(void)
{
#if !defined(NOASM) && !defined(GEKKO)
#if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__)
extern int32_t dep_begin, dep_end;
# if defined _WIN32
DWORD oldprot;

12
polymer/eduke32/build/src/compat.c
View file

@ -59,20 +59,12 @@ int32_t Brand(void)
void *Bmalloc(bsize_t size)
{
#ifdef NEDMALLOC
return nedmalloc(size);
#else
return malloc(size);
#endif
}
void Bfree(void *ptr)
{
#ifdef NEDMALLOC
nedfree(ptr);
#else
free(ptr);
#endif
}
int32_t Bopen(const char *pathname, int32_t flags, uint32_t mode)
@ -170,11 +162,7 @@ bsize_t Bfwrite(const void *ptr, bsize_t size, bsize_t nmemb, BFILE *stream)
char *Bstrdup(const char *s)
{
#ifdef NEDMALLOC
return nedstrdup(s);
#else
return strdup(s);
#endif
}
char *Bstrcpy(char *dest, const char *src)

13
polymer/eduke32/build/src/engine.c
View file

@ -36,9 +36,6 @@
#ifdef USE_LIBPNG
//# include <setjmp.h>
# ifdef NEDMALLOC
# define PNG_USER_MEM_SUPPORTED
# endif
# include <png.h>
#endif
@ -47,7 +44,7 @@
#include "engine_priv.h"
#define CACHEAGETIME 16
//#define CLASSIC_NONPOW2_YSIZE_WALLS
// #define CLASSIC_NONPOW2_YSIZE_WALLS
#define CLASSIC_NONPOW2_YSIZE_SPRITES
#if !defined DEBUG_MAIN_ARRAYS
@ -9426,10 +9423,6 @@ int32_t loadboard(char *filename, char flags, vec3_t *dapos, int16_t *daang, int
if (!ok) { kclose(fil); return(-2); }
}
#ifdef NEDMALLOC
nedtrimthreadcache(0, 0);
#endif
prepare_loadboard(fil, dapos, daang, dacursectnum);
kread(fil,&numsectors,2); numsectors = B_LITTLE16(numsectors);
@ -15851,11 +15844,7 @@ static int32_t screencapture_png(const char *filename, char inverseit, const cha
return i;
/* Create and initialize the png_struct with default error handling. */
# ifndef NEDMALLOC
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
# else
png_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL, Bmalloc, Bfree);
# endif
if (png_ptr == NULL)
{
Bfclose(fp);

1603
polymer/eduke32/build/src/nedmalloc.c
View file

File diff suppressed because it is too large Load diff

15
polymer/eduke32/build/src/sdlayer.c
View file

@ -197,11 +197,6 @@ int32_t main(int32_t argc, char *argv[])
char *argp;
FILE *fp;
#ifdef NEDMALLOC
nedcreatepool(SYSTEM_POOL_SIZE, -1);
// atexit(neddestroysyspool);
#endif
buildkeytranslationtable();
#ifdef HAVE_GTK2
@ -260,7 +255,7 @@ void setvsync(int32_t sync)
static void attach_debugger_here(void) {}
/* XXX: libexecinfo could be used on systems without gnu libc. */
#if defined __GNUC__ && !defined __OpenBSD__ && !(defined __APPLE__ && defined __BIG_ENDIAN__) && !defined(GEKKO)
#if defined __GNUC__ && !defined __OpenBSD__ && !(defined __APPLE__ && defined __BIG_ENDIAN__) && !defined(GEKKO) && !defined(__ANDROID__)
# define PRINTSTACKONSEGV 1
# include <execinfo.h>
#endif
@ -363,7 +358,7 @@ int32_t initsystem(void)
}
#endif
#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__ANDROID__)
//icon = loadtarga("icon.tga");
@ -719,7 +714,7 @@ void grabmouse(char a)
{
if (a != mousegrab)
{
#if !defined DEBUGGINGAIDS || defined __APPLE__
#if !defined __ANDROID__ && (!defined DEBUGGINGAIDS || defined __APPLE__)
SDL_GrabMode g;
g = SDL_WM_GrabInput(a ? SDL_GRAB_ON : SDL_GRAB_OFF);
@ -950,6 +945,7 @@ static int32_t sortmodes(const struct validmode_t *a, const struct validmode_t *
static char modeschecked=0;
void getvalidmodes(void)
{
int32_t i, j, maxx=0, maxy=0;
static int32_t cdepths[] =
{
8,
@ -966,7 +962,6 @@ void getvalidmodes(void)
pf.BitsPerPixel = 8;
pf.BytesPerPixel = 1;
#endif
int32_t i, j, maxx=0, maxy=0;
if (modeschecked || novideo) return;
@ -1838,7 +1833,7 @@ int32_t setgamma(void)
return i;
}
#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__ANDROID__)
extern struct sdlappicon sdlappicon;
static SDL_Surface *loadappicon(void)
{

45
polymer/eduke32/build/src/winlayer.c
View file

@ -135,11 +135,7 @@ static char taskswitching=1;
static OSVERSIONINFOEX osv;
#ifdef NEDMALLOC
extern int32_t largepagesavailable;
#else
static HMODULE nedhandle = NULL;
#endif
//-------------------------------------------------------------------------------------------------
@ -350,34 +346,6 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
return -1;
}
#ifdef NEDMALLOC
/* Attempt to enable SeLockMemoryPrivilege, 2003/Vista/7 only */
if (Bgetenv("BUILD_NOLARGEPAGES") == NULL &&
(osv.dwMajorVersion >= 6 || (osv.dwMajorVersion == 5 && osv.dwMinorVersion == 2)))
{
HANDLE token;
if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token))
{
TOKEN_PRIVILEGES privs;
privs.PrivilegeCount = 1;
if (LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &privs.Privileges[0].Luid))
{
privs.Privileges[0].Attributes=SE_PRIVILEGE_ENABLED;
if (!AdjustTokenPrivileges(token, FALSE, &privs, 0, NULL, NULL) || GetLastError() != S_OK)
{
// failure...
largepagesavailable = 0;
}
}
CloseHandle(token);
}
}
nedcreatepool(SYSTEM_POOL_SIZE, -1);
// atexit(neddestroysyspool);
#else
// don't want to mix msvcrt with msvcrtd!
#ifndef DEBUGGINGAIDS
if ((nedhandle = LoadLibrary("nedmalloc.dll")))
{
@ -387,7 +355,6 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
nedcreatepool(SYSTEM_POOL_SIZE, -1);
}
#endif
#endif
#ifdef DEBUGGINGAIDS
LoadLibraryA("ebacktrace1.dll");
@ -621,15 +588,7 @@ static void win_printversion(void)
initprintf("Windows %s (build %lu.%lu.%lu) %s", ver,
osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber, osv.szCSDVersion);
#ifdef NEDMALLOC
initprintf("\n");
if (largepagesavailable)
initprintf("Large page support available\n");
#else
initprintf(nedhandle ? "\nInitialized nedmalloc\n" : "\n");
#endif
}
@ -737,10 +696,6 @@ void uninitsystem(void)
#ifdef USE_OPENGL
unloadgldriver();
#endif
#ifndef NEDMALLOC
// if (nedhandle) FreeLibrary(nedhandle), nedhandle = NULL;
#endif
}

8
polymer/eduke32/eduke32.vcproj
View file

@ -144,10 +144,6 @@
RelativePath=".\build\include\mmulti.h"
>
</File>
<File
RelativePath=".\build\include\nedmalloc.h"
>
</File>
<File
RelativePath=".\build\include\osd.h"
>
@ -280,10 +276,6 @@
RelativePath=".\build\src\mdsprite.c"
>
</File>
<File
RelativePath=".\build\src\nedmalloc.c"
>
</File>
<File
RelativePath=".\build\src\osd.c"
>

6
polymer/eduke32/eduke32.vcxproj
View file

@ -92,7 +92,6 @@
<ClInclude Include="build\include\mdsprite.h" />
<ClInclude Include="build\include\mmulti.h" />
<ClInclude Include="build\include\mutex.h" />
<ClInclude Include="build\include\nedmalloc.h" />
<ClInclude Include="build\include\osd.h" />
<ClInclude Include="build\include\osxbits.h" />
<ClInclude Include="build\include\osxmain.h" />
@ -116,6 +115,7 @@
<ClInclude Include="source\gameexec.h" />
<ClInclude Include="source\gamevars.h" />
<ClInclude Include="source\global.h" />
<ClInclude Include="source\input.h" />
<ClInclude Include="source\m32def.h" />
<ClInclude Include="source\menus.h" />
<ClInclude Include="source\net.h" />
@ -200,7 +200,6 @@
<ClCompile Include="build\src\md4.c" />
<ClCompile Include="build\src\mdsprite.c" />
<ClCompile Include="build\src\mutex.c" />
<ClCompile Include="build\src\nedmalloc.c" />
<ClCompile Include="build\src\osd.c" />
<ClCompile Include="build\src\polymer.c" />
<ClCompile Include="build\src\polymost.c" />
@ -226,6 +225,7 @@
<ClCompile Include="source\gamevars.c" />
<ClCompile Include="source\global.c" />
<ClCompile Include="source\grpscan.c" />
<ClCompile Include="source\input.c" />
<ClCompile Include="source\m32def.c" />
<ClCompile Include="source\m32exec.c" />
<ClCompile Include="source\m32structures.c" />
@ -285,4 +285,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

14
polymer/eduke32/eduke32.vcxproj.filters
View file

@ -123,9 +123,6 @@
<ClInclude Include="build\include\mmulti.h">
<Filter>build\headers</Filter>
</ClInclude>
<ClInclude Include="build\include\nedmalloc.h">
<Filter>build\headers</Filter>
</ClInclude>
<ClInclude Include="build\include\osd.h">
<Filter>build\headers</Filter>
</ClInclude>
@ -390,6 +387,9 @@
<ClInclude Include="source\xdelta3\xdelta3-list.h">
<Filter>xdelta3\headers</Filter>
</ClInclude>
<ClInclude Include="source\input.h">
<Filter>eduke32\headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="build\src\a-c.c">
@ -443,9 +443,6 @@
<ClCompile Include="build\src\mdsprite.c">
<Filter>build\source</Filter>
</ClCompile>
<ClCompile Include="build\src\nedmalloc.c">
<Filter>build\source</Filter>
</ClCompile>
<ClCompile Include="build\src\osd.c">
<Filter>build\source</Filter>
</ClCompile>
@ -677,6 +674,9 @@
<ClCompile Include="source\xdelta3\xdelta3.c">
<Filter>xdelta3\source</Filter>
</ClCompile>
<ClCompile Include="source\input.c">
<Filter>eduke32\source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="Makefile.msvc">
@ -686,4 +686,4 @@
<Filter>build</Filter>
</None>
</ItemGroup>
</Project>
</Project>

BIN
polymer/eduke32/nedmalloc.dll
View file

Binary file not shown.