Skip to content
Snippets Groups Projects
Commit 51121b83 authored by John Hodge's avatar John Hodge
Browse files

Usermode - Fixed GAS/NASM detection

parent dc8801cc
No related merge requests found
......@@ -5,7 +5,7 @@
MAKEDEP = $(CC) -M
ASFLAGS += -D ARCHDIR=$(ARCHDIR)
ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
CPPFLAGS := -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
CFLAGS := -g -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
LDFLAGS := -g -nostdlib -shared -I/Acess/Libs/ld-acess.so -e SoMain -x -L$(OUTPUTDIR)Libs/
......@@ -47,7 +47,11 @@ $(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
@echo [AS] -o $@
@mkdir -p $(dir $@)
@$(AS) $(ASFLAGS) -o $@ $<
ifeq ($(ASSUFFIX),S)
@$(AS) $(ASFLAGS) -o $@.dep $< -M
else
@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
endif
#$(OUTPUTDIR)Libs/libld-acess.so:
# @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
......
......@@ -34,5 +34,5 @@ $(_XBIN): $(_OBJPREFIX)_stublib.o
$(_OBJPREFIX)%: %.h
@echo [CPP] -o $@
@mkdir -p $(dir $@)
@$(CPP) $(CPPFLAGS) -P -D__ASM__ $< -o $@
@$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment