From 8781cc0854f4f470eb43f7ec71c0e2a63523d325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Matos?= Date: Thu, 17 Apr 2014 00:50:30 +0100 Subject: [PATCH] Fixed the resource stream loading to work with Mono resources. --- .../Passes/GetterSetterToPropertyAdvancedPass.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs index 2761be6b..d3c6072f 100644 --- a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs +++ b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs @@ -26,13 +26,21 @@ namespace CppSharp.Passes LoadVerbs(); } + static Stream GetResourceStream (Assembly assembly) + { + var stream = assembly.GetManifestResourceStream("CppSharp.Generator.Passes.verbs.txt"); + if (stream != null) + return stream; + + stream = assembly.GetManifestResourceStream("verbs.txt"); + return stream; + } + private static void LoadVerbs() { - using (var resourceStream = Assembly.GetExecutingAssembly() - .GetManifestResourceStream("CppSharp.Generator.Passes.verbs.txt")) + var assembly = Assembly.GetExecutingAssembly(); + using (var resourceStream = GetResourceStream(assembly)) { - if (resourceStream == null) return; - using (var streamReader = new StreamReader(resourceStream)) while (!streamReader.EndOfStream) verbs.Add(streamReader.ReadLine());