[cogl/cogl-latest-win] NMake: Fix building cogl-crate on VS2008 x64
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-latest-win] NMake: Fix building cogl-crate on VS2008 x64
- Date: Tue, 19 Oct 2021 10:04:28 +0000 (UTC)
commit 28c2ab5d6ebedb35c309da348c28087be5bc0574
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Oct 19 18:03:13 2021 +0800
NMake: Fix building cogl-crate on VS2008 x64
Due to a bug in the optimizer, the link hangs when building cogl-crate
on Visual Studio 2008 x64. Fix this by using /O1 instead of /O2 when
building cogl-crate on VS2008 x64.
build/win32/build-rules-msvc.mak | 6 ++++++
build/win32/config-msvc.mak | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/build-rules-msvc.mak b/build/win32/build-rules-msvc.mak
index 2b09284c..cc4e0f97 100644
--- a/build/win32/build-rules-msvc.mak
+++ b/build/win32/build-rules-msvc.mak
@@ -116,6 +116,12 @@ $**
$<
<<
+!if "$(VSVER)" == "9" && "$(PLAT)" == "x64"
+vs$(PDBVER)\$(CFG)\$(PLAT)\cogl-examples\cogl-crate.obj: ..\..\examples\cogl-crate.c
+ @if not exist $(@D)\ md $(@D)
+ $(CC) $(CFLAGS:/O2=/O1) $(COGL_EXAMPLE_BASE_CFLAGS) $(COGL_PUB_INCLUDES) /Fo$(@D)\ /Fd$(@D)\
..\..\examples\cogl-crate.c /c
+!endif
+
vs$(PDBVER)\$(CFG)\$(PLAT)\cogl\cogl.res: ..\..\cogl\cogl.rc
vs$(PDBVER)\$(CFG)\$(PLAT)\cogl-pango\cogl-pango.res: ..\..\cogl-pango\cogl-pango.rc
diff --git a/build/win32/config-msvc.mak b/build/win32/config-msvc.mak
index cc27f766..56235141 100644
--- a/build/win32/config-msvc.mak
+++ b/build/win32/config-msvc.mak
@@ -214,7 +214,6 @@ COGL_BUILT_LIBS = \
$(COGL_BUILT_LIBS) \
$(COGL_PANGO_LIB)
-!if $(VSVER) != 9 || "$(PLAT)" != "x64"
COGL_EXAMPLE_PROGS = \
$(COGL_EXAMPLE_PROGS) \
vs$(PDBVER)\$(CFG)\$(PLAT)\cogl-crate.exe
@@ -222,7 +221,6 @@ COGL_EXAMPLE_PROGS = \
COGL_EXAMPLE_DEP_LIBS = \
$(COGL_EXAMPLE_DEP_LIBS) \
$(LIBCOGL_PANGO_DEP_LIBS)
-!endif
!ifdef INTROSPECTION
COGL_INTROSPECTION_TYPELIBS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]