From 7f0e4cf20ede44240d48d327b3a58bc9d81426f5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 28 Jul 2014 21:54:06 +0300 Subject: Add separate project file for VS2013 Easier than trying to figure out how to make the VC2010 project work with VS2013, it seems. Luckily it works fine tojust have VS2013 upgrade the old project file and then pass that to msbuild. Change-Id: I94c0248211767d97f2898f35b1b677aee372a329 --- external/glew/ExternalProject_glew.mk | 3 +- external/glew/UnpackedTarball_glew.mk | 1 + external/glew/glew-vc2013-project.patch.1 | 508 ++++++++++++++++++++++++++++++ 3 files changed, 510 insertions(+), 2 deletions(-) create mode 100644 external/glew/glew-vc2013-project.patch.1 (limited to 'external/glew') diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index d7e553bcc749..7eec3e8ae46f 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -18,8 +18,7 @@ $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \ - ,build/vc10) + ,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10)) else diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 64cbc5cf8b62..242c73e31bac 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -22,6 +22,7 @@ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary)) $(eval $(call gb_UnpackedTarball_add_patches,glew,\ external/glew/glew-fix-rc-error.patch.1 \ + external/glew/glew-vc2013-project.patch.1 \ )) else $(eval $(call gb_UnpackedTarball_add_patches,glew,\ diff --git a/external/glew/glew-vc2013-project.patch.1 b/external/glew/glew-vc2013-project.patch.1 new file mode 100644 index 000000000000..f56769c6bb17 --- /dev/null +++ b/external/glew/glew-vc2013-project.patch.1 @@ -0,0 +1,508 @@ +-*- Mode:Diff -*- +--- /dev/null ++++ glew/build/vc12/common.props +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ ../../include ++ ../../lib ++ ../../bin ++ ++ ++ ++ ++ $(INCLUDE_DIR) ++ ++ ++ ++ ++ $(INCLUDE_DIR) ++ true ++ ++ ++ $(LIB_DIR) ++ true ++ ++ ++ $(BIN_DIR) ++ true ++ ++ ++ +--- /dev/null ++++ glew/build/vc12/glew_shared.vcxproj +@@ -0,0 +1,472 @@ ++ ++ ++ ++ ++ Debug MX ++ Win32 ++ ++ ++ Debug MX ++ x64 ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release MX ++ Win32 ++ ++ ++ Release MX ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ ++ ++ {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D} ++ ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ DynamicLibrary ++ false ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32mx ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32mx ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32 ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32 ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32mxd ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32mxd ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32d ++ ++ ++ $(BIN_DIR)\$(Configuration)\$(PlatformName)\ ++ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ ++ false ++ glew32d ++ ++ ++ ++ MultiThreaded ++ OnlyExplicitInline ++ true ++ true ++ MaxSpeed ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) ++ ++ ++ true ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ Win32 ++ ++ ++ 0x0409 ++ NDEBUG;GLEW_MX;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ /ignore:4089 ++ ++ ++ ++ ++ ++ ++ MultiThreaded ++ OnlyExplicitInline ++ true ++ true ++ MaxSpeed ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) ++ ++ ++ true ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ ++ ++ 0x0409 ++ NDEBUG;GLEW_MX;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ /ignore:4089 ++ ++ ++ ++ ++ ++ ++ MultiThreaded ++ OnlyExplicitInline ++ true ++ true ++ MaxSpeed ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) ++ ++ ++ true ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ Win32 ++ ++ ++ 0x0409 ++ NDEBUG;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ /ignore:4089 ++ ++ ++ ++ ++ ++ ++ MultiThreaded ++ OnlyExplicitInline ++ true ++ true ++ MaxSpeed ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) ++ ++ ++ true ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ ++ ++ 0x0409 ++ NDEBUG;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ /ignore:4089 ++ ++ ++ ++ ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) ++ EnableFastChecks ++ ++ ++ true ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ Win32 ++ ++ ++ 0x0409 ++ _DEBUG;GLEW_MX;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ Level3 ++ $(INCLUDE_DIR) ++ WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) ++ EnableFastChecks ++ ++ ++ true ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ ++ ++ 0x0409 ++ _DEBUG;GLEW_MX;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) ++ EnableFastChecks ++ Level3 ++ $(INCLUDE_DIR) ++ ++ ++ true ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ Win32 ++ ++ ++ 0x0409 ++ _DEBUG;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ WIN32;WIN32_LEAN_AND_MEAN;GLEW_BUILD;%(PreprocessorDefinitions) ++ EnableFastChecks ++ Level3 ++ $(INCLUDE_DIR) ++ ++ ++ true ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ ++ ++ 0x0409 ++ _DEBUG;%(PreprocessorDefinitions) ++ ++ ++ true ++ ++ ++ true ++ true ++ true ++ Console ++ $(OutDir)$(TargetName)$(TargetExt) ++ $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib ++ 0x62AA0000 ++ opengl32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ -- cgit