diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | build/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | win32/Makefile.am (renamed from build/win32/Makefile.am) | 0 | ||||
| -rw-r--r-- | win32/README.txt (renamed from build/win32/README.txt) | 12 | ||||
| -rw-r--r-- | win32/adwaita-msvc.mak (renamed from build/win32/adwaita-msvc.mak) | 2 | ||||
| -rw-r--r-- | win32/apply_dirs.py (renamed from build/win32/apply_dirs.py) | 0 | ||||
| -rw-r--r-- | win32/detectenv-msvc.mak (renamed from build/win32/detectenv-msvc.mak) | 24 | ||||
| -rw-r--r-- | win32/replace.py (renamed from build/win32/replace.py) | 0 |
9 files changed, 23 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 9f39d7cb2..aa1f59b88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-icon-mapping -SUBDIRS = src build +SUBDIRS = src win32 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index 0f81afe38..000000000 --- a/build/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = win32 diff --git a/configure.ac b/configure.ac index e41218308..f90f1b8e8 100644 --- a/configure.ac +++ b/configure.ac @@ -85,8 +85,7 @@ src/Makefile src/fullcolor/Makefile src/symbolic/Makefile src/spinner/Makefile -build/Makefile -build/win32/Makefile +win32/Makefile ]) AC_OUTPUT diff --git a/build/win32/Makefile.am b/win32/Makefile.am index 990d1d16e..990d1d16e 100644 --- a/build/win32/Makefile.am +++ b/win32/Makefile.am diff --git a/build/win32/README.txt b/win32/README.txt index 6a26cf7e4..14e441c7f 100644 --- a/build/win32/README.txt +++ b/win32/README.txt @@ -23,13 +23,7 @@ The required dependencies are as follows: For optimal results, you will also need: -The gtk-update-icon-cache tool, which can be found by building the latest GTK+ - 2.24+/3.18+ package. If Visual Studio projects were not provided to build it, - one can still build it manually after building GTK+ itself by running in - $(GTK_srcroot)\gtk, $(PREFIX) is the prefix where the other parts of the GTK+ - stack reside: - 'cl /MD /O2 /W3 /GL /FImsvc_recommended_pragmas.h /I.. /I$(PREFIX)\include\gdk-pixbuf-2.0 /I$(PREFIX)\include\glib-2.0 /I$(PREFIX)\lib\glib-2.0\include /I$(PREFIX)\include updateiconcache.c /link /libpath:$(PREFIX)\lib gdk_pixbuf-2.0.lib gio-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib /DEBUG /out:gtk-update-icon-cache.exe /LTCG /opt:ref' - (Embed the generated .exe.manifest or copy it if on Visual Studio 2008 using - mt.exe) + 2.24.x/3.18.x (or later) package. The tool should be placed in $(PREFIX)\bin. -PNG versions of the SVG symbolic icons are generated in 16x16, 24x24, 32x32, @@ -49,7 +43,7 @@ that the icons will be ready for use by GTK+-using applications. A 'clean' target is provided to remove all the generated files-to uninstall the installed icons, simply delete the $(PREFIX)\share\icons\Adwaita folder. -Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs<Visual Studio Version> +Please refer to the README.txt file in $(GLib_src_root)\win32\vs<Visual Studio Version> on how to build GLib using your version of Visual Studio. Versions 2008 through 2015 are currently supported. @@ -60,6 +54,6 @@ folder <root>: <root>\<Visual Studio Version>\<PlatformName> *this* file you are now reading is thus located at -<root>\<this-adwaita-icon-theme-source-tree>\build\README.txt +<root>\<this-adwaita-icon-theme-source-tree>\win32\README.txt --Chun-wei Fan <fanc999@gmail.com> diff --git a/build/win32/adwaita-msvc.mak b/win32/adwaita-msvc.mak index 90b789d89..c78c68f32 100644 --- a/build/win32/adwaita-msvc.mak +++ b/win32/adwaita-msvc.mak @@ -5,7 +5,7 @@ !include detectenv-msvc.mak !IF "$(SRCROOTDIR)" == "" -SRCROOTDIR=..\.. +SRCROOTDIR=.. !ENDIF # Python.exe either needs to be in your PATH or you need to pass diff --git a/build/win32/apply_dirs.py b/win32/apply_dirs.py index af8a22e0c..af8a22e0c 100644 --- a/build/win32/apply_dirs.py +++ b/win32/apply_dirs.py diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak index 975e11deb..6fd96ccc6 100644 --- a/build/win32/detectenv-msvc.mak +++ b/win32/detectenv-msvc.mak @@ -1,3 +1,8 @@ +# Common NMake Makefile module for checking the build environment +# This can be copied from $(glib_srcroot)\build\win32 for GNOME items +# that support MSVC builds and introspection under MSVC, and can be used +# for building test programs as well. + # Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or # VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) !if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) @@ -35,8 +40,10 @@ VSVER = 10 VSVER = 11 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000 +!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 VSVER = 14 +!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 +VSVER = 15 !else VSVER = 0 !endif @@ -45,20 +52,23 @@ VSVER = 0 MSG = ^ This NMake Makefile set supports Visual Studio^ 9 (2008) through 14 (2015). Your Visual Studio^ -version is not supported. Note that there is no^ -Visual Studio 13. +version is not supported. !error $(MSG) !endif VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" +!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" VALID_CFGSET = TRUE !endif -!if "$(CFG)" == "release" -CFLAGS_ADD = /MD /O2 +# We want debugging symbols logged for all builds, +# using .pdb files for release builds +CFLAGS_BASE = /Zi + +!if "$(CFG)" == "release" || "$(CFG)" == "Release" +CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) !else -CFLAGS_ADD = /MDd /Od /Zi +CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) !endif !if "$(PLAT)" == "x64" diff --git a/build/win32/replace.py b/win32/replace.py index ea75dafa5..ea75dafa5 100644 --- a/build/win32/replace.py +++ b/win32/replace.py |