callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC Builds: Massive Rename of Projects

Browse Source 
We need to rename the projects so that when these projects are added
into an all-in-one solution file that will build the GTK+ 2/3 stack,
the names of the projects will not collide with the GTK+-2.x ones,
especially as GTK+-2.x and GTK+-3.x are done to co-exist on the same
system.  This is due to the case that the MSVC projects are directly
carried over from the GTK+-2.x ones and was then updated for 3.x.

We still need to update the GUIDs of the projects, so that they won't
conflict with the GTK+-2.x ones.
This commit is contained in:
Chun-wei Fan
2015-08-25 17:41:55 +08:00
parent 908850c087
commit 6423a02c55
53 changed files with 3996 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdk/Makefile.am
View File

@ -434,24 +434,24 @@ stamp-gc-h: $(top_builddir)/config.status
&& echo timestamp > gdk/$(@F)
# ------------------- MSVC Build Items ----------------
MSVCPROJS = gdk
MSVCPROJS = gdk-3
gdk_FILES = $(libgdk_3_la_SOURCES)
gdk_EXCLUDES = dummy
gdk_HEADERS_DIR = $(gdkincludedir)
gdk_3_FILES = $(libgdk_3_la_SOURCES)
gdk_3_EXCLUDES = dummy
gdk_3_HEADERS_DIR = $(gdkincludedir)
gdk_HEADERS_INST = \
gdk_3_HEADERS_INST = \
$(gdkinclude_HEADERS) \
$(deprecatedinclude_HEADERS) \
$(nodist_gdkinclude_HEADERS)
gdk_HEADERS_EXCLUDES = dummy
gdk_3_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
$(top_builddir)/build/win32/vs9/gdk.vcproj \
$(top_builddir)/build/win32/vs9/gdk.headers
$(top_builddir)/build/win32/vs9/gdk-3.vcproj \
$(top_builddir)/build/win32/vs9/gdk-3.headers
DISTCLEANFILES = gdkconfig.h stamp-gc-h

16
gdk/broadway/Makefile.am
View File

@ -102,15 +102,15 @@ EXTRA_DIST += $(broadway_built_sources)
BUILT_SOURCES = $(broadway_built_sources)
# ------------------- MSVC Build Items ----------------
MSVCPROJS = gdk-broadway broadwayd
MSVCPROJS = gdk3-broadway broadwayd
gdk_broadway_FILES = $(libgdk_broadway_la_SOURCES)
gdk_broadway_EXCLUDES = dummy
gdk_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES)
gdk3_broadway_EXCLUDES = dummy
gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
gdk_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
gdk_broadway_HEADERS_EXCLUDES = dummy
gdk3_broadway_HEADERS_EXCLUDES = dummy
broadwayd_FILES = $(broadwayd_SOURCES)
broadwayd_EXCLUDES = dummy
@ -118,8 +118,8 @@ broadwayd_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
$(top_builddir)/build/win32/vs9/gdk-broadway.vcproj \
$(top_builddir)/build/win32/vs9/gdk3-broadway.vcproj \
$(top_builddir)/build/win32/vs9/broadwayd.vcproj \
$(top_builddir)/build/win32/vs9/gdk-broadway.headers
$(top_builddir)/build/win32/vs9/gdk3-broadway.headers
-include $(top_srcdir)/git.mk

16
gdk/win32/Makefile.am
View File

@ -85,20 +85,20 @@ libgdkwin32include_HEADERS = \
gdkwin32window.h
# ------------------- MSVC Build Items ----------------
MSVCPROJS = gdk-win32
MSVCPROJS = gdk3-win32
gdk_win32_FILES = $(libgdk_win32_la_SOURCES)
gdk_win32_EXCLUDES = dummy
gdk_win32_HEADERS_DIR = $(libgdkwin32includedir)
gdk3_win32_FILES = $(libgdk_win32_la_SOURCES)
gdk3_win32_EXCLUDES = dummy
gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir)
gdk_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
gdk_win32_HEADERS_EXCLUDES = dummy
gdk3_win32_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
dist-hook: \
$(top_builddir)/build/win32/vs9/gdk-win32.vcproj \
$(top_builddir)/build/win32/vs9/gdk-win32.headers
$(top_builddir)/build/win32/vs9/gdk3-win32.vcproj \
$(top_builddir)/build/win32/vs9/gdk3-win32.headers
-include $(top_srcdir)/git.mk