From 089793e25ddd4375fd77e0a57c2b4192ad912d23 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 3 Jun 2016 10:29:54 -0400 Subject: [PATCH] Restored unmodified GNU make files. --- migrate_build/build/GNUbasemsvc.mk | 15 +++++++++++++++ migrate_build/darwin/GNUfiles.mk | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/migrate_build/build/GNUbasemsvc.mk b/migrate_build/build/GNUbasemsvc.mk index 42072af3..5078ac7c 100644 --- a/migrate_build/build/GNUbasemsvc.mk +++ b/migrate_build/build/GNUbasemsvc.mk @@ -27,7 +27,22 @@ # TODO /analyze requires us to write annotations everywhere # TODO undecided flags from qo? # -RTCc is not supplied because it's discouraged as of VS2015; see https://www.reddit.com/r/cpp/comments/46mhne/rtcc_rejects_conformant_code_with_visual_c_2015/d06auq5 +CFLAGS += \ + -W4 \ + -wd4100 \ + -TC \ + -bigobj -nologo \ + -RTC1 -RTCs -RTCu +# TODO prune these +# -EHsc is to shut the compiler up in some cases +CXXFLAGS += \ + -W4 \ + -wd4100 \ + -TP \ + -bigobj -nologo \ + -RTC1 -RTCs -RTCu \ + -EHsc # TODO warnings on undefined symbols LDFLAGS += \ diff --git a/migrate_build/darwin/GNUfiles.mk b/migrate_build/darwin/GNUfiles.mk index 12615f72..9b9ed693 100644 --- a/migrate_build/darwin/GNUfiles.mk +++ b/migrate_build/darwin/GNUfiles.mk @@ -46,9 +46,11 @@ LDFLAGS += $(NATIVE_UI_LDFLAGS) # flags for OS X versioning CFLAGS += \ - -mmacosx-version-min=10.8 + -mmacosx-version-min=10.8 \ + -DMACOSX_DEPLOYMENT_TARGET=10.8 CXXFLAGS += \ - -mmacosx-version-min=10.8 + -mmacosx-version-min=10.8 \ + -DMACOSX_DEPLOYMENT_TARGET=10.8 LDFLAGS += \ -mmacosx-version-min=10.8