* define CONFIG_WIN64=yes when ARCH=x86-64 (not CONFIG_WIN32=yes) * CONFIG_WIN64 now use a windows install part (not a Linux one)
Unified · Split
| @@ -271,10 +271,17 @@ else · 270 unmodified lines | |||
| 271 | INSTALLBIN=$(INSTALL) | 271 | INSTALLBIN=$(INSTALL) |
| 272 | endif | 272 | endif |
| 273 | 273 | ||
| 274 | ifdef CONFIG_WIN32 | ||
| 275 | CONFIG_WIN=yes | ||
| 276 | endif | ||
| 277 | ifdef CONFIG_WIN64 | ||
| 278 | CONFIG_WIN=yes | ||
| 279 | endif | ||
| 280 | |||
| 274 | install-strip: install | 281 | install-strip: install |
| 275 | strip $(foreach PROG,$(PROGS),"$(bindir)"/$(PROG)) | 282 | strip $(foreach PROG,$(PROGS),"$(bindir)"/$(PROG)) |
| 276 | 283 | ||
| 277 | ifndef CONFIG_WIN32 | 284 | ifndef CONFIG_WIN |
| 278 | install: $(PROGS) $(TCCLIBS) $(TCCDOCS) | 285 | install: $(PROGS) $(TCCLIBS) $(TCCDOCS) |
| 279 | mkdir -p "$(bindir)" | 286 | mkdir -p "$(bindir)" |
| 280 | $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" | 287 | $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" |
| @@ -520,8 +520,13 @@ if test "$noldl" = "yes" ; then · 519 unmodified lines | |||
| 520 | echo "CONFIG_NOLDL=yes" >> config.mak | 520 | echo "CONFIG_NOLDL=yes" >> config.mak |
| 521 | fi | 521 | fi |
| 522 | if test "$mingw32" = "yes" ; then | 522 | if test "$mingw32" = "yes" ; then |
| 523 | echo "CONFIG_WIN32=yes" >> config.mak | 523 | if test "$cpu" = "x86-64"; then |
| 524 | echo "#define CONFIG_WIN32 1" >> $TMPH | 524 | echo "CONFIG_WIN64=yes" >> config.mak |
| 525 | echo "#define CONFIG_WIN64 1" >> $TMPH | ||
| 526 | else | ||
| 527 | echo "CONFIG_WIN32=yes" >> config.mak | ||
| 528 | echo "#define CONFIG_WIN32 1" >> $TMPH | ||
| 529 | fi | ||
| 525 | fi | 530 | fi |
| 526 | if test "$cygwin" = "yes" ; then | 531 | if test "$cygwin" = "yes" ; then |
| 527 | echo "#ifndef _WIN32" >> $TMPH | 532 | echo "#ifndef _WIN32" >> $TMPH |
| @@ -68,7 +68,7 @@ else · 67 unmodified lines | |||
| 68 | ifeq "$(TARGET)" "x86_64-win" | 68 | ifeq "$(TARGET)" "x86_64-win" |
| 69 | OBJ = $(addprefix $(DIR)/,$(WIN64_O)) | 69 | OBJ = $(addprefix $(DIR)/,$(WIN64_O)) |
| 70 | TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE | 70 | TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE |
| 71 | XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include | 71 | XCC ?= $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include |
| 72 | XAR ?= $(DIR)/tiny_libmaker$(EXESUF) | 72 | XAR ?= $(DIR)/tiny_libmaker$(EXESUF) |
| 73 | PICFLAGS = | 73 | PICFLAGS = |
| 74 | else | 74 | else |