From 494bf59e9b6305f07fb85df09f707f14beafb614 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 4 Mar 2014 15:59:49 -0800 Subject: [PATCH] remove the winsdk hack to solve with VS SP1 --- CMakeLists.txt | 4 +--- externals/winsdk/ammintrin.h | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 externals/winsdk/ammintrin.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 2560c6498f..14f3cd5924 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,11 @@ cmake_minimum_required(VERSION 2.8) project(hifi) IF (WIN32) - include_directories(SYSTEM "externals/winsdk") add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS ) set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 ") ENDIF(WIN32) -set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH} ) - +set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH}) # set our Base SDK to 10.8 set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk) diff --git a/externals/winsdk/ammintrin.h b/externals/winsdk/ammintrin.h deleted file mode 100644 index 01cb3a0023..0000000000 --- a/externals/winsdk/ammintrin.h +++ /dev/null @@ -1,7 +0,0 @@ -// fake/empty ammintrin.h -// -// NOTE: Windows build will reference this file, but it's not available in the WindowsSDK -// it's also apparently not needed. So we've included this empty version here to get the -// windows build to compile cleanly. -// -// nothing to see here... move along.