aboutsummaryrefslogtreecommitdiff
path: root/win32/Makefile
diff options
context:
space:
mode:
authorChristian Jullien <Christian Jullien>2017-07-25 17:50:28 +0200
committerChristian Jullien <Christian Jullien>2017-07-25 17:50:28 +0200
commit8258abeb80ce202f388c9ddb6e46f6d7d34678ea (patch)
treeef22f4499d6776e879bc002b8bb17660b43fcb76 /win32/Makefile
parent28b7c9b34ecd09afc6c1a36321aab59ebbd1c447 (diff)
downloadtinycc-8258abeb80ce202f388c9ddb6e46f6d7d34678ea.tar.gz
tinycc-8258abeb80ce202f388c9ddb6e46f6d7d34678ea.tar.bz2
Update Cygwin Makefile to work with recent changes about ONE_SOURCE and CONFG_TCCDIR
Diffstat (limited to 'win32/Makefile')
-rw-r--r--win32/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 0a342fd..ee43c2d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -9,7 +9,8 @@
CPU = $(shell if `gcc -v 2>&1 | grep Target | grep -q x86_64`; then echo 64; else echo 32; fi)
VERSION = $(shell cat ../VERSION)
BOOTCC = gcc
-CFLAGS = -s -static -fno-strict-aliasing -Wno-incompatible-pointer-types -DTCC_TARGET_PE -DONE_SOURCE
+CFLAGS = -s -static -fno-strict-aliasing -Wno-incompatible-pointer-types -DTCC_TARGET_PE
+WINPWD = `cygpath --mixed $(PWD)`
ifeq ($(CPU), 64)
NATIVE = -m$(CPU) -DTCC_TARGET_X86_64
@@ -39,6 +40,7 @@ pre:
@echo CONFIG_WIN32=yes 1>> ../config.mak
@echo TOPSRC=$$\(TOP\) 1>> ../config.mak
@echo "#define TCC_VERSION \"$(VERSION)\"" 1>../config.h
+ @echo "#define CONFIG_TCCDIR \"$(WINPWD)\"" 1>>../config.h
@echo "#ifdef TCC_TARGET_X86_64" 1>>../config.h
@echo "#define TCC_LIBTCC1 \"libtcc1-64.a\"" 1>>../config.h
@echo "#else" 1>>../config.h
@@ -102,10 +104,10 @@ PHONY += libs
rebuild:
@echo Rebuild using tcc itself - default $(TARGET)bits
- @./$(TARCH)-win32-tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DONE_SOURCE -o tcc.exe ../tcc.c
- @./tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DONE_SOURCE -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
- @./tcc -O2 -m32 -DTCC_TARGET_PE -DONE_SOURCE -DTCC_TARGET_I386 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe i386-win32-tcc.exe
- @./tcc -O2 -m$(TARGET) -DTCC_TARGET_PE -DONE_SOURCE -DTCC_TARGET_X86_64 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe x86_64-win32-tcc.exe
+ @./$(TARCH)-win32-tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -o tcc.exe ../tcc.c
+ @./tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
+ @./tcc -O2 -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe i386-win32-tcc.exe
+ @./tcc -O2 -m$(TARGET) -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe x86_64-win32-tcc.exe
PHONY += rebuild