# HG changeset patch
# User Edouard Tisserant
# Date 1421442568 -3600
# Node ID 7e00c406d3463c1643d4a53d953e573a51f70b5b
# Parent  e14003eb4d42c9bcc9fbcf7188332c79b2b2c56f# Parent  e01b52d948c397aaf53bd50732b3c47479838888
merged forgotten changes

diff -r e14003eb4d42 -r 7e00c406d346 ProjectController.py
--- a/ProjectController.py	Fri Dec 12 14:41:53 2014 +0100
+++ b/ProjectController.py	Fri Jan 16 22:09:28 2015 +0100
@@ -118,6 +118,7 @@
 
         self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else ""))
         self.ieclib_path = os.path.join(base_folder, "matiec", "lib")
+        self.ieclib_c_path = os.path.join(base_folder, "matiec", "lib", "C")
 
         # Setup debug information
         self.IECdebug_datas = {}
@@ -204,7 +205,7 @@
         return self
 
     def GetIECLibPath(self):
-        return self.ieclib_path
+        return self.ieclib_c_path
 
     def GetIEC2cPath(self):
         return self.iec2c_path
@@ -613,7 +614,7 @@
         # files are listed to stdout, and errors to stderr.
         status, result, err_result = ProcessLogger(
                self.logger,
-               "\"%s\" -f -I \"%s\" -T \"%s\" \"%s\""%(
+               "\"%s\" -f -l -p -I \"%s\" -T \"%s\" \"%s\""%(
                          self.iec2c_path,
                          self.ieclib_path,
                          buildpath,
@@ -675,7 +676,7 @@
         # Keep track of generated C files for later use by self.CTNGenerate_C
         self.PLCGeneratedCFiles = C_files
         # compute CFLAGS for plc
-        self.plcCFLAGS = '"-I%s" -Wno-unused-function'%self.ieclib_path
+        self.plcCFLAGS = '"-I%s" -Wno-unused-function'%self.ieclib_c_path
         return True
 
     def GetBuilder(self):