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: 6346e8218238
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df736c663ef9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 21, 2017

  1. make the tests link

    @eggrobin
    eggrobin committed May 21, 2017
    Copy the full SHA
    06b3314 View commit details

  2. Merge pull request #1391 from eggrobin/proto-in-tests 

    Make the tests link on Linux
    @pleroy
    pleroy authored May 21, 2017
    Copy the full SHA
    df736c6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 Makefile
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ FINAL_PRODUCTS_DIR := Release/
ADAPTER := $(ADAPTER_BUILD_DIR)$(ADAPTER_CONFIGURATION)/ksp_plugin_adapter.dll
PLUGIN_DIRECTORY := $(FINAL_PRODUCTS_DIR)GameData/Principia/Linux64/

TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a
TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a $(DEP_DIR)/protobuf/src/.libs/libprotobuf.a
LIBS := $(DEP_DIR)/protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)/glog/.libs/libglog.a -lpthread -lc++ -lc++abi -lsupc++
TEST_INCLUDES := \