summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-07 23:22:11 +0200
committerAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-07 23:22:11 +0200
commite1aad58dca0f32294b63971ce7d71d8cc57fa118 (patch)
tree6ed567922a2c668748f117962e4d3cdcfb6f00c6
parent206343c2ac3995dfce8daebebe84959fc581949d (diff)
Fix previous commits
-rw-r--r--recipes/libstdc++.recipe1
-rw-r--r--recipes/mingw.recipe8
2 files changed, 8 insertions, 1 deletions
diff --git a/recipes/libstdc++.recipe b/recipes/libstdc++.recipe
index e35d163..13103d8 100644
--- a/recipes/libstdc++.recipe
+++ b/recipes/libstdc++.recipe
@@ -9,6 +9,7 @@ class Recipe(recipe.Recipe):
licenses = [License.LGPL]
btype = BuildType.CUSTOM
stype = SourceType.CUSTOM
+ platform_deps = {Platform.WINDOWS: ['mingw']}
files_libs = ['libstdc++']
diff --git a/recipes/mingw.recipe b/recipes/mingw.recipe
index 7a81d52..f30dc9d 100644
--- a/recipes/mingw.recipe
+++ b/recipes/mingw.recipe
@@ -10,7 +10,7 @@ class Recipe(recipe.Recipe):
btype = BuildType.CUSTOM
stype = SourceType.CUSTOM
- files_libs = ['libwinpthread']
+ files_libs = ['libwinpthread', 'libgcc_s_sjlj']
files_satic = []
files_headers = ['include/GL']
@@ -36,13 +36,19 @@ class Recipe(recipe.Recipe):
if self.config.platform == Platform.WINDOWS:
binmingw = 'bin'
+ libmingw = 'lib'
else:
binmingw = os.path.join(self.config.host, 'lib')
+ libmngw = binmingw
# copy some dll's required at runtime
for f in ['libwinpthread-1']:
shutil.copy(
os.path.join(self.config.toolchain_prefix, binmingw, f + '.dll'),
os.path.join(self.config.prefix, 'bin', f + '.dll'))
+ for f in ['libgcc_s_sjlj-1']:
+ shutil.copy(
+ os.path.join(self.config.toolchain_prefix, libmingw, f + '.dll'),
+ os.path.join(self.config.prefix, 'bin', f + '.dll'))
for f in self.files_headers:
src = os.path.join(self.config.toolchain_prefix, self.config.host, f)