LIV2/libnix
1
0
Fork 0
mirror of https://github.com/LIV2/libnix.git synced 2025-12-06 00:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

use provided CFLAGS, do direct compile in nix

Browse Source
This commit is contained in:
bebbo 2018-12-02 18:55:58 +01:00
parent 2366f2a9cc
commit fade3d2b6a
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile.in
View File

@ -12,6 +12,8 @@
#### Start of system configuration section. ####
CFLAGS = @CFLAGS@
srcdir = @srcdir@
VPATH = @srcdir@
@ -40,23 +42,21 @@ MAK2=$(MAKE) -f $(CURDIR)/sources/Makefile
#SUBDIRS=startup lib libb lib020 libb020 lib881 libb881 libb32 libb32881 #lib060 libb060 libb32060
SUBDIRS=startup lib libb lib020 libb020 libb32
CF ?= -Wall -Os -fomit-frame-pointer
all: $(SUBDIRS)
cd sources; $(MAKE) filelists
cd startup; $(MAKE) -f $(CURDIR)/sources/startup/Makefile V="$(V)"
cd lib; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul"
cd libb; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel -DSMALL_DATA"
cd lib020; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -m68020"
cd libb020; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel -DSMALL_DATA -m68020"
cd libb32; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel32 -DSMALL_DATA -m68020"
# cd lib881; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -m68020 -m68881"
# cd libb881; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel -DSMALL_DATA -m68020 -m68881"
# cd lib060; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -m68060 -m68881"
# cd libb060; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel -DSMALL_DATA -m68060 -m68881"
# cd libb32881; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel32 -DSMALL_DATA -m68020 -m68881"
# cd libb32060; $(MAK2) V="$(V)" CFLAGS="$(CF) -noixemul -fbaserel32 -DSMALL_DATA -m68060 -m68881"
# cd libix; $(MAK2) V="$(V)" CFLAGS="$(CF) -DIXPATHS"
cd lib; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul"
cd libb; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel -DSMALL_DATA"
cd lib020; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -m68020"
cd libb020; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel -DSMALL_DATA -m68020"
cd libb32; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel32 -DSMALL_DATA -m68020"
# cd lib881; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -m68020 -m68881"
# cd libb881; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel -DSMALL_DATA -m68020 -m68881"
# cd lib060; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -m68060 -m68881"
# cd libb060; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel -DSMALL_DATA -m68060 -m68881"
# cd libb32881; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel32 -DSMALL_DATA -m68020 -m68881"
# cd libb32060; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -noixemul -fbaserel32 -DSMALL_DATA -m68060 -m68881"
# cd libix; $(MAK2) V="$(V)" CFLAGS="$(CFLAGS) -DIXPATHS"
$(SUBDIRS):
mkdir $@
@ -66,11 +66,11 @@ libamiga:
if [ ! -d libb ] ; then mkdir libb ; else true ; fi
if [ ! -d libb32 ] ; then mkdir libb32 ; else true ; fi
cd sources; $(MAK2) filelists
cd lib; $(MAK2) libamiga CFLAGS="$(CF) -noixemul"
cd libb; $(MAK2) libamiga CFLAGS="$(CF) -noixemul -fbaserel"
cd lib020; $(MAK2) libamiga CFLAGS="$(CF) -noixemul -m68020"
cd libb020; $(MAK2) libamiga CFLAGS="$(CF) -noixemul -fbaserel -DSMALL_DATA -m68020"
cd libb32; $(MAK2) libamiga CFLAGS="$(CF) -noixemul -fbaserel32 -m68020"
cd lib; $(MAK2) libamiga CFLAGS="$(CFLAGS) -noixemul"
cd libb; $(MAK2) libamiga CFLAGS="$(CFLAGS) -noixemul -fbaserel"
cd lib020; $(MAK2) libamiga CFLAGS="$(CFLAGS) -noixemul -m68020"
cd libb020; $(MAK2) libamiga CFLAGS="$(CFLAGS) -noixemul -fbaserel -DSMALL_DATA -m68020"
cd libb32; $(MAK2) libamiga CFLAGS="$(CFLAGS) -noixemul -fbaserel32 -m68020"
clean:
cd lib; $(MAK2) clean

6
sources/nix/Makefile.in
View File

@ -32,11 +32,7 @@ REDEF=-D_DOSBase=___DOSBase \
SUBDIRSP=$(patsubst %,%/.created,$(SUBDIRS))
%.o: %.c $(SUBDIRSP)
$(CC) $(OPTIONS) -S $(filter-out $(SUBDIRSP), $^) -o $*.S 2>&1|tee $*.err
$(CPP) -traditional $(REDEF) $*.S -o $*__2.S
$(CC) $(OPTIONS) $*__2.S -c -o $*.o
-rm $*.S $*__2.S
-if test ! -s $*.err; then rm $*.err; fi
$(CC) $(OPTIONS) -c $(filter-out $(SUBDIRSP), $^) -o $*.o
.PHONY: all clean veryclean