mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Fix compiling the Build tools by:
- Adding $(EXESUFFIX) where it belongs in the Makefile. - Eliminating a call to initprintf() from compat.c. This may not be ideal. git-svn-id: https://svn.eduke32.com/eduke32@2457 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
858746d081
commit
d0e0738f4f
2 changed files with 7 additions and 3 deletions
|
@ -16,7 +16,8 @@ include ../Makefile.common
|
|||
ifneq ($(DXROOT_OVERRIDE),)
|
||||
DXROOT=$(DXROOT_OVERRIDE)
|
||||
else
|
||||
DXROOT=c:/sdks/directx/dx61
|
||||
DXROOT=../sdk/dx
|
||||
#DXROOT=c:/sdks/directx/dx8
|
||||
endif
|
||||
FMODROOTWIN=c:/sdks/fmodapi374win/api
|
||||
|
||||
|
@ -172,7 +173,7 @@ OURCFLAGS+= $(BUILDCFLAGS)
|
|||
|
||||
UTILOBJS=$(OBJ)/kextract.$o $(OBJ)/kgroup.$o $(OBJ)/transpal.$o $(OBJ)/wad2art.$o $(OBJ)/wad2map.$o $(OBJ)/md2tool.$o \
|
||||
$(OBJ)/compat.$o $(OBJ)/pragmas.$o
|
||||
UTILS=kextract kgroup transpal wad2art wad2map md2tool
|
||||
UTILS=kextract$(EXESUFFIX) kgroup$(EXESUFFIX) transpal$(EXESUFFIX) wad2art$(EXESUFFIX) wad2map$(EXESUFFIX) md2tool$(EXESUFFIX)
|
||||
|
||||
# all: $(OBJ)/$(ENGINELIB) $(OBJ)/$(EDITORLIB)
|
||||
utils: $(UTILS)
|
||||
|
@ -271,6 +272,7 @@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp
|
|||
|
||||
clean:
|
||||
-rm -f $(OBJ)/*
|
||||
echo -n "" > $(OBJ)/keep.me
|
||||
|
||||
cleanutils:
|
||||
-rm -f $(UTILS) $(UTILOBJS)
|
||||
|
|
|
@ -809,12 +809,14 @@ uint32_t Bgetsysmemsize(void)
|
|||
if (aGlobalMemoryStatusEx(&memst))
|
||||
siz = (uint32_t)min(UINT_MAX, memst.ullTotalPhys);
|
||||
}
|
||||
/*
|
||||
else
|
||||
{
|
||||
// Yeah, there's enough Win9x hatred here that a perfectly good workaround
|
||||
// has been replaced by an error message. Oh well, we don't support 9x anyway.
|
||||
initprintf("Bgetsysmemsize(): error determining system memory size!\n");
|
||||
// initprintf("Bgetsysmemsize(): error determining system memory size!\n");
|
||||
}
|
||||
*/
|
||||
|
||||
FreeLibrary(lib);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue