diff options
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/android/android.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/iphonesimulator.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/linux/linux.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/macosx/macosx.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/mingw/mingw.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/tools/cl.lua | 4 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/tools/link.lua | 6 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/tools/ml.lua | 4 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/tools/nmake.lua | 6 |
10 files changed, 16 insertions, 10 deletions
diff --git a/xmake/scripts/platform/android/android.lua b/xmake/scripts/platform/android/android.lua index 5226495b0..456aceaca 100644 --- a/xmake/scripts/platform/android/android.lua +++ b/xmake/scripts/platform/android/android.lua @@ -54,6 +54,7 @@ function android.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") -- init flags local arch = config.get("arch") diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index dad9c8252..ff9ddfdc0 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -56,6 +56,7 @@ function iphoneos.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") configs.tools.lipo = config.get("lipo") -- init flags for architecture diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua index 87c3970b9..3765fbe85 100644 --- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua +++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua @@ -55,6 +55,7 @@ function iphonesimulator.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") -- init flags for architecture local archflags = nil diff --git a/xmake/scripts/platform/linux/linux.lua b/xmake/scripts/platform/linux/linux.lua index 62ff0d04c..dc8c9cb27 100644 --- a/xmake/scripts/platform/linux/linux.lua +++ b/xmake/scripts/platform/linux/linux.lua @@ -55,6 +55,7 @@ function linux.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") -- init flags for architecture local archflags = nil diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua index 9168d9ae3..c7f4eb2c4 100644 --- a/xmake/scripts/platform/macosx/macosx.lua +++ b/xmake/scripts/platform/macosx/macosx.lua @@ -55,6 +55,7 @@ function macosx.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") -- init flags for architecture local archflags = nil diff --git a/xmake/scripts/platform/mingw/mingw.lua b/xmake/scripts/platform/mingw/mingw.lua index 430d3519a..f40e76480 100644 --- a/xmake/scripts/platform/mingw/mingw.lua +++ b/xmake/scripts/platform/mingw/mingw.lua @@ -53,6 +53,7 @@ function mingw.make(configs) configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") + configs.tools.ex = config.get("ar") -- init flags for architecture local archflags = nil diff --git a/xmake/scripts/platform/windows/tools/cl.lua b/xmake/scripts/platform/windows/tools/cl.lua index fa961273b..ac91273b1 100644 --- a/xmake/scripts/platform/windows/tools/cl.lua +++ b/xmake/scripts/platform/windows/tools/cl.lua @@ -33,7 +33,7 @@ local platform = require("platform/platform") function cl.init(self, name) -- save name - self._NAME = name or "cl.exe" + self.name = name or "cl.exe" -- init cxflags self.cxflags = { "-nologo", "-Gd", "-MP4", "-D_MBCS", "-D_CRT_SECURE_NO_WARNINGS"} @@ -90,7 +90,7 @@ function cl.command_compile(self, srcfile, objfile, flags, logfile) if logfile then redirect = string.format(" > %s 2>&1", logfile) end -- make it - return string.format("%s -c %s -Fo%s %s%s", self._NAME, flags, objfile, srcfile, redirect) + return string.format("%s -c %s -Fo%s %s%s", self.name, flags, objfile, srcfile, redirect) end -- make the define flag diff --git a/xmake/scripts/platform/windows/tools/link.lua b/xmake/scripts/platform/windows/tools/link.lua index 84df08694..b1fda427a 100644 --- a/xmake/scripts/platform/windows/tools/link.lua +++ b/xmake/scripts/platform/windows/tools/link.lua @@ -33,7 +33,7 @@ local platform = require("platform/platform") function link.init(self, name) -- save name - self._NAME = name or "link.exe" + self.name = name or "link.exe" -- the architecture local arch = config.get("arch") @@ -79,11 +79,11 @@ function link.command_link(self, objfiles, targetfile, flags, logfile) if logfile then redirect = string.format(" > %s 2>&1", logfile) end -- make it - local cmd = string.format("%s %s -out:%s %s%s", self._NAME, flags, targetfile, objfiles, redirect) + local cmd = string.format("%s %s -out:%s %s%s", self.name, flags, targetfile, objfiles, redirect) -- too long? if #cmd > 256 then - cmd = string.format("%s%s @<<\n%s -out:%s %s\n<<", self._NAME, redirect, flags, targetfile, objfiles) + cmd = string.format("%s%s @<<\n%s -out:%s %s\n<<", self.name, redirect, flags, targetfile, objfiles) end -- ok? diff --git a/xmake/scripts/platform/windows/tools/ml.lua b/xmake/scripts/platform/windows/tools/ml.lua index c2ea9b9ab..5a6034320 100644 --- a/xmake/scripts/platform/windows/tools/ml.lua +++ b/xmake/scripts/platform/windows/tools/ml.lua @@ -33,7 +33,7 @@ local platform = require("platform/platform") function ml.init(self, name) -- save name - self._NAME = name or "ml.exe" + self.name = name or "ml.exe" -- init asflags self.asflags = { "-nologo", "-Gd", "-MP4", "-D_MBCS", "-D_CRT_SECURE_NO_WARNINGS"} @@ -84,7 +84,7 @@ function ml.command_compile(self, srcfile, objfile, flags, logfile) if logfile then redirect = string.format(" > %s 2>&1", logfile) end -- make it - return string.format("%s -c %s -Fo%s %s%s", self._NAME, flags, objfile, srcfile, redirect) + return string.format("%s -c %s -Fo%s %s%s", self.name, flags, objfile, srcfile, redirect) end -- make the define flag diff --git a/xmake/scripts/platform/windows/tools/nmake.lua b/xmake/scripts/platform/windows/tools/nmake.lua index 0ba2e32e3..3dddc7cf2 100644 --- a/xmake/scripts/platform/windows/tools/nmake.lua +++ b/xmake/scripts/platform/windows/tools/nmake.lua @@ -35,7 +35,7 @@ local nmake = nmake or {} function nmake.init(self, name) -- save name - self._NAME = name or "nmake.exe" + self.name = name or "nmake.exe" -- is verbose? self._VERBOSE = utils.ifelse(xmake._OPTIONS.verbose, "-v", "") @@ -55,9 +55,9 @@ function nmake.main(self, mkfile, target) -- make command local cmd = nil if mkfile and os.isfile(mkfile) then - cmd = string.format("%s /nologo /f %s %s VERBOSE=%s", self._NAME, mkfile, target or "", self._VERBOSE) + cmd = string.format("%s /nologo /f %s %s VERBOSE=%s", self.name, mkfile, target or "", self._VERBOSE) else - cmd = string.format("%s /nologo %s VERBOSE=%s", self._NAME, target or "", self._VERBOSE) + cmd = string.format("%s /nologo %s VERBOSE=%s", self.name, target or "", self._VERBOSE) end -- done |
