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

Merge Alex's and my changes to Makefile.common

Browse Source
This commit is contained in:
John M. Penn 2015-06-30 18:09:25 -05:00
commit 293bdad014
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libexec/trick/pm/make_swig_makefile.pm
View File

@ -288,17 +288,6 @@ sub make_swig_makefile($$$) {
$ii = 0 ; $ii = 0 ;
foreach my $f ( @temp_array2 ) { foreach my $f ( @temp_array2 ) {
my ($continue) = 1 ;
foreach my $ie ( @exclude_dirs ) {
# if file location begins with $ie (an IGC exclude dir)
if ( $f =~ /^\Q$ie/ ) {
$continue = 0 ;
$ii++ ;
last ; # break out of loop
}
}
next if ( $continue == 0 ) ;
my ($swig_dir, $swig_object_dir , $swig_module_dir , $swig_file_only) ; my ($swig_dir, $swig_object_dir , $swig_module_dir , $swig_file_only) ;
my ($swig_f) = $f ; my ($swig_f) = $f ;
@ -315,6 +304,17 @@ sub make_swig_makefile($$$) {
push @{$python_modules{"root"}} , $f ; push @{$python_modules{"root"}} , $f ;
} }
my ($continue) = 1 ;
foreach my $ie ( @exclude_dirs ) {
# if file location begins with $ie (an IGC exclude dir)
if ( $f =~ /^\Q$ie/ ) {
$continue = 0 ;
$ii++ ;
last ; # break out of loop
}
}
next if ( $continue == 0 ) ;
my $md5_sum = md5_hex($f) ; my $md5_sum = md5_hex($f) ;
# check if .sm file was accidentally ##included instead of #included # check if .sm file was accidentally ##included instead of #included
if ( rindex($swig_f,".sm") != -1 ) { if ( rindex($swig_f,".sm") != -1 ) {

2
share/trick/makefiles/Makefile.common
View File

@ -38,7 +38,7 @@ export TRICK_SWIG_EXCLUDE
export TRICK_GTE_EXT export TRICK_GTE_EXT
export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU) export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU)
export TRICK_EXEC_LINK_LIBS = ${PTHREAD_LIBS} $(PYTHON_LIB) export TRICK_EXEC_LINK_LIBS = ${PTHREAD_LIBS} $(PYTHON_LIB)
export TRICK_LIBS := ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm export TRICK_LIBS = ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm
IO_SRC_DIR := io_src/ IO_SRC_DIR := io_src/
OBJ_DIR := object_${TRICK_HOST_CPU} OBJ_DIR := object_${TRICK_HOST_CPU}