[pango] MSVC Builds: Rename testsrules_msvc.mak
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] MSVC Builds: Rename testsrules_msvc.mak
- Date: Fri, 4 Sep 2015 10:08:53 +0000 (UTC)
commit c0e56e5af9e00137de1eb603ac1625332176f407
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Sep 4 18:08:46 2015 +0800
MSVC Builds: Rename testsrules_msvc.mak
Rename this to detectenv-msvc.mak to be consistent with the other GNOME
projects that support MSVC builds, and clean that file up a bit.
build/Makefile.am | 2 +-
build/{testsrules_msvc.mak => detectenv-msvc.mak} | 7 -------
build/pango-introspection-msvc.mak | 3 +--
3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/build/Makefile.am b/build/Makefile.am
index 0ca470b..d562d7a 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = win32
EXTRA_DIST = \
pango-introspection-msvc.mak \
introspection-msvc.mak \
- testsrules_msvc.mak \
+ detectenv-msvc.mak \
gen-file-list-pango.py
-include $(top_srcdir)/git.mk
diff --git a/build/testsrules_msvc.mak b/build/detectenv-msvc.mak
similarity index 92%
rename from build/testsrules_msvc.mak
rename to build/detectenv-msvc.mak
index 1f4669e..020548a 100644
--- a/build/testsrules_msvc.mak
+++ b/build/detectenv-msvc.mak
@@ -63,10 +63,3 @@ LDFLAGS_ARCH = /machine:x64
!else
LDFLAGS_ARCH = /machine:x86
!endif
-
-LD = link.exe
-LD_CFLAGS = /link
-EXEEXT = .exe
-GLIB_LIBS = gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib
-
-PANGO_API_VERSION = 1.0
diff --git a/build/pango-introspection-msvc.mak b/build/pango-introspection-msvc.mak
index 0237626..52ec806 100644
--- a/build/pango-introspection-msvc.mak
+++ b/build/pango-introspection-msvc.mak
@@ -1,6 +1,6 @@
# NMake Makefile to build Introspection Files for Pango
-!include testsrules_msvc.mak
+!include detectenv-msvc.mak
APIVERSION = 1.0
@@ -32,7 +32,6 @@ install-introspection: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).t
!endif
setbuildenv:
- @set CC=$(CC)
@set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
@set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH)
@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]