From dc72c688d6e38ac027af36e4304c15ee2eaff551 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 13 Oct 2016 23:08:53 +0200 Subject: [PATCH] [DEBUG] correct external includes --- lutinLib_ffmpegCommon.py | 1 + lutin_ffmpeg-headers.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lutinLib_ffmpegCommon.py b/lutinLib_ffmpegCommon.py index c91131a..2ec29bc 100644 --- a/lutinLib_ffmpegCommon.py +++ b/lutinLib_ffmpegCommon.py @@ -6,6 +6,7 @@ import os import lutinLib_ffmpegCommon def add_generate_path(target, my_module): + return generated_path = os.path.join("generated", target.get_name()) generated_path_bs = os.path.join("generated", target.get_name() + "_" + str(target.get_bus_size())) if os.path.exists(os.path.join(os.path.dirname(__file__), generated_path_bs)) == True: diff --git a/lutin_ffmpeg-headers.py b/lutin_ffmpeg-headers.py index dc14cf4..e87b136 100644 --- a/lutin_ffmpeg-headers.py +++ b/lutin_ffmpeg-headers.py @@ -31,4 +31,27 @@ def configure(target, my_module): 'ffmpeg/*.h', ], recursive=True) + + generated_path = os.path.join("generated", target.get_name()) + generated_path_bs = os.path.join("generated", target.get_name() + "_" + str(target.get_bus_size())) + if os.path.exists(os.path.join(os.path.dirname(__file__), generated_path_bs)) == True: + #my_module.add_path(generated_path_bs) + my_module.add_header_file([ + generated_path_bs + "/*", + ], + recursive=True) + elif os.path.exists(os.path.join(os.path.dirname(__file__), generated_path)) == True: + #my_module.add_path(generated_path) + my_module.add_header_file([ + generated_path + "/*", + ], + recursive=True) + else: + debug.warning("get default Path for type: " + str(target.get_type())) + #my_module.add_path("generated/Linux") + my_module.add_header_file([ + "generated/Linux/*", + ], + recursive=True) + return True \ No newline at end of file