mirror of
https://github.com/nasa/trick.git
synced 2024-12-24 07:16:41 +00:00
Test to change from CC = cc to CC = gcc for only needed files.
This commit is contained in:
parent
776f90adcb
commit
36acb0e862
@ -1,5 +1,5 @@
|
|||||||
CPP ?= g++
|
CPP = g++
|
||||||
CC ?= gcc
|
CC = gcc
|
||||||
|
|
||||||
ifeq ($(shell uname), Darwin)
|
ifeq ($(shell uname), Darwin)
|
||||||
GL_LIBS = -framework GLUT -framework OpenGL
|
GL_LIBS = -framework GLUT -framework OpenGL
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DECL_DIR = ..
|
DECL_DIR = ..
|
||||||
GTEST_DIR = ${HOME}/gtest-1.7.0
|
GTEST_DIR = ${HOME}/gtest-1.7.0
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
PROJECT_DIR = ../..
|
PROJECT_DIR = ../..
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DECL_DIR = ..
|
DECL_DIR = ..
|
||||||
GTEST_DIR = ${HOME}/gtest-1.7.0
|
GTEST_DIR = ${HOME}/gtest-1.7.0
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DECL_DIR = ..
|
DECL_DIR = ..
|
||||||
GTEST_DIR = ${HOME}/gtest-1.7.0
|
GTEST_DIR = ${HOME}/gtest-1.7.0
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DECL_DIR = ..
|
DECL_DIR = ..
|
||||||
GTEST_DIR = ${HOME}/gtest-1.7.0
|
GTEST_DIR = ${HOME}/gtest-1.7.0
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
PROJECT_DIR = ../..
|
PROJECT_DIR = ../..
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CC ?= gcc
|
CC = gcc
|
||||||
|
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
|
TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
|
||||||
@ -34,7 +34,7 @@ TRICK_CFLAGS += -Wall
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(TRICK_HOST_TYPE),Darwin)
|
ifeq ($(TRICK_HOST_TYPE),Darwin)
|
||||||
CC ?= cc
|
CC = cc
|
||||||
LD_SHARED = $(CC) -bundle
|
LD_SHARED = $(CC) -bundle
|
||||||
TRICK_CFLAGS += -Wall
|
TRICK_CFLAGS += -Wall
|
||||||
endif
|
endif
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DPX_DIR = ../..
|
DPX_DIR = ../..
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DPX_DIR = ../..
|
DPX_DIR = ../..
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DPX_DIR = ..
|
DPX_DIR = ..
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
DPX_DIR = ..
|
DPX_DIR = ..
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= gcc
|
CC = gcc
|
||||||
CPP ?= g++
|
CPP = g++
|
||||||
|
|
||||||
DPX_DIR = ../..
|
DPX_DIR = ../..
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
|
|
||||||
OBJ_DIR = object_${TRICK_HOST_CPU}
|
OBJ_DIR = object_${TRICK_HOST_CPU}
|
||||||
LIBDIR = ../lib_${TRICK_HOST_CPU}
|
LIBDIR = ../lib_${TRICK_HOST_CPU}
|
||||||
|
@ -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)
|
||||||
|
@ -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)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
ifndef TRICK_HOST_CPU
|
ifndef TRICK_HOST_CPU
|
||||||
TRICK_HOST_CPU := $(shell uname -s)
|
TRICK_HOST_CPU := $(shell uname -s)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
|
|
||||||
CFLAGS = -g -Wall
|
CFLAGS = -g -Wall
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = cc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
INCLUDE_DIRS = -I../../include
|
INCLUDE_DIRS = -I../../include
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
|
|
||||||
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
|
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
|
||||||
INCLUDE_DIRS = -Iinclude
|
INCLUDE_DIRS = -Iinclude
|
||||||
|
@ -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 =
|
||||||
|
@ -9,8 +9,8 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
CC ?= gcc
|
CC = gcc
|
||||||
CPP ?= g++
|
CPP = g++
|
||||||
|
|
||||||
CFLAGS = -g -Wall -I../include
|
CFLAGS = -g -Wall -I../include
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||||
|
|
||||||
RM = rm -rf
|
RM = rm -rf
|
||||||
CC ?= cc
|
CC = gcc
|
||||||
CPP ?= c++
|
CPP = c++
|
||||||
CURL = curl
|
CURL = curl
|
||||||
MV = mv
|
MV = mv
|
||||||
CP = cp
|
CP = cp
|
||||||
|
Loading…
Reference in New Issue
Block a user