Skip to content
Snippets Groups Projects
Commit 7f892df7 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

re-added move-globals

parent d032435c
No related branches found
No related tags found
No related merge requests found
Pipeline #3738 failed
...@@ -53,6 +53,7 @@ Export('env') ...@@ -53,6 +53,7 @@ Export('env')
# list of zipr plugins and irdb xforms to build # list of zipr plugins and irdb xforms to build
transformDirs=''' transformDirs='''
builtin_xforms/add_lib builtin_xforms/add_lib
builtin_xforms/move_globals
builtin_xforms/resolve_callbacks builtin_xforms/resolve_callbacks
zipr_push64_reloc_plugin zipr_push64_reloc_plugin
zipr zipr
......
tbd
\ No newline at end of file
...@@ -23,7 +23,7 @@ LIBPATH="$PEASOUP_HOME/irdb-libs/lib" ...@@ -23,7 +23,7 @@ LIBPATH="$PEASOUP_HOME/irdb-libs/lib"
LIBS=Split("irdb-core irdb-cfg irdb-util irdb-transform irdb-deep StructDiv EXEIO ") LIBS=Split("irdb-core irdb-cfg irdb-util irdb-transform irdb-deep StructDiv EXEIO ")
myenv.Append(CPPPATH=Split(cpppath)) myenv.Append(CPPPATH=Split(cpppath))
pgm=myenv.SharedLibrary(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS) pgm=myenv.SharedLibrary(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$MG_HOME/plugins_install/", pgm) install=myenv.Install("$PEASOUP_HOME/irdb-libs/plugins_install/", pgm)
Default(install) Default(install)
Return('install') Return('install')
#
# Copyright 2017-2019 University of Virginia
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# Scons is python based. We import OS to get at the environment.
#
import os
#
# create a basic scons environment
#
env=Environment()
#
# Include environment variables. These lines throw semi-readable errors if the environment is not defined properly.
#
env.Replace(IRDB_SDK= os.environ['IRDB_SDK'] ) # IRDB_SDK and IRDB_LIB by convention to find headers and libraries.
env.Replace(PEASOUP_HOME= os.environ['PEASOUP_HOME'] ) # IRDB_SDK and IRDB_LIB by convention to find headers and libraries.
env.Replace(IRDB_LIBS= os.environ['IRDB_LIBS'] )
env.Replace(MG_HOME= os.environ['MG_HOME'] )
#
# Check for "debug=1" on the scons command line
#
env.Replace(debug=ARGUMENTS.get("debug",0)) # build in debug mode?
#
# Required: need these flag to appropriately include/link IRDB files.
#
env.Append(CXXFLAGS=" -std=c++11 ") # enable c++11
env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs ") # irdb libs may have symbols that resolve OK at runtime, but not linktime.
# if we are building in debug mode, use -g, else use -O
if int(env['debug']) == 1:
env.Append(CFLAGS= " -g ")
env.Append(CXXFLAGS= " -g ")
env.Append(LINKFLAGS= " -g ")
env.Append(SHLINKFLAGS=" -g ")
else:
env.Append(CFLAGS= " -O ")
env.Append(CXXFLAGS= " -O ")
env.Append(LINKFLAGS= " -O ")
env.Append(SHLINKFLAGS=" -O ")
Export('env')
SConscript("SConscript", variant_dir='build')
#
# Tell pszr where to search for plugins
#
export MG_HOME=$PWD
export PSPATH=$PSPATH:$MG_HOME/plugins_install
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment