software-archive/jwasm
2
Fork 0
mirror of https://github.com/NishiOwO/JWasm.git synced 2025-04-21 08:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OSX build

Browse Source
This commit is contained in:
pancake 2015-11-04 22:58:46 +01:00
parent 3b4ec5258f
commit 43f233cd6a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GccUnix.mak
View File

@ -41,7 +41,7 @@ $(OUTD):
$(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj) $(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj)
ifeq ($(DEBUG),0) ifeq ($(DEBUG),0)
$(CC) $(OUTD)/main.o $(proj_obj) -s -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map $(CC) $(OUTD)/main.o $(proj_obj) -s -o $@
else else
$(CC) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map $(CC) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
endif endif
@ -55,7 +55,7 @@ $(OUTD)/reswords.o: reswords.c H/instruct.h H/special.h H/directve.h H/opndcls.h
###### ######
clean: clean:
rm $(OUTD)/$(TARGET1) rm -f $(OUTD)/$(TARGET1)
rm $(OUTD)/*.o rm -f $(OUTD)/*.o
rm $(OUTD)/*.map rm -f $(OUTD)/*.map

2
H/memalloc.h
View File

@ -46,8 +46,10 @@ extern void MemFree( void *ptr );
#define myalloca alloca #define myalloca alloca
#ifndef __FreeBSD__ /* added v2.08 */ #ifndef __FreeBSD__ /* added v2.08 */
#ifndef __APPLE__
#include <malloc.h> /* added v2.07 */ #include <malloc.h> /* added v2.07 */
#endif #endif
#endif
#elif defined(__PCC__) #elif defined(__PCC__)