Skip to content

Commit

Permalink
Test to change from CC = cc to CC = gcc for only needed files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hchen99
hchen99 committed Dec 17, 2024
1 parent 776f90a commit 36acb0e
Show file tree
Hide file tree
Showing 29 changed files with 54 additions and 54 deletions.
4 changes: 2 additions & 2 deletions trick_sims/SIM_satellite/models/Satellite/graphics/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CPP ?= g++
CC ?= gcc
CPP = g++
CC = gcc

ifeq ($(shell uname), Darwin)
GL_LIBS = -framework GLUT -framework OpenGL
Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Battery/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@


RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

DECL_DIR = ..
GTEST_DIR = ${HOME}/gtest-1.7.0
Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Control/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

PROJECT_DIR = ../..

Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Electrical/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

DECL_DIR = ..
GTEST_DIR = ${HOME}/gtest-1.7.0
Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Guidance/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@


RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

DECL_DIR = ..
GTEST_DIR = ${HOME}/gtest-1.7.0
Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Motor/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

DECL_DIR = ..
GTEST_DIR = ${HOME}/gtest-1.7.0
Expand Down
4 changes: 2 additions & 2 deletions trick_sims/SIM_wheelbot/models/Motor/test/test/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

PROJECT_DIR = ../..

Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/Apps/ExternalPrograms/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CC ?= gcc
CC = gcc

ifndef TRICK_HOST_CPU
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
Expand Down Expand Up @@ -34,7 +34,7 @@ TRICK_CFLAGS += -Wall
endif

ifeq ($(TRICK_HOST_TYPE),Darwin)
CC ?= cc
CC = cc
LD_SHARED = $(CC) -bundle
TRICK_CFLAGS += -Wall
endif
Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/DPX/APPS/FXPLOT/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

DPX_DIR = ../..

Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/DPX/APPS/GXPLOT/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

DPX_DIR = ../..

Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/DPX/DPC/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

DPX_DIR = ..

Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/DPX/DPM/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

DPX_DIR = ..

Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/DPX/DPV/UTILS/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= gcc
CPP ?= g++
CC = gcc
CPP = g++

DPX_DIR = ../..

Expand Down
2 changes: 1 addition & 1 deletion trick_source/data_products/EQParse/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

CC ?= cc
CC = gcc

OBJ_DIR = object_${TRICK_HOST_CPU}
LIBDIR = ../lib_${TRICK_HOST_CPU}
Expand Down
2 changes: 1 addition & 1 deletion trick_source/data_products/Log/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

CC ?= c++
CC = c++

ifndef TRICK_HOST_CPU
TRICK_HOST_CPU := $(shell uname -s)
Expand Down
2 changes: 1 addition & 1 deletion trick_source/data_products/Var/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

CC ?= c++
CC = c++

ifndef TRICK_HOST_CPU
TRICK_HOST_CPU := $(shell uname -s)
Expand Down
4 changes: 2 additions & 2 deletions trick_source/data_products/units/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

ifndef TRICK_HOST_CPU
TRICK_HOST_CPU := $(shell uname -s)
Expand Down
4 changes: 2 additions & 2 deletions trick_source/sim_services/DataTypes/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++


CFLAGS = -g -Wall
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = cc
CPP = c++

CXXFLAGS = -g -Wall
INCLUDE_DIRS = -I../../include
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/SAIntegrator/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++

CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
INCLUDE_DIRS = -Iinclude
Expand Down
2 changes: 1 addition & 1 deletion trick_source/trick_utils/comm/test_programs/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
endif


CC ?= cc
CC = cc
FLAGS =
ifeq ($(TRICK_HOST_TYPE), Darwin)
LIBS =
Expand Down
4 changes: 2 additions & 2 deletions trick_source/trick_utils/units/Unittest/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
endif


CC ?= gcc
CPP ?= g++
CC = gcc
CPP = g++

CFLAGS = -g -Wall -I../include

Expand Down
4 changes: 2 additions & 2 deletions trick_source/web/CivetServer/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

RM = rm -rf
CC ?= cc
CPP ?= c++
CC = gcc
CPP = c++
CURL = curl
MV = mv
CP = cp
Expand Down

0 comments on commit 36acb0e

Please sign in to comment.