diff --git a/.gitignore b/.gitignore index 9a2fa80..163041f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ lib/ CMakeLists.txt .idea/ cmake-build-debug/ +share/libfunctionpatcher.ld diff --git a/Makefile b/Makefile index 8ed0750..804aa2a 100644 --- a/Makefile +++ b/Makefile @@ -99,10 +99,10 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ .PHONY: all dist-bin dist-src dist install clean #--------------------------------------------------------------------------------- -all: lib/libfunctionpatcher.a +all: lib/libfunctionpatcher.a share/libfunctionpatcher.ld dist-bin: all - @tar --exclude=*~ -cjf libfunctionpatcher-$(VERSION).tar.bz2 include lib + @tar --exclude=*~ -cjf libfunctionpatcher-$(VERSION).tar.bz2 include lib share dist-src: @tar --exclude=*~ -cjf libfunctionpatcher-src-$(VERSION).tar.bz2 include source Makefile @@ -115,9 +115,15 @@ install: dist-bin lib: @[ -d $@ ] || mkdir -p $@ + +share: + @[ -d $@ ] || mkdir -p $@ release: @[ -d $@ ] || mkdir -p $@ + +share/libfunctionpatcher.ld :$(SOURCES) $(INCLUDES) | share release + mv $(CURDIR)/release/*.ld $(CURDIR)/$@ lib/libfunctionpatcher.a :$(SOURCES) $(INCLUDES) | lib release @$(MAKE) BUILD=release OUTPUT=$(CURDIR)/$@ \ @@ -146,7 +152,7 @@ $(OFILES_SRC) : $(HFILES) #--------------------------------------------------------------------------------- %.o: %.def $(SILENTMSG) $(notdir $<) - $(SILENTCMD)rplimportgen $< $*.s --forceSingleSection $(ERROR_FILTER) + $(SILENTCMD)rplimportgen $< $*.s $*.ld $(ERROR_FILTER) $(SILENTCMD)$(CC) -x assembler-with-cpp $(ASFLAGS) -c $*.s -o $@ $(ERROR_FILTER) #---------------------------------------------------------------------------------