publish changes
This commit is contained in:
Archie
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
|
@ -34,7 +34,7 @@ OSX:
|
|||
https://github.com/bkaradzic/bx/raw/master/tools/bin/darwin/genie
|
||||
|
||||
Windows:
|
||||
https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe
|
||||
https://github.com/bkaradzic/bx/raw/master/tools/bin/arch/genie.exe
|
||||
|
||||
Building (dev)
|
||||
--------------
|
||||
|
|
@ -95,7 +95,7 @@ of Premake 4.4 beta 5, and there is no intention to keep it compatible with it.
|
|||
- Fixed PCH race when using concurrent Makefile build.
|
||||
- Added Green Hills Software compiler support.
|
||||
- Added edit & continue support for 64-bit builds in vs2013 upwards.
|
||||
- Added `windowstargetplatformversion` to specify VS Windows target version.
|
||||
- Added `archtargetplatformversion` to specify VS Windows target version.
|
||||
- Added `NoWinRT` flag to disable WinRT CX builds.
|
||||
- Added `NoBufferSecurityCheck` flag to disable security checks in VS.
|
||||
- Added `nopch` file list to exclude files from using PCH.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ MAKEFILE = genie.make
|
|||
|
||||
ifeq ($(config),release)
|
||||
OBJDIR = obj/Release
|
||||
TARGETDIR = ../../bin/windows
|
||||
TARGETDIR = ../../bin/arch
|
||||
override TARGET = $(TARGETDIR)/genie.exe
|
||||
DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE
|
||||
INCLUDES += -I"../../src/host/lua-5.3.0/src"
|
||||
|
|
@ -134,7 +134,7 @@ endif
|
|||
|
||||
ifeq ($(config),debug)
|
||||
OBJDIR = obj/Debug
|
||||
TARGETDIR = ../../bin/windows
|
||||
TARGETDIR = ../../bin/arch
|
||||
override TARGET = $(TARGETDIR)/genie.exe
|
||||
DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE
|
||||
INCLUDES += -I"../../src/host/lua-5.3.0/src"
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Release\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Release\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ Possible values:
|
|||
|
||||
* Configuration names - configuration names passed to [configurations](#configurations)
|
||||
* Action names - "vs2015", "gmake", etc.
|
||||
* Operating system names - "windows", "macosx", etc.
|
||||
* Operating system names - "arch", "macosx", etc.
|
||||
* Platform names - "ps3", "xbox360", etc.
|
||||
* Command-line options - either built-in or custom
|
||||
* File names - very limited, but some settings can be applied to specific files
|
||||
|
|
@ -337,7 +337,7 @@ configuration "linux or macosx"
|
|||
Define a symbol based on a "not"
|
||||
|
||||
```lua
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
defines { "NOT_WINDOWS" }
|
||||
```
|
||||
|
||||
|
|
@ -1029,7 +1029,7 @@ When linking against system libraries, do not include any prefix or file extensi
|
|||
Link against some system libraries
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
links { "user32", "gdi32" }
|
||||
|
||||
configuration "linux"
|
||||
|
|
@ -1365,10 +1365,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
postbuildcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
postbuildcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -1404,10 +1404,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
prebuildcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
prebuildcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -1425,10 +1425,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
prelinkcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
prelinkcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -2072,7 +2072,7 @@ _falseval_ - value to return if _condition_ evaluates to `false`
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
result = iif(os.is("windows"), "is windows", "is not windows")
|
||||
result = iif(os.is("arch"), "is arch", "is not arch")
|
||||
```
|
||||
|
||||
Note that all expressions are evaluated before the condition is checked. The following expression cannot be implemented with an `iif` because it may try to concatenate a string value.
|
||||
|
|
@ -2125,15 +2125,15 @@ The path containing the library file, if found. Otherwise, `nil`.
|
|||
Identifies the currently-targeted operating system.
|
||||
|
||||
#### Return Value
|
||||
One of "bsd", "linux", "macosx", "solaris", or "windows"
|
||||
One of "bsd", "linux", "macosx", "solaris", or "arch"
|
||||
|
||||
**Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run.
|
||||
|
||||
#### Example
|
||||
|
||||
```lua
|
||||
if os.get() == "windows" then
|
||||
-- do something windows-specific
|
||||
if os.get() == "arch" then
|
||||
-- do something arch-specific
|
||||
end
|
||||
```
|
||||
|
||||
|
|
@ -2184,7 +2184,7 @@ print(string.format(" %d.%d.%d (%s)",
|
|||
Checks the current operating system identifier against a particular value
|
||||
|
||||
#### Arguments
|
||||
_id_ - one of "bsd", "linux", "macosx", "solaris", or "windows"
|
||||
_id_ - one of "bsd", "linux", "macosx", "solaris", or "arch"
|
||||
|
||||
**Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ endif
|
|||
endif
|
||||
endif
|
||||
else
|
||||
OS=windows
|
||||
OS=arch
|
||||
endif
|
||||
|
||||
.PHONY: release
|
||||
|
|
@ -39,7 +39,7 @@ clean:
|
|||
$(SILENT) -rm -rf bin
|
||||
|
||||
projgen:
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).windows --os=windows $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).arch --os=arch $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).linux --os=linux $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).darwin --os=macosx --platform=universal32 $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).freebsd --os=bsd $(PROJECT_TYPE)
|
||||
|
|
@ -47,7 +47,7 @@ projgen:
|
|||
rebuild:
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all
|
||||
|
||||
release-windows release-darwin: $(GENIE)
|
||||
release-arch release-darwin: $(GENIE)
|
||||
$(GENIE) release
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all
|
||||
$(SILENT) git checkout src/host/version.h
|
||||
|
|
@ -56,12 +56,12 @@ release-linux: $(GENIE)
|
|||
$(SILENT) $(GENIE) release
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).darwin clean all CC=x86_64-apple-darwin20.2-clang
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).linux clean all
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).windows clean all CC=x86_64-w64-mingw32-gcc
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).arch clean all CC=x86_64-w64-mingw32-gcc
|
||||
$(SILENT) git checkout src/host/version.h
|
||||
|
||||
release: release-$(OS)
|
||||
|
||||
dist: release
|
||||
cp bin/linux/genie ../bx/tools/bin/linux/
|
||||
cp bin/windows/genie.exe ../bx/tools/bin/windows/
|
||||
cp bin/arch/genie.exe ../bx/tools/bin/arch/
|
||||
cp bin/darwin/genie ../bx/tools/bin/darwin/
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@
|
|||
configuration "vs*"
|
||||
defines { "_CRT_SECURE_NO_WARNINGS" }
|
||||
|
||||
configuration "windows"
|
||||
targetdir "../bin/windows"
|
||||
configuration "arch"
|
||||
targetdir "../bin/arch"
|
||||
links { "ole32" }
|
||||
|
||||
configuration "linux"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ function dorelease()
|
|||
|
||||
print("Generating project files...")
|
||||
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.windows /os=windows gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.arch /os=arch gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.linux /os=linux gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.darwin /os=macosx /platform=universal32 gmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ end
|
|||
function cmake.header(prj)
|
||||
_p('# %s project autogenerated by GENie', premake.action.current().shortname)
|
||||
_p('cmake_minimum_required(VERSION 3.15)')
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
_p('cmake_policy(SET CMP0091 NEW)')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function premake.cmake.workspace(sln)
|
|||
|
||||
#########################################################################
|
||||
]])
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
f:write('cmake_policy(SET CMP0091 NEW)\n')
|
||||
end
|
||||
|
|
@ -44,7 +44,7 @@ function premake.cmake.workspace(sln)
|
|||
# CMakeLists autogenerated by GENie
|
||||
cmake_minimum_required(VERSION 3.15)
|
||||
]])
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
_p('cmake_policy(SET CMP0091 NEW)')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
-- Some actions imply a particular operating system: Visual Studio only
|
||||
-- runs on Windows, and Xcode only on Mac OS X. If this is the case,
|
||||
-- uncomment this line and set it to one of "windows", "linux" or "macosx".
|
||||
-- uncomment this line and set it to one of "arch", "linux" or "macosx".
|
||||
-- Otherwise, this action will target the current operating system.
|
||||
-- os = "macosx",
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ local cpp = premake.ninja.cpp
|
|||
local p = premake
|
||||
|
||||
local function wrap_ninja_cmd(c)
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
return 'cmd /c "' .. c .. '"'
|
||||
else
|
||||
return c
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ function qbs.generate_project(prj)
|
|||
_p(indent, 'cpp.cxxLanguageVersion: "c++98"')
|
||||
end
|
||||
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
if not cfg.flags.WinMain and (cfg.kind == 'ConsoleApp' or cfg.kind == 'WindowedApp') then
|
||||
if cfg.flags.Unicode then
|
||||
_p(indent, 'cpp.entryPoint: "wmainCRTStartup"')
|
||||
|
|
@ -188,9 +188,9 @@ function qbs.generate_project(prj)
|
|||
end
|
||||
|
||||
if cfg.flags.Unicode then
|
||||
_p(indent, 'cpp.windowsApiCharacterSet: "unicode"')
|
||||
_p(indent, 'cpp.archApiCharacterSet: "unicode"')
|
||||
else
|
||||
_p(indent, 'cpp.windowsApiCharacterSet: ""')
|
||||
_p(indent, 'cpp.archApiCharacterSet: ""')
|
||||
end
|
||||
|
||||
if not cfg.pchheader or cfg.flags.NoPCH then
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function qbs.generate_user(sln)
|
|||
|
||||
local qtcreatordir = ""
|
||||
|
||||
if _OS == "windows" then
|
||||
if _OS == "arch" then
|
||||
qtcreatordir = path.join(os.getenv("APPDATA"), "QtProject/qtcreator")
|
||||
else
|
||||
qtcreatordir = path.join(os.getenv("HOME"), ".config/QtProject/qtcreator")
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
trigger = "vs2010",
|
||||
shortname = "Visual Studio 2010",
|
||||
description = "Generate Microsoft Visual Studio 2010 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
trigger = "vs2012",
|
||||
shortname = "Visual Studio 2012",
|
||||
description = "Generate Microsoft Visual Studio 2012 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
trigger = "vs2013",
|
||||
shortname = "Visual Studio 2013",
|
||||
description = "Generate Microsoft Visual Studio 2013 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2015",
|
||||
shortname = "Visual Studio 2015",
|
||||
description = "Generate Microsoft Visual Studio 2015 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.5",
|
||||
toolsVersion = "14.0",
|
||||
windowsTargetPlatformVersion = "8.1",
|
||||
archTargetPlatformVersion = "8.1",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2017",
|
||||
shortname = "Visual Studio 2017",
|
||||
description = "Generate Microsoft Visual Studio 2017 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.5.2",
|
||||
toolsVersion = "15.0",
|
||||
windowsTargetPlatformVersion = "8.1",
|
||||
archTargetPlatformVersion = "8.1",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2019",
|
||||
shortname = "Visual Studio 2019",
|
||||
description = "Generate Microsoft Visual Studio 2019 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.7.2",
|
||||
toolsVersion = "16.0",
|
||||
windowsTargetPlatformVersion = "10.0",
|
||||
archTargetPlatformVersion = "10.0",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
_p(2, '<ProjectGuid>{%s}</ProjectGuid>',prj.uuid)
|
||||
_p(2, '<RootNamespace>%s</RootNamespace>',prj.name)
|
||||
if vstudio.storeapp ~= "durango" then
|
||||
local windowsTargetPlatformVersion = prj.windowstargetplatformversion or action.vstudio.windowsTargetPlatformVersion
|
||||
if windowsTargetPlatformVersion ~= nil then
|
||||
_p(2,'<WindowsTargetPlatformVersion>%s</WindowsTargetPlatformVersion>',windowsTargetPlatformVersion)
|
||||
local archTargetPlatformVersion = prj.archtargetplatformversion or action.vstudio.archTargetPlatformVersion
|
||||
if archTargetPlatformVersion ~= nil then
|
||||
_p(2,'<WindowsTargetPlatformVersion>%s</WindowsTargetPlatformVersion>',archTargetPlatformVersion)
|
||||
|
||||
if windowsTargetPlatformVersion and string.startswith(windowsTargetPlatformVersion, "10.") then
|
||||
_p(2,'<WindowsTargetPlatformMinVersion>%s</WindowsTargetPlatformMinVersion>', prj.windowstargetplatformminversion or "10.0.10240.0")
|
||||
if archTargetPlatformVersion and string.startswith(archTargetPlatformVersion, "10.") then
|
||||
_p(2,'<WindowsTargetPlatformMinVersion>%s</WindowsTargetPlatformMinVersion>', prj.archtargetplatformminversion or "10.0.10240.0")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -789,7 +789,7 @@
|
|||
|
||||
local function getcfglinks(cfg)
|
||||
local haswholearchive = #cfg.wholearchive > 0
|
||||
local msvcnaming = premake.getnamestyle(cfg) == "windows"
|
||||
local msvcnaming = premake.getnamestyle(cfg) == "arch"
|
||||
local iscppprj = premake.iscppproject(cfg)
|
||||
local isnetprj = premake.isdotnetproject(cfg)
|
||||
local linkobjs = {}
|
||||
|
|
@ -1734,9 +1734,9 @@
|
|||
_p('<?xml version="1.0" encoding="utf-8"?>')
|
||||
if vstudio.storeapp == "10.0" then
|
||||
_p('<Package')
|
||||
_p(1, 'xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"')
|
||||
_p(1, 'xmlns="http://schemas.microsoft.com/appx/manifest/foundation/arch10"')
|
||||
_p(1, 'xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"')
|
||||
_p(1, 'xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"')
|
||||
_p(1, 'xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/arch10"')
|
||||
_p(1, 'IgnorableNamespaces="uap mp">')
|
||||
elseif vstudio.storeapp == "durango" then
|
||||
_p('<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:mx="http://schemas.microsoft.com/appx/2013/xbox/manifest" IgnorableNamespaces="mx">')
|
||||
|
|
|
|||
|
|
@ -940,13 +940,13 @@ end
|
|||
}
|
||||
|
||||
newapifield {
|
||||
name = "windowstargetplatformversion",
|
||||
name = "archtargetplatformversion",
|
||||
kind = "string",
|
||||
scope = "project",
|
||||
}
|
||||
|
||||
newapifield {
|
||||
name = "windowstargetplatformminversion",
|
||||
name = "archtargetplatformminversion",
|
||||
kind = "string",
|
||||
scope = "project",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@
|
|||
-- build the targets
|
||||
cfg.buildtarget = premake.gettarget(cfg, "build", pathstyle, namestyle, cfg.system)
|
||||
cfg.linktarget = premake.gettarget(cfg, "link", pathstyle, namestyle, cfg.system)
|
||||
if pathstyle == "windows" then
|
||||
if pathstyle == "arch" then
|
||||
cfg.objectsdir = path.translate(cfg.objectsdir, "\\")
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
{ "linux", "Linux" },
|
||||
{ "macosx", "Apple Mac OS X" },
|
||||
{ "solaris", "Solaris" },
|
||||
{ "windows", "Microsoft Windows" },
|
||||
{ "arch", "Microsoft Windows" },
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
{
|
||||
cfgsuffix = "xbox360",
|
||||
iscrosscompiler = true,
|
||||
namestyle = "windows",
|
||||
namestyle = "arch",
|
||||
},
|
||||
PowerPC =
|
||||
{
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
cfgsuffix = "durango",
|
||||
iscrosscompiler = true,
|
||||
nosharedlibs = true,
|
||||
namestyle = "windows",
|
||||
namestyle = "arch",
|
||||
},
|
||||
TegraAndroid =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
local path, formats
|
||||
|
||||
-- assemble a search path, depending on the platform
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
formats = { "%s.dll", "%s" }
|
||||
path = os.getenv("PATH")
|
||||
else
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
|
||||
-- Identify the system
|
||||
local arch = ""
|
||||
if _OS == "windows" then
|
||||
if _OS == "arch" then
|
||||
arch = os.getenv("PROCESSOR_ARCHITECTURE")
|
||||
elseif _OS == "macosx" then
|
||||
arch = os.outputof("echo $HOSTTYPE")
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@
|
|||
return result
|
||||
else
|
||||
if (not sep) then
|
||||
if (os.is("windows")) then
|
||||
if (os.is("arch")) then
|
||||
sep = "\\"
|
||||
else
|
||||
sep = "/"
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@
|
|||
item = path.getdirectory(link)
|
||||
elseif (part == "fullpath") then
|
||||
item = link
|
||||
if namestyle == "windows" then
|
||||
if namestyle == "arch" then
|
||||
if premake.iscppproject(cfg) then
|
||||
item = item .. ".lib"
|
||||
elseif premake.isdotnetproject(cfg) then
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
end
|
||||
|
||||
if item then
|
||||
if pathstyle == "windows" and part ~= "object" then
|
||||
if pathstyle == "arch" and part ~= "object" then
|
||||
item = path.translate(item, "\\")
|
||||
end
|
||||
if not table.contains(result, item) then
|
||||
|
|
@ -401,7 +401,7 @@
|
|||
-- @param cfg
|
||||
-- The configuration to check.
|
||||
-- @returns
|
||||
-- The target naming style, one of "windows", "posix", or "PS3".
|
||||
-- The target naming style, one of "arch", "posix", or "PS3".
|
||||
--
|
||||
|
||||
function premake.getnamestyle(cfg)
|
||||
|
|
@ -417,12 +417,12 @@
|
|||
-- @param cfg
|
||||
-- The configuration to check.
|
||||
-- @returns
|
||||
-- The target path style, one of "windows" or "posix".
|
||||
-- The target path style, one of "arch" or "posix".
|
||||
--
|
||||
|
||||
function premake.getpathstyle(cfg)
|
||||
if premake.action.current().os == "windows" then
|
||||
return "windows"
|
||||
if premake.action.current().os == "arch" then
|
||||
return "arch"
|
||||
else
|
||||
return "posix"
|
||||
end
|
||||
|
|
@ -437,11 +437,11 @@
|
|||
-- @param direction
|
||||
-- One of 'build' for the build target, or 'link' for the linking target.
|
||||
-- @param pathstyle
|
||||
-- The path format, one of "windows" or "posix". This comes from the current
|
||||
-- action: Visual Studio uses "windows", GMake uses "posix", etc.
|
||||
-- The path format, one of "arch" or "posix". This comes from the current
|
||||
-- action: Visual Studio uses "arch", GMake uses "posix", etc.
|
||||
-- @param namestyle
|
||||
-- The file naming style, one of "windows" or "posix". This comes from the
|
||||
-- current tool: GCC uses "posix", MSC uses "windows", etc.
|
||||
-- The file naming style, one of "arch" or "posix". This comes from the
|
||||
-- current tool: GCC uses "posix", MSC uses "arch", etc.
|
||||
-- @param system
|
||||
-- The target operating system, which can modify the naming style. For example,
|
||||
-- shared libraries on Mac OS X use a ".dylib" extension.
|
||||
|
|
@ -465,16 +465,16 @@
|
|||
local kind = cfg.kind
|
||||
if premake.iscppproject(cfg) or premake.isvalaproject(cfg) then
|
||||
-- On Windows, shared libraries link against a static import library
|
||||
if (namestyle == "windows" or system == "windows")
|
||||
if (namestyle == "arch" or system == "arch")
|
||||
and kind == "SharedLib" and direction == "link"
|
||||
and not cfg.flags.NoImportLib
|
||||
then
|
||||
kind = "StaticLib"
|
||||
end
|
||||
|
||||
-- Posix name conventions only apply to static libs on windows (by user request)
|
||||
if namestyle == "posix" and system == "windows" and kind ~= "StaticLib" then
|
||||
namestyle = "windows"
|
||||
-- Posix name conventions only apply to static libs on arch (by user request)
|
||||
if namestyle == "posix" and system == "arch" and kind ~= "StaticLib" then
|
||||
namestyle = "arch"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -497,7 +497,7 @@
|
|||
dir = path.join(dir, subdir)
|
||||
|
||||
|
||||
if namestyle == "windows" then
|
||||
if namestyle == "arch" then
|
||||
if kind == "ConsoleApp" or kind == "WindowedApp" then
|
||||
ext = ".exe"
|
||||
elseif kind == "SharedLib" then
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
result.fullpath = path.join(result.directory, result.name)
|
||||
result.bundlepath = bundlepath or result.fullpath
|
||||
|
||||
if pathstyle == "windows" then
|
||||
if pathstyle == "arch" then
|
||||
result.directory = path.translate(result.directory, "\\")
|
||||
result.subdirectory = path.translate(result.subdirectory, "\\")
|
||||
result.fullpath = path.translate(result.fullpath, "\\")
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
|
|||
** =======================================================================
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
#undef setprogdir
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#if PLATFORM_WINDOWS
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
typedef struct struct_MatchInfo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ int os_pathsearch(lua_State* L)
|
|||
const char* split;
|
||||
|
||||
/* look for the closest path separator ; or : */
|
||||
/* can't use : on windows because it breaks on C:\path */
|
||||
/* can't use : on arch because it breaks on C:\path */
|
||||
const char* semi = strchr(path, ';');
|
||||
#if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_OS2)
|
||||
const char* full = strchr(path, ':');
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@
|
|||
#define PLATFORM_STRING "os2"
|
||||
#else
|
||||
#define PLATFORM_WINDOWS (1)
|
||||
#define PLATFORM_STRING "windows"
|
||||
#define PLATFORM_STRING "arch"
|
||||
#endif
|
||||
|
||||
|
||||
/* Pull in platform-specific headers required by built-in functions */
|
||||
#if PLATFORM_WINDOWS
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
|
||||
premake.dotnet = { }
|
||||
premake.dotnet.namestyle = "windows"
|
||||
premake.dotnet.namestyle = "arch"
|
||||
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
function premake.gcc.getcflags(cfg)
|
||||
local result = table.translate(cfg.flags, cflags)
|
||||
table.insert(result, platforms[cfg.platform].flags)
|
||||
if cfg.system ~= "windows" and cfg.kind == "SharedLib" then
|
||||
if cfg.system ~= "arch" and cfg.kind == "SharedLib" then
|
||||
table.insert(result, "-fPIC")
|
||||
end
|
||||
return result
|
||||
|
|
@ -203,13 +203,13 @@
|
|||
table.insert(result, "-shared")
|
||||
end
|
||||
|
||||
if cfg.system == "windows" and not cfg.flags.NoImportLib then
|
||||
if cfg.system == "arch" and not cfg.flags.NoImportLib then
|
||||
table.insert(result, '-Wl,--out-implib="' .. cfg.linktarget.fullpath .. '"')
|
||||
end
|
||||
end
|
||||
|
||||
if cfg.kind == "WindowedApp" and cfg.system == "windows" then
|
||||
table.insert(result, "-mwindows")
|
||||
if cfg.kind == "WindowedApp" and cfg.system == "arch" then
|
||||
table.insert(result, "-march")
|
||||
end
|
||||
|
||||
local platform = platforms[cfg.platform]
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
|
||||
premake.msc = { }
|
||||
premake.msc.namestyle = "windows"
|
||||
premake.msc.namestyle = "arch"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
--
|
||||
|
||||
premake.ow = { }
|
||||
premake.ow.namestyle = "windows"
|
||||
premake.ow.namestyle = "arch"
|
||||
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
premake.snc = { }
|
||||
|
||||
|
||||
-- TODO: Will cfg.system == "windows" ever be true for SNC? If
|
||||
-- TODO: Will cfg.system == "arch" ever be true for SNC? If
|
||||
-- not, remove the conditional blocks that use this test.
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@
|
|||
local oldos = _OS
|
||||
_OS = "linux"
|
||||
premake.action.set("vs2008")
|
||||
test.isequal(_OS, "windows")
|
||||
test.isequal(_OS, "arch")
|
||||
_OS = oldos
|
||||
end
|
||||
|
|
|
|||
|
|
@ -219,14 +219,14 @@
|
|||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveSolutionAndNoName()
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveProjectAndNoName()
|
||||
project "MyProject"
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
--
|
||||
|
||||
function suite.findlib_FindSystemLib()
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
test.istrue(os.findlib("user32"))
|
||||
else
|
||||
test.istrue(os.findlib("m"))
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@
|
|||
|
||||
function suite.translate_ReturnsCorrectSeparator_OnMixedPath()
|
||||
local actual = path.translate("dir\\dir/file")
|
||||
if (os.is("windows")) then
|
||||
if (os.is("arch")) then
|
||||
test.isequal("dir\\dir\\file", actual)
|
||||
else
|
||||
test.isequal("dir/dir/file", actual)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@
|
|||
|
||||
|
||||
function suite.valueIsSet()
|
||||
local filename = iif(os.is("windows"), "premake4.exe", "premake4")
|
||||
local filename = iif(os.is("arch"), "premake4.exe", "premake4")
|
||||
test.isequal(path.getabsolute("../bin/debug/" .. filename), _PREMAKE_COMMAND)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -33,55 +33,55 @@
|
|||
--
|
||||
|
||||
function T.keywords.matches_simple_strings()
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_files_with_simple_strings()
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.matches_with_patterns()
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fails_with_not_term()
|
||||
test.isfalse(premake.iskeywordmatch("not windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_term()
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "linux", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "linux", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_and_or()
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_with_not_and_or()
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_required_term()
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_required_term()
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
--
|
||||
-- Path Style Name Style Example Environment
|
||||
-- ---------- ---------- -------------------
|
||||
-- windows windows VStudio with MSC
|
||||
-- arch arch VStudio with MSC
|
||||
-- posix posix GMake with GCC
|
||||
-- windows posix VStudio for PS3
|
||||
-- posix windows GMake for .NET
|
||||
-- arch posix VStudio for PS3
|
||||
-- posix arch GMake for .NET
|
||||
--
|
||||
|
||||
|
||||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
function T.targets.ConsoleApp_Build_WindowsNames()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.ConsoleApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -74,13 +74,13 @@
|
|||
|
||||
function T.targets.WindowedApp_Build_WindowsNames()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.WindowedApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -109,25 +109,25 @@
|
|||
|
||||
function T.targets.SharedLib_Build_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -162,25 +162,25 @@
|
|||
|
||||
function T.targets.Bundle_Build_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -215,25 +215,25 @@
|
|||
|
||||
function T.targets.StaticLib_Build_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
|
||||
function T.targets.WindowsPaths()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "windows", "windows", "linux")
|
||||
result = premake.gettarget(cfg, "build", "arch", "arch", "linux")
|
||||
test.isequal([[..\bin]], result.directory)
|
||||
test.isequal([[..\bin\MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
--
|
||||
|
||||
function suite.cppflags_OnWindows()
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcppflags(cfg)
|
||||
test.isequal("-MMD -MP", table.concat(r, " "))
|
||||
end
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
function suite.cflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcflags(cfg)
|
||||
test.isequal('', table.concat(r,"|"))
|
||||
end
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
function suite.ldflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getldflags(cfg)
|
||||
test.isequal('-s|-shared|-Wl,--out-implib="libMyProject.a"', table.concat(r,"|"))
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue