Browse Source

Build: adds gtest prefix, clean out unused clutter

master
heck 5 months ago
parent
commit
6d59e27c29
3 changed files with 5 additions and 19 deletions
  1. +2
    -15
      Makefile.conf
  2. +1
    -2
      local.conf.example
  3. +2
    -2
      test/Makefile

+ 2
- 15
Makefile.conf View File

@ -10,15 +10,11 @@ TARGET=libpEpDatatypes.a
# Defaults
DEBUG=1
PREFIX?=$(HOME)
ENGINE_LIB_PATH=$(PREFIX)/lib
ENGINE_INC_PATH=$(PREFIX)/include
PREFIX_GTEST=/opt/local/
LANG_VERSION=c++17
CXXFLAGS+=-fPIC
# Build target
BUILD_FOR:=$(shell uname)
ifneq (,$(findstring g++,$(CXX)))
CXXFLAGS+=-fdiagnostics-color=always
else ifneq (,$(findstring clang,$(CXX)))
@ -37,13 +33,4 @@ else
CXXFLAGS+=-DNDEBUG=1 -O3
endif
# Add -L Prefixes to LIB/INC paths,
# if not already explicitly set in local.conf
ifndef ENGINE_LIB
ENGINE_LIB=-L$(ENGINE_LIB_PATH)
endif
ifndef ENGINE_INC
ENGINE_INC=-I$(ENGINE_INC_PATH)
endif
CXXFLAGS += $(ENGINE_INC)
CXXFLAGS+=-I$(PREFIX)/include

+ 1
- 2
local.conf.example View File

@ -12,5 +12,4 @@
############# DIRS #############
# PREFIX=$(HOME)/local
# ENGINE_LIB_PATH=$(PREFIX)/lib
# ENGINE_INC_PATH=$(PREFIX)/include
# PREFIX_GTEST=/opt/local/

+ 2
- 2
test/Makefile View File

@ -1,8 +1,8 @@
include ../Makefile.conf
LDFLAGS=-L../src $(ENGINE_LIB)
LDFLAGS=-L../src -L$(PREFIX)/lib -L$(PREFIX_GTEST)/lib
LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
CXXFLAGS:=-I../src -DENGINE_TEST=$(ENGINE_TEST) $(CXXFLAGS)
CXXFLAGS:=-I../src $(CXXFLAGS) -I$(PREFIX_GTEST)/include
TEST_SOURCE=$(wildcard *.cc)
TEST_OBJECTS=$(subst .cc,.o,$(TEST_SOURCE))


Loading…
Cancel
Save