Page MenuHomePhabricator (Chris)
Files F132395

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/SConstruct b/SConstruct
index f7c70035..4536657a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,54 +1,53 @@
import os
import scons.utils
import scons.checks
SetOption('num_jobs', scons.utils.detectCPUs())
includedir = '{0}/include'.format(os.getcwd())
env = Environment(ENV = os.environ, CPPPATH=includedir, tools=['textfile', 'default'])
config = env.Configure(custom_tests = {'CheckAllegro5': scons.checks.checkAllegro5(False)})
config.CheckAllegro5()
env = config.Finish()
#TODO Need to do separate checks later
env.ParseConfig('freetype-config --libs --cflags')
build_dir = 'build'
options = {'networking': False,
'allegro5': True
}
scons.checks.configChecks(env)
env.VariantDir(build_dir, 'src')
-rtech1 = env.Library('lib/r-tech1', env.SConscript('src/SConscript', variant_dir=build_dir, exports=['env', 'options']))
+rtech1 = env.StaticLibrary('lib/r-tech1', env.SConscript('src/SConscript', variant_dir=build_dir, exports=['env', 'options']))
env.Default(rtech1)
# Install target and configuration
env.Install('{0}/lib'.format(env.installPrefix), rtech1)
+env.Install('{0}/include'.format(env.installPrefix), 'include/r-tech1')
-# PC script (note add the rest to checks in checks.py configChecks)
+# PC script
replacelist = {
'%prefix%': env.installPrefix,
-'%libdir%': '',
-'%includedir%': '',
-'%rtech1_version%': '',
+'%rtech1_version%': '1',
}
pc_install = '{0}/lib/pkgconfig/r-tech1.pc'.format(env.installPrefix)
pc_copied = Command(build_dir + '/temp.pc.in', 'misc/r-tech1.pc.in', Copy('$TARGET', '$SOURCE'))
pc_script = env.Substfile(build_dir + '/temp.pc.in', SUBST_DICT = replacelist)
env.Depends(pc_script, pc_copied)
pc_mod = Command(build_dir + '/r-tech1.pc', build_dir + '/temp.pc', Copy('$TARGET', '$SOURCE'))
env.Depends(pc_mod, pc_script)
env.InstallAs(pc_install, pc_mod)
# Install
env.Alias('install', [env.installPrefix, pc_install])
env.Depends([env.installPrefix, pc_mod], rtech1)
# Uninstall target
env.Command("uninstall", None, Delete(FindInstalledFiles()))
diff --git a/misc/r-tech1.pc.in b/misc/r-tech1.pc.in
index c5880765..aaa4666b 100644
--- a/misc/r-tech1.pc.in
+++ b/misc/r-tech1.pc.in
@@ -1,11 +1,11 @@
prefix=%prefix%
exec_prefix=${prefix}
-libdir=%libdir%
-includedir=%includedir%
+libdir=${prefix}/lib
+includedir=${prefix}/include
version=%rtech1_version%
Name: r-tech1
Description: R-Tech1 Library Wrapper Utility
Version: ${version}
Libs: -L${libdir} -lr-tech1
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/r-tech1

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jun 16, 12:45 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69977
Default Alt Text
(2 KB)

Event Timeline