History

Update Cygwin Makefile to work with recent changes about ONE_SOURCE and CONFG_TCCDIR

Christian Jullien committed 9 years ago

Commit 8258abe1 parent 28b7c9b1 file · +7 −5Browse files

Unified · Split

win32/Makefile+7−5
@@ -9,7 +9,8 @@ · 8 unmodified lines
99 CPU = $(shell if `gcc -v 2>&1 | grep Target | grep -q x86_64`; then echo 64; else echo 32; fi)
1010 VERSION = $(shell cat ../VERSION)
1111 BOOTCC = gcc
12−CFLAGS = -s -static -fno-strict-aliasing -Wno-incompatible-pointer-types -DTCC_TARGET_PE -DONE_SOURCE
12+CFLAGS = -s -static -fno-strict-aliasing -Wno-incompatible-pointer-types -DTCC_TARGET_PE
13+WINPWD = `cygpath --mixed $(PWD)`
1314
1415 ifeq ($(CPU), 64)
1516 NATIVE = -m$(CPU) -DTCC_TARGET_X86_64
@@ -39,6 +40,7 @@ pre: · 23 unmodified lines
3940 @echo CONFIG_WIN32=yes 1>> ../config.mak
4041 @echo TOPSRC=$$\(TOP\) 1>> ../config.mak
4142 @echo "#define TCC_VERSION \"$(VERSION)\"" 1>../config.h
43+ @echo "#define CONFIG_TCCDIR \"$(WINPWD)\"" 1>>../config.h
4244 @echo "#ifdef TCC_TARGET_X86_64" 1>>../config.h
4345 @echo "#define TCC_LIBTCC1 \"libtcc1-64.a\"" 1>>../config.h
4446 @echo "#else" 1>>../config.h
@@ -102,10 +104,10 @@ PHONY += libs · 57 unmodified lines
102104
103105 rebuild:
104106 @echo Rebuild using tcc itself - default $(TARGET)bits
105− @./$(TARCH)-win32-tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DONE_SOURCE -o tcc.exe ../tcc.c
106− @./tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DONE_SOURCE -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
107− @./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
108− @./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
107+ @./$(TARCH)-win32-tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -o tcc.exe ../tcc.c
108+ @./tcc -O2 $(TFLAGS) -DTCC_TARGET_PE -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
109+ @./tcc -O2 -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe i386-win32-tcc.exe
110+ @./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
109111
110112 PHONY += rebuild
111113

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t