Give Windows builds a proper .exe suffix.
This commit is contained in:
1 parent
a05904b226
commit
5578ec0f69
2 files changed
+12
-5
No files matched your search
@@ -53,12 +53,19 @@ build/osx64%: CC='i686-apple-darwin10-gcc -m64'
|
|||||||
build/win32%: CC='i686-w64-mingw32-gcc -m32' EXTRA_CFLAGS=-DJQ_DEFAULT_ENABLE_COLOR=0
|
build/win32%: CC='i686-w64-mingw32-gcc -m32' EXTRA_CFLAGS=-DJQ_DEFAULT_ENABLE_COLOR=0
|
||||||
build/win64%: CC='x86_64-w64-mingw32-gcc -m64' EXTRA_CFLAGS=-DJQ_DEFAULT_ENABLE_COLOR=0
|
build/win64%: CC='x86_64-w64-mingw32-gcc -m64' EXTRA_CFLAGS=-DJQ_DEFAULT_ENABLE_COLOR=0
|
||||||
|
|
||||||
ALL_BINARIES=$(foreach platform, $(PLATFORMS), $(foreach binary, $(BINARIES), build/$(platform)/$(binary)))
|
BIN_SUFFIX_win32 = .exe
|
||||||
|
BIN_SUFFIX_win64 = .exe
|
||||||
|
|
||||||
|
ALL_BINARIES=\
|
||||||
|
$(foreach platform, $(PLATFORMS), \
|
||||||
|
$(foreach binary, $(BINARIES), \
|
||||||
|
build/$(platform)/$(binary)$(BIN_SUFFIX_$(platform))))
|
||||||
|
|
||||||
$(ALL_BINARIES): build/%:
|
$(ALL_BINARIES): build/%:
|
||||||
mkdir -p $(@D)
|
mkdir -p $(@D)
|
||||||
|
echo $(dir $*)
|
||||||
make -B $(BINARIES) CC=$(CC)
|
make -B $(BINARIES) CC=$(CC)
|
||||||
cp $(BINARIES) $(@D)
|
$(foreach binary, $(BINARIES), cp $(binary) $(@D)/$(binary)$(suffix $*);)
|
||||||
|
|
||||||
binaries: $(ALL_BINARIES)
|
binaries: $(ALL_BINARIES)
|
||||||
|
|
||||||
@@ -97,6 +104,6 @@ docs/output:
|
|||||||
cd docs; rake build
|
cd docs; rake build
|
||||||
|
|
||||||
www_binaries: docs/output binaries
|
www_binaries: docs/output binaries
|
||||||
$(foreach platform, $(PLATFORMS), $(foreach binary, $(BINARIES), \
|
$(foreach platform, $(PLATFORMS), \
|
||||||
mkdir -p docs/output/download/$(platform); \
|
mkdir -p docs/output/download/$(platform); \
|
||||||
cp build/$(platform)/$(binary) docs/output/download/$(platform)/$(binary); ))
|
cp build/$(platform)/* docs/output/download/$(platform)/; )
|
||||||
@@ -38,7 +38,7 @@ body:
|
|||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
|
||||||
* Executables for [64-bit](win64/jq) or [32-bit](win32/jq)
|
* Executables for [64-bit](win64/jq.exe) or [32-bit](win32/jq.exe)
|
||||||
|
|
||||||
### From source on Linux or OS X
|
### From source on Linux or OS X
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user