summaryrefslogtreecommitdiff
path: root/Makefile-msvcproj.am
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-01-20 16:30:22 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-01-20 16:30:22 +0800
commit39703440cfd4e7949708266270e447b7b22c9347 (patch)
treecfa236428be0cf0467ea9684fb19555339043c88 /Makefile-msvcproj.am
parent9c2a45a635d9cd6ac752245be4af6d3f00212349 (diff)
downloadgobject-introspection-39703440cfd4e7949708266270e447b7b22c9347.tar.gz
Rework The Visual Studio 2008 Build Process
This patch makes the build of G-I on Visual Studio 2008 into a two-step process, as it would make it clearer and easier to the one building G-I by: -Splitting up the property sheets into multiple parts, where pre-configured code (which is currently shipped with the tarball) is copied using custom build steps, so that they can be re-copied when they are updated. This also removes the need for setting environment variables before launching the Visual Studio Project to build the G-I DLL, the tools written in C and the _giscanner Python2 module. The Python2 paths (set to Python 2.7.x) are now set in a property sheet, which can be updated quite easily, if needed. -Use a set of NMake Makefiles to build the introspection files for GLib, and also the .gir's that are shipped with G-I, and make it clear to people what things are needed to build the introspection files. -Standardizing across the board that we now use $(ApiVersion) for the .lib files and the "installation" of headers, etc. Similar updates to the Visual Studio 2010 files will follow later.
Diffstat (limited to 'Makefile-msvcproj.am')
-rw-r--r--Makefile-msvcproj.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am
index 32b9314d..f4dcd3cd 100644
--- a/Makefile-msvcproj.am
+++ b/Makefile-msvcproj.am
@@ -110,11 +110,11 @@
# and Python scripts to install
#--------------------------------
./build/win32/vs9/gir.vs9.install:
- echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository&#x0D;&#x0A;' >./build/win32/vs9/gir.vs9.install
+ echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(ApiVersion)\girepository&#x0D;&#x0A;' >./build/win32/vs9/gir.vs9.install
echo '' >>./build/win32/vs9/gir.vs9.install
for F in `echo $(girepo_HEADERS) | tr '/' '\\\\'`; do \
case $$F in \
- *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository&#x0D;&#x0A;' \
+ *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(ApiVersion)\girepository&#x0D;&#x0A;' \
;; \
esac; \
done >>./build/win32/vs9/gir.vs9.install
@@ -144,11 +144,11 @@
done >>./build/win32/vs9/gir.vs9.install
./build/win32/vs10/gir.vs10.install:
- echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository' >./build/win32/vs10/gir.vs10.install
+ echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(ApiVersion)\girepository' >./build/win32/vs10/gir.vs10.install
echo '' >>./build/win32/vs10/gir.vs10.install
for F in `echo $(girepo_HEADERS) | tr '/' '\\\\'`; do \
case $$F in \
- *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository' && \
+ *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(ApiVersion)\girepository' && \
echo '' \
;; \
esac; \
@@ -178,8 +178,8 @@
esac; \
done >>./build/win32/vs10/gir.vs10.install
-./build/win32/vs9/gir.vsprops: ./build/win32/vs9/gir.vs9.install $(top_srcdir)/build/win32/vs9/gir.vspropsin
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gir.vspropsin >$@
+./build/win32/vs9/gi-install.vsprops: ./build/win32/vs9/gir.vs9.install $(top_srcdir)/build/win32/vs9/gi-install.vspropsin
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gi-install.vspropsin >$@
rm ./build/win32/vs9/gir.vs9.install
./build/win32/vs10/gir.props: ./build/win32/vs10/gir.vs10.install $(top_srcdir)/build/win32/vs10/gir.propsin