mirror of
https://github.com/nasa/trick.git
synced 2024-12-18 20:57:55 +00:00
Restore the whitespaces to their original state before the update in order to show the necessary file changes for the PR.
This commit is contained in:
parent
36acb0e862
commit
02130cea9f
@ -38,4 +38,4 @@ ElectricalCircuitTest.o : ElectricalCircuitTest.cpp
|
|||||||
|
|
||||||
ElectricalCircuitTest : ElectricalCircuitTest.o gtest_main.o gtest-all.o
|
ElectricalCircuitTest : ElectricalCircuitTest.o gtest_main.o gtest-all.o
|
||||||
$(CPP) $(CFLAGS) -o $@ $^ $(LIBS)
|
$(CPP) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
CC = c++
|
CC = c++
|
||||||
|
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell uname -s)
|
TRICK_HOST_CPU := $(shell uname -s)
|
||||||
|
@ -20,7 +20,7 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
CC = cc
|
CC = cc
|
||||||
FLAGS =
|
FLAGS =
|
||||||
ifeq ($(TRICK_HOST_TYPE), Darwin)
|
ifeq ($(TRICK_HOST_TYPE), Darwin)
|
||||||
LIBS =
|
LIBS =
|
||||||
|
Loading…
Reference in New Issue
Block a user