From 5462d2316e026cbb199ef6524737ebe15c318d4a Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Mon, 9 Sep 2024 21:54:47 +0200 Subject: [PATCH] Updated to use the new S++. --- SConstruct | 4 +++- external/scons-plus-plus | 2 +- private/spp_template/{SConscript => SModule} | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) rename private/spp_template/{SConscript => SModule} (73%) diff --git a/SConstruct b/SConstruct index bd9986d..7d1732c 100644 --- a/SConstruct +++ b/SConstruct @@ -5,4 +5,6 @@ env = SConscript('external/scons-plus-plus/SConscript', exports = ['config']) env.Append(CPPPATH = [Dir('private'), Dir('public')]) # app -env = SConscript('private/spp_template/SConscript', exports = 'env', variant_dir = env['VARIANT_DIR'], src_dir = '.') +env = env.Module('private/spp_template/SModule') + +env.Finalize() diff --git a/external/scons-plus-plus b/external/scons-plus-plus index 27f6869..bdf063a 160000 --- a/external/scons-plus-plus +++ b/external/scons-plus-plus @@ -1 +1 @@ -Subproject commit 27f6869a1f8cf30437a1009a8851cd52b90b4e06 +Subproject commit bdf063a16c6bafd137f57eee780c83345887c46c diff --git a/private/spp_template/SConscript b/private/spp_template/SModule similarity index 73% rename from private/spp_template/SConscript rename to private/spp_template/SModule index b85dbb8..31cae3e 100644 --- a/private/spp_template/SConscript +++ b/private/spp_template/SModule @@ -1,9 +1,6 @@ Import('env') -# Mijin -lib_mijin = env.Cook('mijin') - src_files = Split(""" main.cpp """) @@ -11,7 +8,9 @@ src_files = Split(""" prog_app = env.UnityProgram( target = env['BIN_DIR'] + '/spp_template', source = src_files, - dependencies = [lib_mijin] + dependencies = { + 'mijin': {} + } ) env.Default(prog_app)