diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg index f9e3d672c49f718ac7f35cab7eeead961bff1557..a9b0191942becaef6bd5e6c355d264d111020d4b 100644 --- a/Usermode/Libraries/Makefile.cfg +++ b/Usermode/Libraries/Makefile.cfg @@ -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/ diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl index adf1c7eca34e9007e0e144d8e4cb44b9aa2b8f9b..47acb8003c2c225d095e30d446925e2ec8a11422 100644 --- a/Usermode/Libraries/Makefile.tpl +++ b/Usermode/Libraries/Makefile.tpl @@ -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/ diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile index 2a7a1862cdf645b89fe7eabb52a1be80e5c18c01..178b75e3117e40e16239f75826deb613b3beb2c7 100644 --- a/Usermode/Libraries/ld-acess.so_src/Makefile +++ b/Usermode/Libraries/ld-acess.so_src/Makefile @@ -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 $@