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

Fix compiling the Build tools by:

Browse source 
- 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:
hendricks266 2012-03-12 04:47:49 +00:00
parent 858746d081
commit d0e0738f4f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/Makefile
View file

@ -16,7 +16,8 @@ include ../Makefile.common
ifneq ($(DXROOT_OVERRIDE),) ifneq ($(DXROOT_OVERRIDE),)
DXROOT=$(DXROOT_OVERRIDE) DXROOT=$(DXROOT_OVERRIDE)
else else
DXROOT=c:/sdks/directx/dx61 DXROOT=../sdk/dx
#DXROOT=c:/sdks/directx/dx8
endif endif
FMODROOTWIN=c:/sdks/fmodapi374win/api 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 \ 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 $(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) # all: $(OBJ)/$(ENGINELIB) $(OBJ)/$(EDITORLIB)
utils: $(UTILS) utils: $(UTILS)
@ -271,6 +272,7 @@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp
clean: clean:
-rm -f $(OBJ)/* -rm -f $(OBJ)/*
echo -n "" > $(OBJ)/keep.me
cleanutils: cleanutils:
-rm -f $(UTILS) $(UTILOBJS) -rm -f $(UTILS) $(UTILOBJS)

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

@ -809,12 +809,14 @@ uint32_t Bgetsysmemsize(void)
if (aGlobalMemoryStatusEx(&memst)) if (aGlobalMemoryStatusEx(&memst))
siz = (uint32_t)min(UINT_MAX, memst.ullTotalPhys); siz = (uint32_t)min(UINT_MAX, memst.ullTotalPhys);
} }
/*
else else
{ {
// Yeah, there's enough Win9x hatred here that a perfectly good workaround // 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. // 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); FreeLibrary(lib);
} }