From 169fb81d8780532ffe575b5dfbf29a1027dfe25d Mon Sep 17 00:00:00 2001 From: Anurag Gupta Date: Tue, 11 Mar 2014 11:56:26 -0700 Subject: [PATCH] Undoing local change done for building on x64 --- .gitignore | 1 - CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a28d73866..d4e0454fa 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ .lock-wafbuild .waf* build/ -buildx64/ build-amiga/ tests/tmp/ msvc/Debug/ diff --git a/CMakeLists.txt b/CMakeLists.txt index be3b53a8f..cca2a120c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ IF (MSVC) # /GF - String pooling # /MP - Parallel build - SET(CMAKE_C_FLAGS "/GF /MP /wd4244 /wd4267 /nologo ${CMAKE_C_FLAGS}") + SET(CMAKE_C_FLAGS "/GF /MP /nologo ${CMAKE_C_FLAGS}") IF (STDCALL) # /Gz - stdcall calling convention