ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-01 08:48:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1821-action-required-github-actions-v4-update

Browse Source
This commit is contained in:
Hong Chen 2025-01-07 14:12:37 -06:00
commit e806fea8f3
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -8,13 +8,13 @@
<p align=center>
<a href="https://github.com/nasa/trick/actions?query=workflow%3ALinux">
<img src="https://github.com/nasa/trick/workflows/Linux/badge.svg?branch=master" alt="Linux" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_linux.yml/badge.svg?branch=master" alt="Linux" height=30px>
</a>
<a href="https://github.com/nasa/trick/actions?query=workflow%3AmacOS">
<img src="https://github.com/nasa/trick/workflows/macOS/badge.svg?branch=master" alt="macOS" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_macos.yml/badge.svg?branch=master" alt="macOS" height=30px>
</a>
<a href="https://github.com/nasa/trick/actions?query=workflow%3A32-bit">
<img src="https://github.com/nasa/trick/workflows/32-bit/badge.svg?branch=master" alt="32-bit" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_32_oracle.yml/badge.svg?branch=master" alt="32-bit" height=30px>
</a>
</p>

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ../..

2
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ../..

2
trick_source/data_products/DPX/DPC/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ..

2
trick_source/data_products/DPX/DPM/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ..

2
trick_source/data_products/EQParse/makefile
View File

@ -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}

2
trick_source/data_products/units/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc
CC = gcc
CPP = c++
ifndef TRICK_HOST_CPU

2
trick_source/sim_services/DataTypes/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf
CC = cc
CC = gcc
CPP = c++

2
trick_source/trick_utils/SAIntegrator/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}

2
trick_source/web/CivetServer/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
CURL = curl
MV = mv