beremiz

merge

2014-11-12, mjsousa
144cf3af992c
Parents 3eda8d8f622dfa09aae984e9
Children 23045c351012
merge
1 files changed, 4 insertions(+), 3 deletions(-)
  • +4 -3
    ProjectController.py
    • --- a/ProjectController.py Tue Jul 08 18:01:33 2014 +0100
    +++ b/ProjectController.py Wed Nov 12 17:36:27 2014 +0000
    @@ -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
    @@ -440,7 +441,7 @@
    if len(self.Libraries)==0:
    return [],[],()
    self.GetIECProgramsAndVariables()
    - LibIECCflags = '"-I%s/C" -Wno-unused-function'%os.path.abspath(self.GetIECLibPath())
    + LibIECCflags = '"-I%s" -Wno-unused-function'%os.path.abspath(self.GetIECLibPath())
    LocatedCCodeAndFlags=[]
    Extras=[]
    for lib in self.Libraries:
    @@ -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/C" -Wno-unused-function'%self.ieclib_path
    + self.plcCFLAGS = '"-I%s" -Wno-unused-function'%self.ieclib_c_path
    return True
    def GetBuilder(self):