[mingw-angleproject] Set the environment variables before running gyp
Erik van Pienbroek
epienbro at fedoraproject.org
Fri Apr 5 21:42:55 UTC 2013
commit fb8bed73d166224628aa166b261a5c4f84586ec4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Apr 5 23:42:50 2013 +0200
Set the environment variables before running gyp
mingw-angleproject.spec | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/mingw-angleproject.spec b/mingw-angleproject.spec
index 484643e..89f0388 100644
--- a/mingw-angleproject.spec
+++ b/mingw-angleproject.spec
@@ -162,22 +162,20 @@ unset RPM_OPT_FLAGS
for target in win32 win64 ; do
mkdir build_$target
pushd build_$target
- gyp -D OS=win -D TARGET=$target --depth . -I ../build/common.gypi ../src/build_angle.gyp
-
- # Make sure the correct libraries are linked in
- sed -i s@'^LIBS :='@'LIBS := -ld3d9'@ ../src/libGLESv2.target.mk
- sed -i s@'^LIBS :='@'LIBS := -ld3d9 -ldxguid -L. -lGLESv2'@ ../src/libEGL.target.mk
-
if [ "$target" = "win32" ] ; then
- export CC=%{mingw32_cxx}
export CXX=%{mingw32_cxx}
export AR=%{mingw32_ar}
else
- export CC=%{mingw64_cxx}
export CXX=%{mingw64_cxx}
export AR=%{mingw64_ar}
fi
+ gyp -D OS=win -D TARGET=$target --depth . -I ../build/common.gypi ../src/build_angle.gyp
+
+ # Make sure the correct libraries are linked in
+ sed -i s@'^LIBS :='@'LIBS := -ld3d9'@ ../src/libGLESv2.target.mk
+ sed -i s@'^LIBS :='@'LIBS := -ld3d9 -ldxguid -L. -lGLESv2'@ ../src/libEGL.target.mk
+
make %{?_smp_mflags} V=1 CXXFLAGS="-std=c++11 -msse2 -DUNICODE -D_UNICODE"
# Also build static libraries (which are needed by the static Qt build)
More information about the scm-commits
mailing list