Website Summary Files Commits Branches @commit @diff @stats
path: root / spasm / solution
diff options
context:
space:
mode:
Commit034a710af4a31c257719c78d735b80acf6f8e797 (patch)
Author
 Dimitar Trendafilov <dimitar@coherent-labs.com>
2018-11-05 23:50:47 +0200
Committer
 Dimitar Trendafilov <dimitar@coherent-labs.com>
2018-11-05 23:50:47 +0200
Files7a4ed6f152f4823e7ca49f4f1165db7bafabe21b /spasm/solution
IPL-034a710af4a31c257719c78d735b80acf6f8e797.tar
IPL-034a710af4a31c257719c78d735b80acf6f8e797.tar.gz
IPL-034a710af4a31c257719c78d735b80acf6f8e797.zip
Parentc3252e63c296d1133254f4973fe7e3bf52cc6c1a (diff)
Allowed inclusion of spasm solution in other solutions
1 files changed, 6 insertions, 4 deletions
-rw-r--r--spasm/solution/genie.lua10
diff --git a/spasm/solution/genie.lua b/spasm/solution/genie.lua
index b3bb00f..b310ad0 100644
--- a/spasm/solution/genie.lua
+++ b/spasm/solution/genie.lua
@@ -1,4 +1,5 @@
-solution 'spasm'
+if not solution() then
+ solution 'spasm'
configurations {'Debug', 'Release'}
platforms { 'x64' }
flags {
@@ -8,9 +9,9 @@ solution 'spasm'
'Symbols',
}
- defines {
- '_SCL_SECURE_NO_WARNINGS',
- }
+ defines {
+ '_SCL_SECURE_NO_WARNINGS',
+ }
local root = '../build/'
@@ -23,6 +24,7 @@ solution 'spasm'
targetdir(root .. 'bin/Release')
objdir(root .. 'obj/Release')
configuration '*'
+end
project 'sprt'
kind 'StaticLib'