Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2be5270b7a86
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8246ac8575e6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 12, 2020

  1. Add support for zfp.

    pleroy committed Mar 12, 2020
    Copy the full SHA
    a02128e View commit details
  2. Merge pull request #2493 from pleroy/Make

    Add support for zfp in the Makefile
    pleroy authored Mar 12, 2020
    Copy the full SHA
    8246ac8 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 Makefile
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -69,12 +69,16 @@ LIBS := $(DEP_DIR)protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)abseil-cpp/absl/debugging/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/numeric/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/base/libabsl_*.a \
$(DEP_DIR)build/lib/libzfp.a \
$(DEP_DIR)glog/.libs/libglog.a -lpthread -lc++ -lc++abi
TEST_INCLUDES := \
-I$(DEP_DIR)googletest/googlemock/include -I$(DEP_DIR)googletest/googletest/include \
-I$(DEP_DIR)googletest/googlemock/ -I$(DEP_DIR)googletest/googletest/ -I$(DEP_DIR)benchmark/include
INCLUDES := -I. -I$(DEP_DIR)glog/src -I$(DEP_DIR)protobuf/src \
-I$(DEP_DIR)gipfeli/include -I$(DEP_DIR)abseil-cpp
INCLUDES := -I. -I$(DEP_DIR)glog/src \
-I$(DEP_DIR)protobuf/src \
-I$(DEP_DIR)gipfeli/include \
-I$(DEP_DIR)abseil-cpp \
-I$(DEP_DIR)zfp/include
SHARED_ARGS := \
-std=c++1z -stdlib=libc++ -O3 -g \
-fPIC -fexceptions -ferror-limit=1000 -fno-omit-frame-pointer \