From 5d397ecf1c02373dddc0c62cc88888cc1ecbbea4 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Wed, 8 Jul 2015 14:19:39 -0500 Subject: [PATCH] Create a separate directory for simulation compiliation. Partial link commands need -m32 for 32 bit builds. Fixed help text for simulation makefile. refs #80 --- share/trick/makefiles/Makefile.common | 1 + share/trick/makefiles/Makefile.sim | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common index 9c1f788d..283426ab 100644 --- a/share/trick/makefiles/Makefile.common +++ b/share/trick/makefiles/Makefile.common @@ -102,6 +102,7 @@ ifeq ($(TRICK_FORCE_32BIT), 1) TRICK_CFLAGS += -m32 TRICK_CXXFLAGS += -m32 TRICK_LDFLAGS += -m32 + LD_PARTIAL += -m32 endif IS_CC_CLANG = $(shell ${TRICK_CPPC} -xc /dev/null -dM -E | grep -c __clang__) diff --git a/share/trick/makefiles/Makefile.sim b/share/trick/makefiles/Makefile.sim index 78d871c2..ff47d9da 100644 --- a/share/trick/makefiles/Makefile.sim +++ b/share/trick/makefiles/Makefile.sim @@ -43,14 +43,14 @@ sie ICG force_ICG convert_swig S_define_exp: @if [ -f build/Makefile_sim ] ; then $(MAKE) --no-print-directory -f build/Makefile_sim $@ ; else echo "No build/Makefile_sim found" ; fi help: - @ echo -e "\n\ + @ echo -e "\ Simulation make options:\n\ - make - Makes everything: S_main and S_sie.resource\n\ - make S_sie.resource - Rebuilds the S_sie.resource file.\n\ - make clean - Removes all object files in simulation directory\n\ - make real_clean - Performs a clean\n\ - make spotless - Performs a clean\n\ - make apocalypse - Performs a clean" + make [debug] [TRICK_VERBOSE_BUILD=1] - Makes everything: S_main and S_sie.resource\n\ + make model_dirs - Lists model directories use to build simulation\n\ + make sie - Builds the S_sie.resource file.\n\ + make clean - Removes all object files in simulation directory\n\ + make spotless - Performs a clean\n\ + make apocalypse - Performs a clean" tidy: -rm -f S_sie.resource