[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r7428 - in trunk/Thirdparty/gdal: . port
From: svn_fdo () osgeo ! org
Date: 2015-12-10 12:48:37
Message-ID: 20151210124837.671F039015C () trac ! osgeo ! org
[Download RAW message or body]
Author: kwi
Date: 2015-12-10 04:48:37 -0800 (Thu, 10 Dec 2015)
New Revision: 7428
Added:
trunk/Thirdparty/gdal/gdal_vs15.sln
Removed:
trunk/Thirdparty/gdal/gdal_vs12.sln
Modified:
trunk/Thirdparty/gdal/gdal.vcxproj
trunk/Thirdparty/gdal/nmake.opt
trunk/Thirdparty/gdal/port/cpl_config.h.vc
Log:
Modified: trunk/Thirdparty/gdal/gdal.vcxproj
===================================================================
--- trunk/Thirdparty/gdal/gdal.vcxproj 2015-12-10 12:47:44 UTC (rev 7427)
+++ trunk/Thirdparty/gdal/gdal.vcxproj 2015-12-10 12:48:37 UTC (rev 7428)
@@ -27,19 +27,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" \
Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"> <ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -63,16 +63,16 @@
<NMakeBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mkdir bin\win32\debug \
mkdir lib\win32\debug cd $(ProjectDir)
-nmake -f makefile.vc MSVC_VER=1700 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1
-nmake -f makefile.vc MSVC_VER=1700 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 \
devinstall</NMakeBuildCommandLine> +nmake -f makefile.vc MSVC_VER=1900 \
PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 +nmake -f makefile.vc MSVC_VER=1900 \
PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 \
devinstall</NMakeBuildCommandLine>
<NMakeReBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mkdir bin\win32\debug \
mkdir lib\win32\debug cd $(ProjectDir)
-nmake -f makefile.vc MSVC_VER=1700 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 \
clean
-nmake -f makefile.vc MSVC_VER=1700 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1
-nmake -f makefile.vc MSVC_VER=1700 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 \
devinstall </NMakeReBuildCommandLine> +nmake -f makefile.vc MSVC_VER=1900 \
PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 clean +nmake -f makefile.vc \
MSVC_VER=1900 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 +nmake -f makefile.vc \
MSVC_VER=1900 PLATFORM_BITS=32 INCLUDE_OGR_FRMTS=YES DEBUG=1 devinstall \
</NMakeReBuildCommandLine>
<NMakeCleanCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd \
$(ProjectDir)
-nmake -f makefile.vc PLATFORM_BITS=32 MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES DEBUG=1 \
clean</NMakeCleanCommandLine> +nmake -f makefile.vc PLATFORM_BITS=32 MSVC_VER=1900 \
INCLUDE_OGR_FRMTS=YES DEBUG=1 clean</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gdal110.dll</NMakeOutput>
<NMakePreprocessorDefinitions \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeIncludeSearchPath \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
@@ -84,16 +84,16 @@
<NMakeBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mkdir bin\win64\debug mkdir \
lib\win64\debug cd $(ProjectDir)
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 DEBUG=1
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 DEBUG=1 \
devinstall</NMakeBuildCommandLine> +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 DEBUG=1 +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 DEBUG=1 \
devinstall</NMakeBuildCommandLine>
<NMakeReBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mkdir bin\win64\debug mkdir \
lib\win64\debug cd $(ProjectDir)
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 DEBUG=1 \
clean
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 DEBUG=1
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 DEBUG=1 \
devinstall </NMakeReBuildCommandLine> +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 DEBUG=1 clean +nmake -f makefile.vc \
INCLUDE_OGR_FRMTS=YES MSVC_VER=1900 PLATFORM_BITS=64 DEBUG=1 +nmake -f makefile.vc \
INCLUDE_OGR_FRMTS=YES MSVC_VER=1900 PLATFORM_BITS=64 DEBUG=1 devinstall \
</NMakeReBuildCommandLine>
<NMakeCleanCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd \
$(ProjectDir)
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=64 MSVC_VER=1700 DEBUG=1 \
clean</NMakeCleanCommandLine> +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
PLATFORM_BITS=64 MSVC_VER=1900 DEBUG=1 clean</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gdal110.dll</NMakeOutput>
<NMakePreprocessorDefinitions \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeIncludeSearchPath \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
@@ -105,16 +105,16 @@
<NMakeBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mkdir bin\win32\release \
mkdir lib\win32\release cd $(ProjectDir)
-nmake -f makefile.vc MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32
-nmake -f makefile.vc MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32 \
devinstall</NMakeBuildCommandLine> +nmake -f makefile.vc MSVC_VER=1900 \
INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32 +nmake -f makefile.vc MSVC_VER=1900 \
INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32 \
devinstall</NMakeBuildCommandLine>
<NMakeReBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mkdir bin\win32\release \
mkdir lib\win32\release cd $(ProjectDir)
-nmake -f makefile.vc MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32 clean
-nmake -f makefile.vc MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32
-nmake -f makefile.vc MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES PLATFORM_BITS=32 devinstall \
</NMakeReBuildCommandLine> +nmake -f makefile.vc MSVC_VER=1900 INCLUDE_OGR_FRMTS=YES \
PLATFORM_BITS=32 clean +nmake -f makefile.vc MSVC_VER=1900 INCLUDE_OGR_FRMTS=YES \
PLATFORM_BITS=32 +nmake -f makefile.vc MSVC_VER=1900 INCLUDE_OGR_FRMTS=YES \
PLATFORM_BITS=32 devinstall </NMakeReBuildCommandLine>
<NMakeCleanCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd \
$(ProjectDir)
-nmake -f makefile.vc PLATFORM_BITS=32 MSVC_VER=1700 INCLUDE_OGR_FRMTS=YES \
clean</NMakeCleanCommandLine> +nmake -f makefile.vc PLATFORM_BITS=32 MSVC_VER=1900 \
INCLUDE_OGR_FRMTS=YES clean</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gdal110.dll</NMakeOutput>
<NMakePreprocessorDefinitions \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeIncludeSearchPath \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
@@ -126,16 +126,16 @@
<NMakeBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mkdir bin\win64\release \
mkdir lib\win64\release cd $(ProjectDir)
-nmake -f makefile.vc PLATFORM_BITS=64 INCLUDE_OGR_FRMTS=YES MSVC_VER=1700
-nmake -f makefile.vc PLATFORM_BITS=64 INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 \
devinstall</NMakeBuildCommandLine> +nmake -f makefile.vc PLATFORM_BITS=64 \
INCLUDE_OGR_FRMTS=YES MSVC_VER=1900 +nmake -f makefile.vc PLATFORM_BITS=64 \
INCLUDE_OGR_FRMTS=YES MSVC_VER=1900 \
devinstall</NMakeBuildCommandLine>
<NMakeReBuildCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mkdir bin\win64\release \
mkdir lib\win64\release cd $(ProjectDir)
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 clean
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64
-nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 PLATFORM_BITS=64 \
devinstall</NMakeReBuildCommandLine> +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 clean +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 +nmake -f makefile.vc INCLUDE_OGR_FRMTS=YES \
MSVC_VER=1900 PLATFORM_BITS=64 devinstall</NMakeReBuildCommandLine>
<NMakeCleanCommandLine \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd \
$(ProjectDir)
-nmake -f makefile.vc PLATFORM_BITS=64 INCLUDE_OGR_FRMTS=YES MSVC_VER=1700 \
clean</NMakeCleanCommandLine> +nmake -f makefile.vc PLATFORM_BITS=64 \
INCLUDE_OGR_FRMTS=YES MSVC_VER=1900 clean</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gdal110.dll</NMakeOutput>
<NMakePreprocessorDefinitions \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeIncludeSearchPath \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
Deleted: trunk/Thirdparty/gdal/gdal_vs12.sln
===================================================================
--- trunk/Thirdparty/gdal/gdal_vs12.sln 2015-12-10 12:47:44 UTC (rev 7427)
+++ trunk/Thirdparty/gdal/gdal_vs12.sln 2015-12-10 12:48:37 UTC (rev 7428)
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdal", "gdal.vcxproj", \
"{769DD10E-E284-46BE-9172-A35184250A3A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|Win32.ActiveCfg = Debug|Win32
- {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|Win32.Build.0 = Debug|Win32
- {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|x64.ActiveCfg = Debug|x64
- {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|x64.Build.0 = Debug|x64
- {769DD10E-E284-46BE-9172-A35184250A3A}.Release|Win32.ActiveCfg = Release|Win32
- {769DD10E-E284-46BE-9172-A35184250A3A}.Release|Win32.Build.0 = Release|Win32
- {769DD10E-E284-46BE-9172-A35184250A3A}.Release|x64.ActiveCfg = Release|x64
- {769DD10E-E284-46BE-9172-A35184250A3A}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Copied: trunk/Thirdparty/gdal/gdal_vs15.sln (from rev 7278, \
sandbox/v140/Thirdparty/gdal/gdal_vs15.sln) \
===================================================================
--- trunk/Thirdparty/gdal/gdal_vs15.sln (rev 0)
+++ trunk/Thirdparty/gdal/gdal_vs15.sln 2015-12-10 12:48:37 UTC (rev 7428)
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdal", "gdal.vcxproj", \
"{769DD10E-E284-46BE-9172-A35184250A3A}" +EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|Win32.Build.0 = Debug|Win32
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|x64.ActiveCfg = Debug|x64
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Debug|x64.Build.0 = Debug|x64
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Release|Win32.ActiveCfg = Release|Win32
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Release|Win32.Build.0 = Release|Win32
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Release|x64.ActiveCfg = Release|x64
+ {769DD10E-E284-46BE-9172-A35184250A3A}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/Thirdparty/gdal/nmake.opt
===================================================================
--- trunk/Thirdparty/gdal/nmake.opt 2015-12-10 12:47:44 UTC (rev 7427)
+++ trunk/Thirdparty/gdal/nmake.opt 2015-12-10 12:48:37 UTC (rev 7428)
@@ -25,6 +25,7 @@
# Check version of Visual C++ compiler:
# nmake -f makefile.vc MSVC_VER=xxxx
# where xxxx is one of following:
+# 1900 = 14.0(2015)
# 1700 = 11.0(2012)
# 1600 = 10.0(2010)
# 1500 = 9.0 (2008)
@@ -692,5 +693,5 @@
$(ODBCLIB) $(JASPER_LIB) $(PNG_LIB) $(ADD_LIBS) $(OPENJPEG_LIB) \
$(MRSID_LIDAR_LIB) $(LIBKML_LIBS) $(SOSI_LIBS) $(POPPLER_LIBS) $(PODOFO_LIBS) \
$(LZMA_LIBS) \ $(LIBICONV_LIBRARY) $(WEBP_LIBS) $(FGDB_LIB_LINK) $(FREEXL_LIBS) \
$(GTA_LIBS) \
- $(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) ws2_32.lib
+ $(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) ws2_32.lib legacy_stdio_definitions.lib
Modified: trunk/Thirdparty/gdal/port/cpl_config.h.vc
===================================================================
--- trunk/Thirdparty/gdal/port/cpl_config.h.vc 2015-12-10 12:47:44 UTC (rev 7427)
+++ trunk/Thirdparty/gdal/port/cpl_config.h.vc 2015-12-10 12:48:37 UTC (rev 7428)
@@ -17,7 +17,9 @@
#if defined(_MSC_VER) && (_MSC_VER < 1500)
# define vsnprintf _vsnprintf
#endif
-#define snprintf _snprintf
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+# define snprintf _snprintf
+#endif
#define HAVE_GETCWD 1
/* gmt_notunix.h from GMT project also redefines getcwd. See #3138 */
_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic