diff -r 8a726a62fbfc -r 9ad18a387a96 plugger.py --- a/plugger.py Sun Dec 09 17:15:56 2007 +0100 +++ b/plugger.py Sun Dec 09 18:58:39 2007 +0100 @@ -513,7 +513,12 @@ #################################################################################### #################################################################################### -iec2c_path = os.path.join(base_folder, "matiec", "iec2c") +if wx.Platform != '__WXMSW__': + exe_ext=".exe" +else: + exe_ext="" + +iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+exe_ext) ieclib_path = os.path.join(base_folder, "matiec", "lib") # import for project creation timestamping @@ -580,6 +585,9 @@ + + + @@ -873,6 +881,9 @@ # Compile the resulting code into object files. compiler = self.BeremizRoot.getCompiler() + _CFLAGS = self.BeremizRoot.getCFLAGS() + linker = self.BeremizRoot.getLinker() + _LDFLAGS = self.BeremizRoot.getLDFLAGS() obns = [] objs = [] for Location, CFilesAndCFLAGS, DoCalls in LocationCFilesAndCFLAGS: @@ -887,7 +898,7 @@ obns.append(obn) logger.write(" [CC] "+bn+" -> "+obn+"\n") objectfilename = os.path.splitext(CFile)[0]+".o" - status, result, err_result = logger.LogCommand("%s -c %s -o %s %s"%(compiler, CFile, objectfilename, CFLAGS)) + status, result, err_result = logger.LogCommand("%s -c %s -o %s %s %s"%(compiler, CFile, objectfilename, _CFLAGS, CFLAGS)) if status != 0: logger.write_error("Build failed\n") return False @@ -899,7 +910,7 @@ exe += ".exe" exe_path = os.path.join(buildpath, exe) logger.write(" [CC] " + ' '.join(obns)+" -> " + exe + "\n") - status, result, err_result = logger.LogCommand("%s %s -o %s %s"%(compiler, " ".join(objs), exe_path, ' '.join(LDFLAGS))) + status, result, err_result = logger.LogCommand("%s %s -o %s %s"%(linker, " ".join(objs), exe_path, ' '.join(LDFLAGS+[_LDFLAGS]))) if status != 0: logger.write_error("Build failed\n") return False