Skip to content

Commit 6fdb94a

Browse files
author
Thomas Desveaux
committed
Merge remote-tracking branch 'origin/master' into debuggerflavor
2 parents ed2b419 + cb1f642 commit 6fdb94a

File tree

8 files changed

+534
-24
lines changed

8 files changed

+534
-24
lines changed

‎.travis.yml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,30 @@
1-
os:
2-
- linux
3-
- osx
1+
language: c++
2+
dist: trusty
3+
sudo: false
4+
matrix:
5+
include:
6+
# Linux Debug
7+
- os: linux
8+
compiler: gcc
9+
env:
10+
- CONFIGURATION=debug
11+
# Linux Release
12+
- os: linux
13+
compiler: gcc
14+
env:
15+
- CONFIGURATION=release
16+
# macOS Debug x86
17+
- os: osx
18+
osx_image: xcode9
19+
env:
20+
- CONFIGURATION=debug
21+
# macOS Release x86
22+
- os: osx
23+
osx_image: xcode9
24+
env:
25+
- CONFIGURATION=release
426

527
script:
6-
- make -f Bootstrap.mak $TRAVIS_OS_NAME
7-
- make -C build/bootstrap -j config=debug
8-
- bin/release/premake5 test
28+
- make -f Bootstrap.mak $TRAVIS_OS_NAME CONFIG=${CONFIGURATION}
29+
- bin/${CONFIGURATION}/premake5 test
930

‎Bootstrap.mak

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
MSDEV = vs2012
2+
CONFIG = release
3+
PLATFORM = x86
24
LUA_DIR = contrib/lua/src
35
LUASHIM_DIR = contrib/luashim
46

@@ -36,8 +38,8 @@ SRC = src/host/*.c \
3638
$(LUA_DIR)/lvm.c \
3739
$(LUA_DIR)/lzio.c \
3840

39-
PLATFORM= none
40-
default: $(PLATFORM)
41+
HOST_PLATFORM= none
42+
default: $(HOST_PLATFORM)
4143

4244
none:
4345
@echo "Please do"
@@ -57,7 +59,7 @@ mingw: $(SRC)
5759
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lole32
5860
./build/bootstrap/premake_bootstrap embed
5961
./build/bootstrap/premake_bootstrap --os=windows --to=build/bootstrap gmake
60-
$(MAKE) -C build/bootstrap
62+
$(MAKE) -C build/bootstrap config=$(CONFIG)_$(PLATFORM)
6163

6264
osx: $(SRC)
6365
$(SILENT) rm -rf ./bin
@@ -67,7 +69,7 @@ osx: $(SRC)
6769
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $?
6870
./build/bootstrap/premake_bootstrap embed
6971
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
70-
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
72+
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
7173

7274
linux: $(SRC)
7375
$(SILENT) rm -rf ./bin
@@ -77,7 +79,7 @@ linux: $(SRC)
7779
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm -ldl -lrt
7880
./build/bootstrap/premake_bootstrap embed
7981
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
80-
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
82+
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
8183

8284
bsd: $(SRC)
8385
$(SILENT) rm -rf ./bin
@@ -87,7 +89,7 @@ bsd: $(SRC)
8789
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
8890
./build/bootstrap/premake_bootstrap embed
8991
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
90-
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
92+
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
9193

9294
windows-base: $(SRC)
9395
$(SILENT) if exist .\bin rmdir /s /q .\bin
@@ -100,7 +102,7 @@ windows-base: $(SRC)
100102

101103
windows: windows-base
102104
devenv .\build\bootstrap\Premake5.sln /Upgrade
103-
devenv .\build\bootstrap\Premake5.sln /Build Release
105+
devenv .\build\bootstrap\Premake5.sln /Build "$(CONFIG)|$(PLATFORM:x86=win32)"
104106

105107
windows-msbuild: windows-base
106-
msbuild /p:Configuration=Release /p:Platform=Win32 .\build\bootstrap\Premake5.sln
108+
msbuild /p:Configuration=$(CONFIG) /p:Platform=$(PLATFORM:x86=win32) .\build\bootstrap\Premake5.sln

‎appveyor.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@ os: Visual Studio 2015
22

33
platform:
44
- Win32
5+
- x64
6+
7+
configuration:
8+
- Debug
9+
- Release
510

611
before_build:
712
- cmd: git clean -ffxd
813

914
build_script:
1015
- cmd: call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
11-
- cmd: nmake -f Bootstrap.mak MSDEV=vs2015 windows
16+
- cmd: nmake -f Bootstrap.mak MSDEV=vs2015 windows PLATFORM=%PLATFORM% CONFIG=%CONFIGURATION%
1217

1318
test_script:
14-
- cmd: bin\release\premake5 test
19+
- cmd: bin\%CONFIGURATION%\premake5 test

‎modules/vstudio/_preload.lua

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,100 @@
2121
include("vs2015.lua")
2222
include("vs2017.lua")
2323

24+
-- Initialize Specific API
25+
26+
p.api.register {
27+
name = "shaderoptions",
28+
scope = "config",
29+
kind = "list:string",
30+
tokens = true,
31+
pathVars = true,
32+
}
33+
34+
p.api.register {
35+
name = "shaderdefines",
36+
scope = "config",
37+
kind = "list:string",
38+
tokens = true,
39+
}
40+
41+
p.api.register {
42+
name = "shadertype",
43+
scope = "config",
44+
kind = "string",
45+
allowed = {
46+
"Effect",
47+
"Vertex",
48+
"Pixel",
49+
"Geometry",
50+
"Hull",
51+
"Domain",
52+
"Compute",
53+
"Texture",
54+
"RootSignature",
55+
}
56+
}
57+
58+
p.api.register {
59+
name = "shadermodel",
60+
scope = "config",
61+
kind = "string",
62+
allowed = {
63+
"2.0",
64+
"3.0",
65+
"4.0_level_9_1",
66+
"4.0_level_9_3",
67+
"4.0",
68+
"4.1",
69+
"5.0",
70+
}
71+
}
72+
73+
p.api.register {
74+
name = "shaderentry",
75+
scope = "config",
76+
kind = "string",
77+
tokens = true,
78+
}
79+
80+
p.api.register {
81+
name = "shadervariablename",
82+
scope = "config",
83+
kind = "string",
84+
tokens = true,
85+
}
86+
87+
p.api.register {
88+
name = "shaderheaderfileoutput",
89+
scope = "config",
90+
kind = "string",
91+
tokens = true,
92+
}
93+
94+
p.api.register {
95+
name = "shaderobjectfileoutput",
96+
scope = "config",
97+
kind = "string",
98+
tokens = true,
99+
}
100+
101+
p.api.register {
102+
name = "shaderassembler",
103+
scope = "config",
104+
kind = "string",
105+
allowed = {
106+
"NoListing",
107+
"AssemblyCode",
108+
"AssemblyCodeAndHex",
109+
}
110+
}
111+
112+
p.api.register {
113+
name = "shaderassembleroutput",
114+
scope = "config",
115+
kind = "string",
116+
tokens = true,
117+
}
24118

25119
p.api.register {
26120
name = "debuggerflavor",

‎modules/vstudio/tests/_tests.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ return {
6363
"vc2010/test_language_settings.lua",
6464
"vc2010/test_language_targets.lua",
6565
"vc2010/test_floatingpoint.lua",
66+
"vc2010/test_fxcompile_settings.lua",
6667
"vc2010/test_globals.lua",
6768
"vc2010/test_header.lua",
6869
"vc2010/test_files.lua",

0 commit comments

Comments
 (0)