status-im
/
status-conan
mirror of https://github.com/status-im/status-conan.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove _WIN32_WINNT and WINVER definitions from MXE toolchain package

This commit is contained in:
Pedro Pombeiro 2018-11-14 21:44:45 +01:00
parent ff7778cf2a
commit 47a1b8264c
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mxetoolchain-x86_64-w64-mingw32/conanfile.py
View File

@ -125,8 +125,8 @@ class MXEToolchainx8664w64mingw32Conan(ConanFile):
# Add the compiler dir to the PATH
self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
self.env_info.CC = "%s-gcc" % self.target_tuple()
self.env_info.CFLAGS = "-U_WIN32_WINNT -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_UNICODE -DUNICODE -Os"
self.env_info.CFLAGS = "-D_UNICODE -DUNICODE -Os"
self.env_info.CXX = "%s-g++" % self.target_tuple()
self.env_info.CXXFLAGS = "-U_WIN32_WINNT -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_UNICODE -DUNICODE -Os"
self.env_info.CXXFLAGS = "-D_UNICODE -DUNICODE -Os"
self.env_info.WINDRES = "%s-windres" % self.target_tuple()
self.env_info.STATUS_TRIPLE = self.target_tuple()

4
profiles/status-mxe-mingw32-x86_64-gcc55-libstdcxx.in
View File

@ -21,8 +21,8 @@ STATUS_TRIPLE=$_STATUS_GCC_TRIPLE_NAME
STATUS_TRIPLE_PATH=$_STATUS_TRIPLE_PATH
CC=x86_64-w64-mingw32.shared-gcc
CXX=x86_64-w64-mingw32.shared-g++
CFLAGS=-U_WIN32_WINNT -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_UNICODE -DUNICODE -Os
CXXFLAGS=-U_WIN32_WINNT -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_UNICODE -DUNICODE -Os
CFLAGS=-D_UNICODE -DUNICODE -Os
CXXFLAGS=-D_UNICODE -DUNICODE -Os
LDFLAGS=-L$_STATUS_TRIPLE_PATH/lib
LC_CTYPE=C
LC_ALL=C