diff options
author | James H. Hill <hillj@cs.iupui.edu> | 2015-02-12 14:40:25 -0500 |
---|---|---|
committer | James H. Hill <hillj@cs.iupui.edu> | 2015-02-12 14:40:25 -0500 |
commit | ef8e9a2e76cca4ff08ab7630237afc8b033f04fb (patch) | |
tree | 1965da683cbac9bf9588d88258835a99d6ed29b6 /config | |
parent | 3a355c23e43f5f54f9395de512f1d1fc12b25386 (diff) | |
parent | 48eb07b9395a730e6a32da55d6403d74ff0d85f2 (diff) | |
download | MPC-ef8e9a2e76cca4ff08ab7630237afc8b033f04fb.tar.gz |
Merge branch 'master' of github.com:hilljh82/MPC
Diffstat (limited to 'config')
-rw-r--r-- | config/pin_base.mpb | 8 | ||||
-rw-r--r-- | config/pin_static.mpb | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 4d5676e6..dc54493b 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -1,5 +1,3 @@ -// $Id: pin_base.mpb 2215 2014-06-30 17:37:41Z elliott_c $ - project { requires += pin @@ -76,12 +74,14 @@ feature(ia32) { specific (prop:windows) { libpaths += $(PIN_ROOT)/ia32/lib \ $(PIN_ROOT)/ia32/lib-ext - } - specific (prop:windows) { // DO NOT CHANGE ORDER lit_libs += libcpmt libcmt pinvm pin libxed ntdll-32 } + + specific (make, gnuace) { + compile_flags += -m32 + } } feature(intel64) { diff --git a/config/pin_static.mpb b/config/pin_static.mpb index 5a1f9529..fc257ad7 100644 --- a/config/pin_static.mpb +++ b/config/pin_static.mpb @@ -1,5 +1,3 @@ -// $Id: pin_static.mpb 2166 2013-11-17 18:25:37Z hillj $ - project : pin { specific (!prop:windows) { libs += sapin |