diff options
| author | grischka <grischka> | 2017-04-25 21:01:54 +0200 |
|---|---|---|
| committer | grischka <grischka> | 2017-04-25 21:01:54 +0200 |
| commit | 7acf9aa86275a24b468786d6ea9f308ae33f011c (patch) | |
| tree | 5bc1c65e4a894185de1d45456d662e7b1297fa25 /lib/Makefile | |
| parent | fb4f57666cf23aa94d6ef421383013e6a0dc12cc (diff) | |
| download | tinycc-7acf9aa86275a24b468786d6ea9f308ae33f011c.tar.gz tinycc-7acf9aa86275a24b468786d6ea9f308ae33f011c.tar.bz2 | |
final adjustments for release
- configure/Makefiles: minor adjustments
- build-tcc.bat: add -static to gcc options
(avoids libgcc_s*.dll dependency with some mingw versions)
- tccpe.c/tcctools.c: eliminate MAX_PATH
(not available for cross compilers)
- tccasm.c: use uint64_t/strtoull in unary()
(unsigned long sometimes is only uint32_t, as always on windows)
- tccgen.c: Revert (f077d16c) "tccgen: gen_cast: cast FLOAT to DOUBLE"
Was a rather experimental, tentative commit, not really necessary
and somewhat ugly too.
- cleanup recent osx support:
- Makefile/libtcc.c: cleanup copy&paste code
- tccpp.c: restore deleted function
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/Makefile b/lib/Makefile index 2ac3126..00ab7dc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -7,6 +7,7 @@ include $(TOP)/Makefile VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib T = $(or $(CROSS_TARGET),$(NATIVE_TARGET),unknown) X = $(if $(CROSS_TARGET),$(CROSS_TARGET)-) +BIN = $(TOP)/libtcc1$(if $(CROSS_TARGET),-$(CROSS_TARGET)).a TCC = $(TOP)/$(X)tcc$(EXESUF) XCC = $(TCC) @@ -25,25 +26,24 @@ ifeq ($(X),) endif endif -ifeq ($(TARGETOS),Darwin) +ifdef CONFIG_OSX XFLAGS += -D_ANSI_SOURCE - BCHECK_O = endif ifeq ($(CONFIG_musl),yes) BCHECK_O = endif -I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O) -X86_64_O = libtcc1.o alloca86_64.o alloca86_64-bt.o $(BCHECK_O) +I386_O = libtcc1.o alloca86.o alloca86-bt.o +X86_64_O = libtcc1.o alloca86_64.o alloca86_64-bt.o ARM_O = libtcc1.o armeabi.o alloca-arm.o ARM64_O = lib-arm64.o WIN_O = crt1.o crt1w.o wincrt1.o wincrt1w.o dllcrt1.o dllmain.o -OBJ-i386 = $(I386_O) +OBJ-i386 = $(I386_O) $(BCHECK_O) TGT-i386 = -DTCC_TARGET_I386 -OBJ-x86_64 = $(X86_64_O) +OBJ-x86_64 = $(X86_64_O) $(BCHECK_O) TGT-x86_64 = -DTCC_TARGET_X86_64 OBJ-x86_64-osx = $(X86_64_O) @@ -55,17 +55,15 @@ TGT-arm = -DTCC_TARGET_ARM OBJ-arm64 = $(ARM64_O) TGT-arm64 = -DTCC_TARGET_ARM64 -OBJ-i386-win32 = $(I386_O) chkstk.o $(WIN_O) +OBJ-i386-win32 = $(I386_O) chkstk.o bcheck.o $(WIN_O) TGT-i386-win32 = -DTCC_TARGET_I386 -DTCC_TARGET_PE -OBJ-x86_64-win32 = $(X86_64_O) chkstk.o $(WIN_O) +OBJ-x86_64-win32 = $(X86_64_O) chkstk.o bcheck.o $(WIN_O) TGT-x86_64-win32 = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE OBJ-arm-wince = $(ARM_O) $(WIN_O) TGT-arm-wince = -DTCC_TARGET_ARM -DTCC_TARGET_PE -all : $(BIN) - $(BIN) : $(patsubst %.o,$(X)%.o,$(OBJ-$T)) $(XAR) rcs $@ $^ |