ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small changes to test builds to be compatible with latest macOS and tools (#1078)

Browse Source 
closes #1077 

Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
This commit is contained in:
Scott Fennell 2020-11-16 22:56:56 -06:00 committed by GitHub
parent 895175c812
commit f04dcd7567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
View File

@ -1,5 +1,6 @@
#ifndef TRICK_ICG
#include <Python.h> #include <Python.h>
#endif
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

1
test/SIM_test_sched/models/sched/src/sched_amf.c
View File

@ -9,6 +9,7 @@ PROGRAMMERS: ( (Keith Vetter) (Titan) (8-20-2002) )
#include "../include/sched.h" #include "../include/sched.h"
#include "sim_services/UnitTest/include/trick_tests.h" #include "sim_services/UnitTest/include/trick_tests.h"
#include <stdio.h>
int sched_amf( int sched_amf(
/* RETURN: -- Always return zero */ /* RETURN: -- Always return zero */

1
test/SIM_test_sched/models/sched/src/sched_async.c
View File

@ -8,6 +8,7 @@ PROGRAMMERS: ( (Keith Vetter) (Titan) (8-20-2002) )
*******************************************************************************/ *******************************************************************************/
#include "../include/sched.h" #include "../include/sched.h"
#include <unistd.h>
int sched_async ( int sched_async (
/* RETURN: -- Always return zero */ /* RETURN: -- Always return zero */

2
trick_source/data_products/DPX/test/unit_test/makefile
View File

@ -32,7 +32,7 @@ endif
ifeq ($(TRICK_HOST_TYPE), Darwin) ifeq ($(TRICK_HOST_TYPE), Darwin)
CFLAGS += -DGTEST_HAS_TR1_TUPLE=0 CFLAGS += -DGTEST_HAS_TR1_TUPLE=0
MOTIF_INCDIR = -I/sw/include MOTIF_INCDIR = -I/sw/include
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib
SDK_DIR = $(shell xcrun --show-sdk-path) SDK_DIR = $(shell xcrun --show-sdk-path)
INCDIRS += -I${SDK_DIR}/usr/include/libxml2 INCDIRS += -I${SDK_DIR}/usr/include/libxml2
else else