d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rr--upx-fix'

This commit is contained in:
Tony Theodore 2016-08-17 09:32:35 +10:00
parent 212203d3c8 8a17e67350
commit b0d7637c84
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/gcc6/README.md
View File

@ -65,6 +65,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)].
| smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) |
| smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) |
| ucl | all | [0ac2a77](https://github.com/mxe/mxe/commit/0ac2a77) |
| upx | all | [f907a06](https://github.com/mxe/mxe/commit/f907a06) |
| vtk | static (all) | - |
| vtk6 | all | - |
| wxwidgets | static (all) | [6869e3b](https://github.com/mxe/mxe/commit/6869e3b) |

4
src/upx.mk
View File

@ -47,7 +47,9 @@ define $(PKG)_BUILD_$(BUILD)
'CC=$(BUILD_CC)' \
'PKG_CONFIG=$(PREFIX)/$(BUILD)/bin/pkgconf' \
'LIBS=-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \
$(shell [ `uname -s` == Darwin ] && echo "CXXFLAGS='-Wno-error=unused-local-typedef'") \
$(shell [ `uname -s` == Darwin ] && \
echo "CXXFLAGS=-Wno-error=unused-local-typedefs -Wno-error=misleading-indentation" || \
echo "CXXFLAGS=-Wno-error=misleading-indentation") \
'exeext='
cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/'
endef