summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnurag Gupta <anugupta@microsoft.com>2014-03-11 11:56:26 -0700
committerAnurag Gupta <anugupta@microsoft.com>2014-03-24 11:20:41 -0700
commit169fb81d8780532ffe575b5dfbf29a1027dfe25d (patch)
tree7c033074207d6c75b28ea841f1f35993d8304483
parent7ca1584b4771703bd9f9c3ad4335f6155b05450a (diff)
downloadlibgit2-169fb81d8780532ffe575b5dfbf29a1027dfe25d.tar.gz
Undoing local change done for building on x64
-rw-r--r--.gitignore1
-rw-r--r--CMakeLists.txt2
2 files changed, 1 insertions, 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