MAME SVN History

199869 Revisions

r36136 Saturday 28th February, 2015 at 07:06:32 UTC by Robbbert
Merge branch 'master' of https://github.com/mamedev/mame

[3rdparty/bgfx]	README.md
[3rdparty/bgfx/3rdparty/ocornut-imgui]	imgui.cpp
[3rdparty/bgfx/examples/23-vectordisplay]	vectordisplay.cpp
[3rdparty/bgfx/examples/common/imgui]	fs_imgui_latlong.bin.h fs_imgui_latlong.sc imgui.cpp imgui.h ocornut_imgui.cpp
[3rdparty/bgfx/include]	bgfx.c99.h bgfx.h
[3rdparty/bgfx/scripts]	bgfx.lua example-common.lua genie.lua geometryc.lua makedisttex.lua shaderc.lua texturec.lua
[3rdparty/bgfx/src]	bgfx.cpp bgfx_compute.sh bgfx_p.h bgfx_shader.sh config.h glimports.h renderer_d3d11.cpp renderer_d3d9.cpp renderer_gl.cpp renderer_gl.h
[3rdparty/bx/scripts]	genie.lua toolchain.lua
[3rdparty/genie]	README.md
[3rdparty/genie/src/actions/make]	make_cpp.lua
[3rdparty/genie/src/base]	api.lua bake.lua
[3rdparty/genie/src/host]	scripts.c
[3rdparty/mongoose]	mongoose.c
[3rdparty/mongoose/docs]	API.md ~~LuaSqlite.md~~
[src/emu/video]	tms34061.c

trunk/3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp
r244647	r244648
1809	1809	g.CurrentWindowStack.resize(0);
1810	1810
1811	1811	// Create implicit window - we will only render it if the user has added something to it.
1812		ImGui::Begin("Debug", NULL, ImVec2(400,400));
	1812	ImGui::Begin("Debug", NULL, ImVec2(400,400), -1.0f, ImGuiWindowFlags_NoSavedSettings);
1813	1813	}
1814	1814
1815	1815	// NB: behaviour of ImGui after Shutdown() is not tested/guaranteed at the moment. This function is merely here to free heap allocations.

trunk/3rdparty/bgfx/README.md
r244647	r244648
69	69	how it currently looks.
70	70	![mac_screenshot](https://raw.githubusercontent.com/emoon/ProDBG/master/data/screens/mac_screenshot.png)
71	71
72
73	72	http://www.dogbytegames.com/ Dogbyte Games is an indie mobile developer studio
74		focusing on racing games.
	73	focusing on racing games.
	74	![ios](http://www.dogbytegames.com/bgfx/offroadlegends2_bgfx_ipad2.jpg)
75	75
76	76	Examples
77	77	--------

trunk/3rdparty/bgfx/examples/23-vectordisplay/vectordisplay.cpp
r244647	r244648
123	123
124	124	void VectorDisplay::teardown()
125	125	{
	126	for (size_t i = 0; i < m_vertexBuffers.size(); ++i)
	127	{
	128	bgfx::destroyDynamicVertexBuffer(m_vertexBuffers[i]);
	129	}
	130
126	131	teardownResDependent();
127	132
128	133	bgfx::destroyProgram(m_drawToScreenShader);
r244647	r244648
728	733	{
729	734	for (size_t i = 0; i < m_vertexBuffers.size(); ++i)
730	735	{
731		destroyDynamicVertexBuffer(m_vertexBuffers[i]);
	736	bgfx::destroyDynamicVertexBuffer(m_vertexBuffers[i]);
732	737	}
733	738
734	739	m_vertexBuffers.clear();

trunk/3rdparty/bgfx/examples/common/imgui/fs_imgui_latlong.bin.h
r244647	r244648
1		static const uint8_t fs_imgui_latlong_glsl[646] =
	1	static const uint8_t fs_imgui_latlong_glsl[649] =
2	2	{
3	3	0x46, 0x53, 0x48, 0x03, 0x6f, 0x1e, 0x3e, 0x3c, 0x02, 0x00, 0x11, 0x75, 0x5f, 0x69, 0x6d, 0x61, // FSH.o.><...u_ima
4	4	0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x07, 0x01, 0x00, 0x00, // geLodEnabled....
5	5	0x01, 0x00, 0x0a, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x01, 0x00, // ...s_texColor...
6		0x00, 0x01, 0x00, 0x4e, 0x02, 0x00, 0x00, 0x76, 0x61, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x68, // ...N...varying h
	6	0x00, 0x01, 0x00, 0x51, 0x02, 0x00, 0x00, 0x76, 0x61, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x68, // ...Q...varying h
7	7	0x69, 0x67, 0x68, 0x70, 0x20, 0x76, 0x65, 0x63, 0x32, 0x20, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x63, // ighp vec2 v_texc
8	8	0x6f, 0x6f, 0x72, 0x64, 0x30, 0x3b, 0x0a, 0x75, 0x6e, 0x69, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x68, // oord0;.uniform h
9	9	0x69, 0x67, 0x68, 0x70, 0x20, 0x76, 0x65, 0x63, 0x34, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, // ighp vec4 u_imag
r244647	r244648
21	21	0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x20, 0x3d, 0x20, 0x28, 0x76, 0x5f, // tmpvar_3 = (v_
22	22	0x74, 0x65, 0x78, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x30, 0x2e, 0x79, 0x20, 0x2a, 0x20, 0x33, 0x2e, // texcoord0.y * 3.
23	23	0x31, 0x34, 0x31, 0x35, 0x39, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, // 14159);. result
24		0x5f, 0x31, 0x2e, 0x78, 0x20, 0x3d, 0x20, 0x28, 0x73, 0x69, 0x6e, 0x28, 0x74, 0x6d, 0x70, 0x76, // _1.x = (sin(tmpv
25		0x61, 0x72, 0x5f, 0x33, 0x29, 0x20, 0x2a, 0x20, 0x63, 0x6f, 0x73, 0x28, 0x74, 0x6d, 0x70, 0x76, // ar_3) * cos(tmpv
26		0x61, 0x72, 0x5f, 0x32, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, // ar_2));. result
27		0x5f, 0x31, 0x2e, 0x79, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x73, 0x28, 0x74, 0x6d, 0x70, 0x76, 0x61, // _1.y = cos(tmpva
28		0x72, 0x5f, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x31, // r_3);. result_1
29		0x2e, 0x7a, 0x20, 0x3d, 0x20, 0x28, 0x2d, 0x28, 0x73, 0x69, 0x6e, 0x28, 0x74, 0x6d, 0x70, 0x76, // .z = (-(sin(tmpv
30		0x61, 0x72, 0x5f, 0x33, 0x29, 0x29, 0x20, 0x2a, 0x20, 0x73, 0x69, 0x6e, 0x28, 0x74, 0x6d, 0x70, // ar_3)) * sin(tmp
31		0x76, 0x61, 0x72, 0x5f, 0x32, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x77, 0x70, 0x20, // var_2));. lowp
32		0x76, 0x65, 0x63, 0x34, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x3b, 0x0a, 0x20, // vec4 tmpvar_4;.
33		0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x2e, 0x78, 0x79, 0x7a, 0x20, 0x3d, 0x20, // tmpvar_4.xyz =
34		0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x75, 0x62, 0x65, 0x4c, 0x6f, 0x64, 0x20, 0x20, // textureCubeLod
35		0x20, 0x20, 0x28, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x72, // (s_texColor, r
36		0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x31, 0x2c, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, // esult_1, u_image
37		0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x78, 0x29, 0x2e, 0x78, 0x79, // LodEnabled.x).xy
38		0x7a, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x2e, 0x77, 0x20, // z;. tmpvar_4.w
39		0x3d, 0x20, 0x28, 0x30, 0x2e, 0x32, 0x20, 0x2b, 0x20, 0x28, 0x30, 0x2e, 0x38, 0x20, 0x2a, 0x20, // = (0.2 + (0.8 *
40		0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, // u_imageLodEnable
41		0x64, 0x2e, 0x79, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x67, 0x6c, 0x5f, 0x46, 0x72, 0x61, 0x67, // d.y));. gl_Frag
42		0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, // Color = tmpvar_4
43		0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // ;.}...
	24	0x5f, 0x31, 0x2e, 0x78, 0x20, 0x3d, 0x20, 0x28, 0x2d, 0x28, 0x73, 0x69, 0x6e, 0x28, 0x74, 0x6d, // _1.x = (-(sin(tm
	25	0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x29, 0x29, 0x20, 0x2a, 0x20, 0x73, 0x69, 0x6e, 0x28, 0x74, // pvar_3)) * sin(t
	26	0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x73, // mpvar_2));. res
	27	0x75, 0x6c, 0x74, 0x5f, 0x31, 0x2e, 0x79, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x73, 0x28, 0x74, 0x6d, // ult_1.y = cos(tm
	28	0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, // pvar_3);. resul
	29	0x74, 0x5f, 0x31, 0x2e, 0x7a, 0x20, 0x3d, 0x20, 0x28, 0x2d, 0x28, 0x73, 0x69, 0x6e, 0x28, 0x74, // t_1.z = (-(sin(t
	30	0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x29, 0x29, 0x20, 0x2a, 0x20, 0x63, 0x6f, 0x73, 0x28, // mpvar_3)) * cos(
	31	0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x6c, 0x6f, // tmpvar_2));. lo
	32	0x77, 0x70, 0x20, 0x76, 0x65, 0x63, 0x34, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, // wp vec4 tmpvar_4
	33	0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x2e, 0x78, 0x79, 0x7a, // ;. tmpvar_4.xyz
	34	0x20, 0x3d, 0x20, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x75, 0x62, 0x65, 0x4c, 0x6f, // = textureCubeLo
	35	0x64, 0x20, 0x20, 0x20, 0x20, 0x28, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, // d (s_texColor
	36	0x2c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x31, 0x2c, 0x20, 0x75, 0x5f, 0x69, 0x6d, // , result_1, u_im
	37	0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x78, 0x29, // ageLodEnabled.x)
	38	0x2e, 0x78, 0x79, 0x7a, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, // .xyz;. tmpvar_4
	39	0x2e, 0x77, 0x20, 0x3d, 0x20, 0x28, 0x30, 0x2e, 0x32, 0x20, 0x2b, 0x20, 0x28, 0x30, 0x2e, 0x38, // .w = (0.2 + (0.8
	40	0x20, 0x2a, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, // * u_imageLodEna
	41	0x62, 0x6c, 0x65, 0x64, 0x2e, 0x79, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x67, 0x6c, 0x5f, 0x46, // bled.y));. gl_F
	42	0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, // ragColor = tmpva
	43	0x72, 0x5f, 0x34, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // r_4;.}...
44	44	};
45		static const uint8_t fs_imgui_latlong_dx9[553] =
	45	static const uint8_t fs_imgui_latlong_dx9[537] =
46	46	{
47	47	0x46, 0x53, 0x48, 0x03, 0x6f, 0x1e, 0x3e, 0x3c, 0x01, 0x00, 0x11, 0x75, 0x5f, 0x69, 0x6d, 0x61, // FSH.o.><...u_ima
48	48	0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x15, 0x01, 0x00, 0x00, // geLodEnabled....
49		0x01, 0x00, 0x04, 0x02, 0x00, 0x03, 0xff, 0xff, 0xfe, 0xff, 0x30, 0x00, 0x43, 0x54, 0x41, 0x42, // ..........0.CTAB
	49	0x01, 0x00, 0xf4, 0x01, 0x00, 0x03, 0xff, 0xff, 0xfe, 0xff, 0x30, 0x00, 0x43, 0x54, 0x41, 0x42, // ..........0.CTAB
50	50	0x1c, 0x00, 0x00, 0x00, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, // ................
51	51	0x1c, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, // ............D...
52	52	0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........P.......
r244647	r244648
71	71	0x01, 0x00, 0x00, 0xa0, 0x13, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x80, // ................
72	72	0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x55, 0xa0, // ..............U.
73	73	0x01, 0x00, 0xaa, 0xa0, 0x25, 0x00, 0x00, 0x02, 0x02, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x80, // ....%...........
74		0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01, 0x80, 0x01, 0x00, 0x00, 0x80, 0x02, 0x00, 0x55, 0x80, // ..............U.
75		0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x04, 0x80, 0x01, 0x00, 0x55, 0x80, 0x02, 0x00, 0x55, 0x81, // ..........U...U.
	74	0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x05, 0x80, 0x01, 0x00, 0xc5, 0x80, 0x02, 0x00, 0x55, 0x81, // ..............U.
76	75	0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x80, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x02, // ................
77	76	0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0xa0, 0x5f, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, // ........_.......
78	77	0x00, 0x00, 0xe4, 0x80, 0x00, 0x08, 0xe4, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x07, 0x80, // ................
r244647	r244648
84	83	{
85	84	0x46, 0x53, 0x48, 0x03, 0x6f, 0x1e, 0x3e, 0x3c, 0x01, 0x00, 0x11, 0x75, 0x5f, 0x69, 0x6d, 0x61, // FSH.o.><...u_ima
86	85	0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x15, 0x00, 0x30, 0x0a, // geLodEnabled..0.
87		0x01, 0x00, 0x30, 0x02, 0x44, 0x58, 0x42, 0x43, 0x89, 0x11, 0x25, 0xa6, 0xf5, 0x66, 0x12, 0x3f, // ..0.DXBC..%..f.?
88		0xc0, 0x1f, 0x67, 0x9b, 0x6e, 0x4e, 0xac, 0x03, 0x01, 0x00, 0x00, 0x00, 0x30, 0x02, 0x00, 0x00, // ..g.nN......0...
	86	0x01, 0x00, 0x30, 0x02, 0x44, 0x58, 0x42, 0x43, 0xbb, 0x3e, 0xd7, 0x3a, 0x63, 0xc9, 0x70, 0x0b, // ..0.DXBC.>.:c.p.
	87	0xa5, 0x2c, 0x7d, 0xb2, 0x3c, 0x0c, 0x75, 0x44, 0x01, 0x00, 0x00, 0x00, 0x30, 0x02, 0x00, 0x00, // .,}.<.uD....0...
89	88	0x03, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, // ....,...........
90	89	0x49, 0x53, 0x47, 0x4e, 0x50, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, // ISGNP...........
91	90	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, // 8...............
r244647	r244648
101	100	0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x30, 0x00, 0x04, 0x00, 0x70, 0x10, 0x00, // .`......X0...p..
102	101	0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x62, 0x10, 0x00, 0x03, 0x32, 0x10, 0x10, 0x00, // ....UU..b...2...
103	102	0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x03, 0xf2, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ....e.... ......
104		0x68, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x0a, 0x32, 0x00, 0x10, 0x00, // h.......8...2...
105		0x00, 0x00, 0x00, 0x00, 0x46, 0x10, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, // ....F........@..
106		0xdb, 0x0f, 0xc9, 0x40, 0xdb, 0x0f, 0x49, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ...@..I@........
107		0x4d, 0x00, 0x00, 0x07, 0x42, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, // M...B...........
108		0x1a, 0x00, 0x10, 0x80, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x06, // ....A.......M...
109		0x32, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x16, 0x05, 0x10, 0x00, // 2...............
	103	0x68, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x0a, 0x32, 0x00, 0x10, 0x00, // h.......8...2...
	104	0x00, 0x00, 0x00, 0x00, 0x16, 0x15, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, // .............@..
	105	0xdb, 0x0f, 0x49, 0x40, 0xdb, 0x0f, 0xc9, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ..I@...@........
	106	0x4d, 0x00, 0x00, 0x06, 0x42, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, // M...B...........
	107	0x1a, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x07, 0x82, 0x00, 0x10, 0x00, // ........M.......
	108	0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x0a, 0x00, 0x10, 0x80, 0x41, 0x00, 0x00, 0x00, // ............A...
110	109	0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x06, 0x00, 0xd0, 0x00, 0x00, 0x62, 0x00, 0x10, 0x00, // ....M.......b...
111		0x02, 0x00, 0x00, 0x00, 0x06, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, // ............8...
112		0x82, 0x00, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ........*.......
113		0x1a, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, 0x12, 0x00, 0x10, 0x00, // ........8.......
114		0x02, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x10, 0x00, // ................
115		0x02, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x0c, 0xf2, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ....H...........
116		0x86, 0x03, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x46, 0x7e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ........F~......
	110	0x01, 0x00, 0x00, 0x00, 0x06, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, // ............8...
	111	0x12, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ........*.......
	112	0x3a, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x07, 0x82, 0x00, 0x10, 0x00, // :.......8.......
	113	0x01, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x10, 0x00, // ....:.......*...
	114	0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x0c, 0xf2, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ....H...........
	115	0x46, 0x03, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x46, 0x7e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // F.......F~......
117	116	0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, // .`........ .....
118	117	0xa3, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x05, 0x72, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // ....6...r ......
119	118	0x46, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x82, 0x20, 0x10, 0x00, // F.......2.... ..

trunk/3rdparty/bgfx/examples/common/imgui/fs_imgui_latlong.sc
r244647	r244648
18	18	float pi = 3.14159265;
19	19	float twoPi = 2.0*pi;
20	20	float phi = _uv.x * twoPi;
21		float theta = _uv.y *pi;
	21	float theta = _uv.y * pi;
22	22
23	23	vec3 result;
24		result.x = sin(theta)*cos(phi);
	24	result.x = -sin(theta)*sin(phi);
25	25	result.y = cos(theta);
26		result.z = -sin(theta)*sin(phi);
	26	result.z = -sin(theta)*cos(phi);
27	27
28	28	return result;
29	29	}

trunk/3rdparty/bgfx/examples/common/imgui/imgui.cpp
r244647	r244648
387	387	, m_textureHeight(512)
388	388	, m_halfTexel(0.0f)
389	389	, m_nvg(NULL)
390		, m_view(31)
	390	, m_view(255)
391	391	, m_viewWidth(0)
392	392	, m_viewHeight(0)
393	393	, m_currentFontIdx(0)
r244647	r244648
2023	2023	xx = -borderSize;
2024	2024	yy = -1;
2025	2025	width = 2*borderSize+1;
2026		height = m_viewHeight;
	2026	height = m_viewHeight+1;
2027	2027	triX = 0;
2028	2028	triY = (m_viewHeight-triSize)/2;
2029	2029	orientation = _checked ? TriangleOrientation::Left : TriangleOrientation::Right;
r244647	r244648
2033	2033	xx = m_viewWidth - borderSize;
2034	2034	yy = -1;
2035	2035	width = 2*borderSize+1;
2036		height = m_viewHeight;
	2036	height = m_viewHeight+1;
2037	2037	triX = m_viewWidth - triSize - 2;
2038	2038	triY = (m_viewHeight-width)/2;
2039	2039	orientation = _checked ? TriangleOrientation::Right : TriangleOrientation::Left;

trunk/3rdparty/bgfx/examples/common/imgui/imgui.h
r244647	r244648
136	136	ImguiFontHandle imguiCreate(const void* _data = NULL, uint32_t _size = 0, float _fontSize = 15.0f);
137	137	void imguiDestroy();
138	138
139		void imguiBeginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar = 0, uint8_t _view = 31);
	139	void imguiBeginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar = 0, uint8_t _view = 255);
140	140	void imguiEndFrame();
141	141
142	142	void imguiDrawText(int _x, int _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _argb);

trunk/3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp
r244647	r244648
81	81
82	82	void create(const void* _data, uint32_t _size, float _fontSize)
83	83	{
84		m_viewId = 31;
	84	m_viewId = 255;
85	85
86	86	ImGuiIO& io = ImGui::GetIO();
87	87	io.DisplaySize = ImVec2(1280.0f, 720.0f);

trunk/3rdparty/bgfx/include/bgfx.c99.h
r244647	r244648
287	287	uint64_t supported;
288	288
289	289	uint16_t maxTextureSize; /* < Maximum texture size. */
	290	uint16_t maxViews; /* < Maximum views. */
290	291	uint16_t maxDrawCalls; /* < Maximum draw calls. */
291	292	uint8_t maxFBAttachments; /* < Maximum frame buffer attachments. */
292	293
r244647	r244648
1358	1359	/**
1359	1360	*
1360	1361	*/
1361		BGFX_C_API void bgfx_set_image(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_texture_handle_t _handle, uint8_t _mip, bgfx_texture_format_t _format~~, bgfx_access_t _access~~);
	1362	BGFX_C_API void bgfx_set_image(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_texture_handle_t _handle, uint8_t _mip, bgfx_access_t _access, bgfx_texture_format_t _format);
1362	1363
1363	1364	/**
1364	1365	*
1365	1366	*/
1366		BGFX_C_API void bgfx_set_image_from_frame_buffer(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_frame_buffer_handle_t _handle, uint8_t _attachment, bgfx_texture_format_t _format~~, bgfx_access_t _access~~);
	1367	BGFX_C_API void bgfx_set_image_from_frame_buffer(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_frame_buffer_handle_t _handle, uint8_t _attachment, bgfx_access_t _access, bgfx_texture_format_t _format);
1367	1368
1368	1369	/**
1369	1370	* Dispatch compute.

trunk/3rdparty/bgfx/include/bgfx.h
r244647	r244648
310	310	uint64_t supported;
311	311
312	312	uint16_t maxTextureSize; ///< Maximum texture size.
	313	uint16_t maxViews; ///< Maximum views.
313	314	uint16_t maxDrawCalls; ///< Maximum draw calls.
314	315	uint8_t maxFBAttachments; ///< Maximum frame buffer attachments.
315	316
r244647	r244648
1098	1099	/// view will use these matrices.
1099	1100	void setViewTransform(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags = BGFX_VIEW_STEREO, const void* _projR = NULL);
1100	1101
	1102	/// Post submit view reordering.
	1103	///
	1104	/// @param _id First view id.
	1105	/// @param _num Number of views to remap.
	1106	/// @param _remap View remap id table. Passing `NULL` will reset view ids
	1107	/// to default state.
	1108	///
	1109	void setViewRemap(uint8_t _id = 0, uint8_t _num = UINT8_MAX, const void* _remap = NULL);
	1110
1101	1111	/// Sets debug marker.
1102	1112	void setMarker(const char* _marker);
1103	1113
r244647	r244648
1273	1283	void setBuffer(uint8_t _stage, DynamicVertexBufferHandle _handle, Access::Enum _access);
1274	1284
1275	1285	///
1276		void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, TextureFormat::Enum _format, ~~Acc~~e~~ss::En~~um _a~~ccess~~);
	1286	void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, Access::Enum _access, TextureFormat::Enum _format = TextureFormat::Count);
1277	1287
1278	1288	///
1279		void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, TextureFormat::Enum _format, ~~Acc~~e~~ss::En~~um _a~~ccess~~);
	1289	void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, Access::Enum _access, TextureFormat::Enum _format = TextureFormat::Count);
1280	1290
1281	1291	/// Dispatch compute.
1282	1292	void dispatch(uint8_t _id, ProgramHandle _handle, uint16_t _numX = 1, uint16_t _numY = 1, uint16_t _numZ = 1, uint8_t _flags = BGFX_SUBMIT_EYE_FIRST);

trunk/3rdparty/bgfx/scripts/bgfx.lua
r244647	r244648
29	29	end
30	30
31	31	includedirs {
32		BGFX_DIR .. "3rdparty",
33		BGFX_DIR .. "../bx/include",
	32	path.join(BGFX_DIR, "3rdparty"),
	33	path.join(BGFX_DIR, "../bx/include"),
34	34	}
35	35
36	36	defines {
r244647	r244648
69	69
70	70	configuration { "xcode4 or osx or ios*" }
71	71	files {
72		BGFX_DIR .. "src/**.mm",
	72	path.join(BGFX_DIR, "src/**.mm"),
73	73	}
74	74
75	75	configuration { "osx" }
r244647	r244648
80	80	configuration { "not nacl" }
81	81	includedirs {
82	82	--nacl has GLES2 headers modified...
83		BGFX_DIR .. "3rdparty/khronos",
	83	path.join(BGFX_DIR, "3rdparty/khronos"),
84	84	}
85	85
86	86	configuration { "x64", "vs* or mingw*" }
r244647	r244648
91	91	configuration {}
92	92
93	93	includedirs {
94		BGFX_DIR .. "include",
	94	path.join(BGFX_DIR, "include"),
95	95	}
96	96
97	97	files {
98		BGFX_DIR .. "include/**.h",
99		BGFX_DIR .. "src/**.cpp",
100		BGFX_DIR .. "src/**.h",
	98	path.join(BGFX_DIR, "include/**.h"),
	99	path.join(BGFX_DIR, "src/**.cpp"),
	100	path.join(BGFX_DIR, "src/**.h"),
101	101	}
102	102
103	103	excludes {
104		BGFX_DIR .. "src/**.bin.h",
	104	path.join(BGFX_DIR, "src/**.bin.h"),
105	105	}
106	106
107	107	configuration {}

trunk/3rdparty/bgfx/scripts/example-common.lua
r244647	r244648
8	8	kind "StaticLib"
9	9
10	10	includedirs {
11		BX_DIR .. "include",
12		BGFX_DIR .. "include",
13		BGFX_DIR .. "3rdparty",
	11	path.join(BX_DIR, "include"),
	12	path.join(BGFX_DIR, "include"),
	13	path.join(BGFX_DIR, "3rdparty"),
14	14	}
15	15
16	16	files {
17		BGFX_DIR .. "3rdparty/ib-compress/**.cpp",
18		BGFX_DIR .. "3rdparty/ib-compress/**.h",
19		BGFX_DIR .. "3rdparty/ocornut-imgui/**.cpp",
20		BGFX_DIR .. "3rdparty/ocornut-imgui/**.h",
21		BGFX_DIR .. "examples/common/**.cpp",
22		BGFX_DIR .. "examples/common/**.h",
	17	path.join(BGFX_DIR, "3rdparty/ib-compress/**.cpp"),
	18	path.join(BGFX_DIR, "3rdparty/ib-compress/**.h"),
	19	path.join(BGFX_DIR, "3rdparty/ocornut-imgui/**.cpp"),
	20	path.join(BGFX_DIR, "3rdparty/ocornut-imgui/**.h"),
	21	path.join(BGFX_DIR, "examples/common/**.cpp"),
	22	path.join(BGFX_DIR, "examples/common/**.h"),
23	23	}
24	24
25	25	if _OPTIONS["with-sdl"] then

trunk/3rdparty/bgfx/scripts/genie.lua
r244647	r244648
45	45	language "C++"
46	46	startproject "example-00-helloworld"
47	47
48		BGFX_DIR = (path.getabsolute("..") .. "/")
49		local BGFX_BUILD_DIR = (BGFX_DIR .. ".build/")
50		local BGFX_THIRD_PARTY_DIR = (BGFX_DIR .. "3rdparty/")
51		BX_DIR = (BGFX_DIR .. "../bx/")
	48	BGFX_DIR = path.getabsolute("..")
	49	local BGFX_BUILD_DIR = path.join(BGFX_DIR, ".build")
	50	local BGFX_THIRD_PARTY_DIR = path.join(BGFX_DIR, "3rdparty")
	51	BX_DIR = path.getabsolute(path.join(BGFX_DIR, "../bx"))
52	52
53	53	defines {
54	54	"BX_CONFIG_ENABLE_MSVC_LEVEL4_WARNINGS=1"
55	55	}
56	56
57		dofile (BX_DIR .. "scripts/toolchain.lua")
	57	dofile (path.join(BX_DIR, "scripts/toolchain.lua"))
58	58	if not toolchain(BGFX_BUILD_DIR, BGFX_THIRD_PARTY_DIR) then
59	59	return -- no action specified
60	60	end
r244647	r244648
80	80
81	81	-- don't output debugdir for winphone builds
82	82	if "winphone81" ~= _OPTIONS["vs"] then
83		debugdir (BGFX_DIR .. "examples/runtime/")
	83	debugdir (path.join(BGFX_DIR, "examples/runtime"))
84	84	end
85	85
86	86	includedirs {
87		BX_DIR .. "include",
88		BGFX_DIR .. "include",
89		BGFX_DIR .. "3rdparty",
90		BGFX_DIR .. "examples/common",
	87	path.join(BX_DIR, "include"),
	88	path.join(BGFX_DIR, "include"),
	89	path.join(BGFX_DIR, "3rdparty"),
	90	path.join(BGFX_DIR, "examples/common"),
91	91	}
92	92
93	93	files {
94		BGFX_DIR .. "examples/" .. _name .. "/**.cpp",
95		BGFX_DIR .. "examples/" .. _name .. "/**.h",
	94	path.join(BGFX_DIR, "examples", _name, "**.cpp"),
	95	path.join(BGFX_DIR, "examples", _name, "**.h"),
96	96	}
97	97
98	98	links {
r244647	r244648
120	120	}
121	121
122	122	configuration { "x32" }
123		libdirs { "$(OVR_DIR)/LibOVR/Lib/Win32/" .. _ACTION }
	123	libdirs { path.join("$(OVR_DIR)/LibOVR/Lib/Win32", _ACTION) }
124	124
125	125	configuration { "x64" }
126		libdirs { "$(OVR_DIR)/LibOVR/Lib/x64/" .. _ACTION }
	126	libdirs { path.join("$(OVR_DIR)/LibOVR/Lib/x64", _ACTION) }
127	127
128	128	configuration { "x32", "Debug" }
129	129	links { "libovrd" }
r244647	r244648
177	177	"/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata
178	178	}
179	179	-- WinRT targets need their own output directories are build files stomp over each other
180		targetdir (BGFX_BUILD_DIR .. "arm_" .. _ACTION .. "/bin/" .. _name)
181		objdir (BGFX_BUILD_DIR .. "arm_" .. _ACTION .. "/obj/" .. _name)
	180	targetdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "bin", _name))
	181	objdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "obj", _name))
182	182
183	183	configuration { "mingw-clang" }
184	184	kind "ConsoleApp"
r244647	r244648
236	236
237	237	configuration { "osx" }
238	238	files {
239		BGFX_DIR .. "examples/common/**.mm",
	239	path.join(BGFX_DIR, "examples/common/**.mm"),
240	240	}
241	241	links {
242	242	"Cocoa.framework",
r244647	r244648
246	246	configuration { "ios*" }
247	247	kind "ConsoleApp"
248	248	files {
249		BGFX_DIR .. "examples/common/**.mm",
	249	path.join(BGFX_DIR, "examples/common/**.mm"),
250	250	}
251	251	linkoptions {
252	252	"-framework CoreFoundation",
r244647	r244648
259	259	configuration { "xcode4", "ios" }
260	260	kind "WindowedApp"
261	261	files {
262		BGFX_DIR .. "examples/runtime/iOS-Info.plist"
	262	path.join(BGFX_DIR, "examples/runtime/iOS-Info.plist"),
263	263	}
264	264
265	265	configuration { "qnx*" }

trunk/3rdparty/bgfx/scripts/geometryc.lua
r244647	r244648
8	8	kind "ConsoleApp"
9	9
10	10	includedirs {
11		BX_DIR .. "include",
12		BGFX_DIR .. "include",
13		BGFX_DIR .. "3rdparty",
14		BGFX_DIR .. "examples/common",
	11	path.join(BX_DIR, "include"),
	12	path.join(BGFX_DIR, "include"),
	13	path.join(BGFX_DIR, "3rdparty"),
	14	path.join(BGFX_DIR, "examples/common"),
15	15	}
16	16
17	17	files {
18		BGFX_DIR .. "3rdparty/forsyth-too/**.cpp",
19		BGFX_DIR .. "3rdparty/forsyth-too/**.h",
20		BGFX_DIR .. "3rdparty/ib-compress/**.cpp",
21		BGFX_DIR .. "3rdparty/ib-compress/**.h",
22		BGFX_DIR .. "src/vertexdecl.**",
23		BGFX_DIR .. "tools/geometryc/**.cpp",
24		BGFX_DIR .. "tools/geometryc/**.h",
25		BGFX_DIR .. "examples/common/bounds.**",
	18	path.join(BGFX_DIR, "3rdparty/forsyth-too/**.cpp"),
	19	path.join(BGFX_DIR, "3rdparty/forsyth-too/**.h"),
	20	path.join(BGFX_DIR, "3rdparty/ib-compress/**.cpp"),
	21	path.join(BGFX_DIR, "3rdparty/ib-compress/**.h"),
	22	path.join(BGFX_DIR, "src/vertexdecl.**"),
	23	path.join(BGFX_DIR, "tools/geometryc/**.cpp"),
	24	path.join(BGFX_DIR, "tools/geometryc/**.h"),
	25	path.join(BGFX_DIR, "examples/common/bounds.**"),
26	26	}
27	27
28	28	configuration { "osx" }

trunk/3rdparty/bgfx/scripts/makedisttex.lua
r244647	r244648
8	8	kind "ConsoleApp"
9	9
10	10	includedirs {
11		BX_DIR .. "include",
12		BGFX_DIR .. "3rdparty",
	11	path.join(BX_DIR, "include"),
	12	path.join(BGFX_DIR, "3rdparty"),
13	13	}
14	14
15	15	files {
16		BGFX_DIR .. "3rdparty/edtaa3/**.cpp",
17		BGFX_DIR .. "3rdparty/edtaa3/**.h",
18		BGFX_DIR .. "tools/makedisttex.cpp",
	16	path.join(BGFX_DIR, "3rdparty/edtaa3/**.cpp"),
	17	path.join(BGFX_DIR, "3rdparty/edtaa3/**.h"),
	18	path.join(BGFX_DIR, "tools/makedisttex.cpp"),
19	19	}

trunk/3rdparty/bgfx/scripts/shaderc.lua
r244647	r244648
7	7	uuid "f3cd2e90-52a4-11e1-b86c-0800200c9a66"
8	8	kind "ConsoleApp"
9	9
10		local GLSL_OPTIMIZER = (BGFX_DIR .. "3rdparty/glsl-optimizer/")
11		local FCPP_DIR = (BGFX_DIR .. "3rdparty/fcpp/")
	10	local GLSL_OPTIMIZER = path.join(BGFX_DIR, "3rdparty/glsl-optimizer")
	11	local FCPP_DIR = path.join(BGFX_DIR, "3rdparty/fcpp")
12	12
13	13	includedirs {
14		GLSL_OPTIMIZER .. "src",
	14	path.join(GLSL_OPTIMIZER, "src"),
15	15	}
16	16
17	17	configuration { "vs*" }
18	18	includedirs {
19		GLSL_OPTIMIZER .. "src/glsl/msvc",
	19	path.join(GLSL_OPTIMIZER, "src/glsl/msvc"),
20	20	}
21	21
22	22	defines { -- glsl-optimizer
r244647	r244648
43	43
44	44	configuration { "windows", "vs*" }
45	45	includedirs {
46		GLSL_OPTIMIZER .. "include/c99",
	46	path.join(GLSL_OPTIMIZER, "include/c99"),
47	47	}
48	48
49	49	configuration { "windows" }
r244647	r244648
67	67	}
68	68
69	69	includedirs {
70		BX_DIR .. "include",
71		BGFX_DIR .. "include",
	70	path.join(BX_DIR, "include"),
	71	path.join(BGFX_DIR, "include"),
72	72
73	73	FCPP_DIR,
74	74
75		GLSL_OPTIMIZER .. "include",
76		GLSL_OPTIMIZER .. "src/mesa",
77		GLSL_OPTIMIZER .. "src/mapi",
78		GLSL_OPTIMIZER .. "src/glsl",
	75	path.join(GLSL_OPTIMIZER, "include"),
	76	path.join(GLSL_OPTIMIZER, "src/mesa"),
	77	path.join(GLSL_OPTIMIZER, "src/mapi"),
	78	path.join(GLSL_OPTIMIZER, "src/glsl"),
79	79	}
80	80
81	81	files {
82		BGFX_DIR .. "tools/shaderc/**.cpp",
83		BGFX_DIR .. "tools/shaderc/**.h",
84		BGFX_DIR .. "src/vertexdecl.**",
	82	path.join(BGFX_DIR, "tools/shaderc/**.cpp"),
	83	path.join(BGFX_DIR, "tools/shaderc/**.h"),
	84	path.join(BGFX_DIR, "src/vertexdecl.**"),
85	85
86		FCPP_DIR .. "**.h",
87		FCPP_DIR .. "cpp1.c",
88		FCPP_DIR .. "cpp2.c",
89		FCPP_DIR .. "cpp3.c",
90		FCPP_DIR .. "cpp4.c",
91		FCPP_DIR .. "cpp5.c",
92		FCPP_DIR .. "cpp6.c",
93		FCPP_DIR .. "cpp6.c",
	86	path.join(FCPP_DIR, "**.h"),
	87	path.join(FCPP_DIR, "cpp1.c"),
	88	path.join(FCPP_DIR, "cpp2.c"),
	89	path.join(FCPP_DIR, "cpp3.c"),
	90	path.join(FCPP_DIR, "cpp4.c"),
	91	path.join(FCPP_DIR, "cpp5.c"),
	92	path.join(FCPP_DIR, "cpp6.c"),
	93	path.join(FCPP_DIR, "cpp6.c"),
94	94
95		GLSL_OPTIMIZER .. "src/mesa/**.c",
96		GLSL_OPTIMIZER .. "src/glsl/**.cpp",
97		GLSL_OPTIMIZER .. "src/mesa/**.h",
98		GLSL_OPTIMIZER .. "src/glsl/**.c",
99		GLSL_OPTIMIZER .. "src/glsl/**.cpp",
100		GLSL_OPTIMIZER .. "src/glsl/**.h",
101		GLSL_OPTIMIZER .. "src/util/**.c",
102		GLSL_OPTIMIZER .. "src/util/**.h",
	95	path.join(GLSL_OPTIMIZER, "src/mesa/**.c"),
	96	path.join(GLSL_OPTIMIZER, "src/glsl/**.cpp"),
	97	path.join(GLSL_OPTIMIZER, "src/mesa/**.h"),
	98	path.join(GLSL_OPTIMIZER, "src/glsl/**.c"),
	99	path.join(GLSL_OPTIMIZER, "src/glsl/**.cpp"),
	100	path.join(GLSL_OPTIMIZER, "src/glsl/**.h"),
	101	path.join(GLSL_OPTIMIZER, "src/util/**.c"),
	102	path.join(GLSL_OPTIMIZER, "src/util/**.h"),
103	103	}
104	104
105	105	excludes {
106		GLSL_OPTIMIZER .. "src/glsl/glcpp/glcpp.c",
107		GLSL_OPTIMIZER .. "src/glsl/glcpp/tests/**",
108		GLSL_OPTIMIZER .. "src/glsl/glcpp/**.l",
109		GLSL_OPTIMIZER .. "src/glsl/glcpp/**.y",
110		GLSL_OPTIMIZER .. "src/glsl/ir_set_program_inouts.cpp",
111		GLSL_OPTIMIZER .. "src/glsl/main.cpp",
112		GLSL_OPTIMIZER .. "src/glsl/builtin_stubs.cpp",
	106	path.join(GLSL_OPTIMIZER, "src/glsl/glcpp/glcpp.c"),
	107	path.join(GLSL_OPTIMIZER, "src/glsl/glcpp/tests/**"),
	108	path.join(GLSL_OPTIMIZER, "src/glsl/glcpp/**.l"),
	109	path.join(GLSL_OPTIMIZER, "src/glsl/glcpp/**.y"),
	110	path.join(GLSL_OPTIMIZER, "src/glsl/ir_set_program_inouts.cpp"),
	111	path.join(GLSL_OPTIMIZER, "src/glsl/main.cpp"),
	112	path.join(GLSL_OPTIMIZER, "src/glsl/builtin_stubs.cpp"),
113	113	}
114	114
115	115	strip()

trunk/3rdparty/bgfx/scripts/texturec.lua
r244647	r244648
8	8	kind "ConsoleApp"
9	9
10	10	includedirs {
11		BX_DIR .. "include",
12		BGFX_DIR .. "include",
13		BGFX_DIR .. "src",
	11	path.join(BX_DIR, "include"),
	12	path.join(BGFX_DIR, "include"),
	13	path.join(BGFX_DIR, "src"),
14	14	}
15	15
16	16	files {
17		BGFX_DIR .. "src/image.*",
18		BGFX_DIR .. "tools/texturec/**.cpp",
19		BGFX_DIR .. "tools/texturec/**.h",
	17	path.join(BGFX_DIR, "src/image.*"),
	18	path.join(BGFX_DIR, "tools/texturec/**.cpp"),
	19	path.join(BGFX_DIR, "tools/texturec/**.h"),
20	20	}
21	21
22	22	links {

trunk/3rdparty/bgfx/src/bgfx.cpp
r244647	r244648
19	19	# define BGFX_CHECK_RENDER_THREAD()
20	20	#endif // BGFX_CONFIG_MULTITHREADED && !BX_PLATFORM_OSX && !BX_PLATFORM_IOS
21	21
	22	#define BGFX_CHECK_HANDLE(_handle, _max) \
	23	BX_CHECK(isValid(_handle) \
	24	&& _handle.idx < _max \
	25	, "Invalid handle. %d (< %d " #_max ")" \
	26	, _handle.idx \
	27	, _max \
	28	);
	29
22	30	#if BX_PLATFORM_ANDROID
23	31	::ANativeWindow* g_bgfxAndroidWindow = NULL;
24	32
r244647	r244648
797	805
798	806	void Frame::sort()
799	807	{
	808	for (uint32_t ii = 0, num = m_num; ii < num; ++ii)
	809	{
	810	m_sortKeys[ii] = SortKey::remapView(m_sortKeys[ii], m_viewRemap);
	811	}
800	812	bx::radixSort64(m_sortKeys, s_ctx->m_tempKeys, m_sortValues, s_ctx->m_tempValues, m_num);
801	813	}
802	814
r244647	r244648
951	963	BX_TRACE("Multithreaded renderer is disabled.");
952	964	#endif // BGFX_CONFIG_MULTITHREADED
953	965
	966	for (uint32_t ii = 0; ii < BX_COUNTOF(m_viewRemap); ++ii)
	967	{
	968	m_viewRemap[ii] = ii;
	969	}
	970
954	971	memset(m_fb, 0xff, sizeof(m_fb) );
955	972	memset(m_clear, 0, sizeof(m_clear) );
956	973	memset(m_rect, 0, sizeof(m_rect) );
r244647	r244648
1156	1173	freeDynamicBuffers();
1157	1174	m_submit->m_resolution = m_resolution;
1158	1175	m_submit->m_debug = m_debug;
	1176
	1177	memcpy(m_submit->m_viewRemap, m_viewRemap, sizeof(m_viewRemap) );
1159	1178	memcpy(m_submit->m_fb, m_fb, sizeof(m_fb) );
1160	1179	memcpy(m_submit->m_clear, m_clear, sizeof(m_clear) );
1161	1180	memcpy(m_submit->m_rect, m_rect, sizeof(m_rect) );
r244647	r244648
1961	1980	g_caps.supported = 0
1962	1981	\| (BGFX_CONFIG_MULTITHREADED ? BGFX_CAPS_RENDERER_MULTITHREADED : 0)
1963	1982	;
	1983	g_caps.maxViews = BGFX_CONFIG_MAX_VIEWS;
1964	1984	g_caps.maxDrawCalls = BGFX_CONFIG_MAX_DRAW_CALLS;
1965	1985	g_caps.maxFBAttachments = 1;
1966	1986
r244647	r244648
2617	2637	s_ctx->setClearColor(_index, _rgba);
2618	2638	}
2619	2639
	2640	bool checkView(uint8_t _id)
	2641	{
	2642	// workaround GCC 4.9 type-limit check.
	2643	const uint32_t id = _id;
	2644	return id < BGFX_CONFIG_MAX_VIEWS;
	2645	}
	2646
2620	2647	void setViewName(uint8_t _id, const char* _name)
2621	2648	{
2622	2649	BGFX_CHECK_MAIN_THREAD();
2623		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2650	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2624	2651	s_ctx->setViewName(_id, _name);
2625	2652	}
2626	2653
2627	2654	void setViewRect(uint8_t _id, uint16_t _x, uint16_t _y, uint16_t _width, uint16_t _height)
2628	2655	{
2629	2656	BGFX_CHECK_MAIN_THREAD();
2630		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2657	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2631	2658	s_ctx->setViewRect(_id, _x, _y, _width, _height);
2632	2659	}
2633	2660
2634	2661	void setViewScissor(uint8_t _id, uint16_t _x, uint16_t _y, uint16_t _width, uint16_t _height)
2635	2662	{
2636	2663	BGFX_CHECK_MAIN_THREAD();
2637		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2664	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2638	2665	s_ctx->setViewScissor(_id, _x, _y, _width, _height);
2639	2666	}
2640	2667
2641	2668	void setViewClear(uint8_t _id, uint16_t _flags, uint32_t _rgba, float _depth, uint8_t _stencil)
2642	2669	{
2643	2670	BGFX_CHECK_MAIN_THREAD();
2644		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2671	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2645	2672	s_ctx->setViewClear(_id, _flags, _rgba, _depth, _stencil);
2646	2673	}
2647	2674
2648	2675	void setViewClear(uint8_t _id, uint16_t _flags, float _depth, uint8_t _stencil, uint8_t _0, uint8_t _1, uint8_t _2, uint8_t _3, uint8_t _4, uint8_t _5, uint8_t _6, uint8_t _7)
2649	2676	{
2650	2677	BGFX_CHECK_MAIN_THREAD();
2651		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2678	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2652	2679	s_ctx->setViewClear(_id, _flags, _depth, _stencil, _0, _1, _2, _3, _4, _5, _6, _7);
2653	2680	}
2654	2681
2655	2682	void setViewSeq(uint8_t _id, bool _enabled)
2656	2683	{
2657	2684	BGFX_CHECK_MAIN_THREAD();
2658		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2685	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2659	2686	s_ctx->setViewSeq(_id, _enabled);
2660	2687	}
2661	2688
2662	2689	void setViewFrameBuffer(uint8_t _id, FrameBufferHandle _handle)
2663	2690	{
2664	2691	BGFX_CHECK_MAIN_THREAD();
2665		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2692	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2666	2693	s_ctx->setViewFrameBuffer(_id, _handle);
2667	2694	}
2668	2695
2669	2696	void setViewTransform(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR)
2670	2697	{
2671	2698	BGFX_CHECK_MAIN_THREAD();
2672		BX_CHECK(_id ~~< BGFX_CONFIG_MAX_VIEWS~~, "Invalid view id: %d", _id);
	2699	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
2673	2700	s_ctx->setViewTransform(_id, _view, _projL, _flags, _projR);
2674	2701	}
2675	2702
	2703	void setViewRemap(uint8_t _id, uint8_t _num, const void* _remap)
	2704	{
	2705	BGFX_CHECK_MAIN_THREAD();
	2706	BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
	2707	s_ctx->setViewRemap(_id, _num, _remap);
	2708	}
	2709
2676	2710	void setMarker(const char* _marker)
2677	2711	{
2678	2712	BGFX_CHECK_MAIN_THREAD();
r244647	r244648
2724	2758	void setUniform(UniformHandle _handle, const void* _value, uint16_t _num)
2725	2759	{
2726	2760	BGFX_CHECK_MAIN_THREAD();
	2761	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_UNIFORMS);
2727	2762	s_ctx->setUniform(_handle, _value, _num);
2728	2763	}
2729	2764
2730	2765	void setIndexBuffer(IndexBufferHandle _handle, uint32_t _firstIndex, uint32_t _numIndices)
2731	2766	{
2732	2767	BGFX_CHECK_MAIN_THREAD();
	2768	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_INDEX_BUFFERS);
2733	2769	s_ctx->setIndexBuffer(_handle, _firstIndex, _numIndices);
2734	2770	}
2735	2771
2736	2772	void setIndexBuffer(DynamicIndexBufferHandle _handle, uint32_t _firstIndex, uint32_t _numIndices)
2737	2773	{
2738	2774	BGFX_CHECK_MAIN_THREAD();
	2775	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS);
2739	2776	s_ctx->setIndexBuffer(_handle, _firstIndex, _numIndices);
2740	2777	}
2741	2778
r244647	r244648
2760	2797	void setVertexBuffer(VertexBufferHandle _handle, uint32_t _startVertex, uint32_t _numVertices)
2761	2798	{
2762	2799	BGFX_CHECK_MAIN_THREAD();
	2800	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_VERTEX_BUFFERS);
2763	2801	s_ctx->setVertexBuffer(_handle, _startVertex, _numVertices);
2764	2802	}
2765	2803
2766	2804	void setVertexBuffer(DynamicVertexBufferHandle _handle, uint32_t _numVertices)
2767	2805	{
2768	2806	BGFX_CHECK_MAIN_THREAD();
	2807	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS);
2769	2808	s_ctx->setVertexBuffer(_handle, _numVertices);
2770	2809	}
2771	2810
r244647	r244648
2784	2823	void setInstanceDataBuffer(const InstanceDataBuffer* _idb, uint32_t _num)
2785	2824	{
2786	2825	BGFX_CHECK_MAIN_THREAD();
	2826	BX_CHECK(NULL != _idb, "_idb can't be NULL");
2787	2827	s_ctx->setInstanceDataBuffer(_idb, _num);
2788	2828	}
2789	2829
2790	2830	void setInstanceDataBuffer(VertexBufferHandle _handle, uint32_t _startVertex, uint32_t _num)
2791	2831	{
2792	2832	BGFX_CHECK_MAIN_THREAD();
	2833	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_VERTEX_BUFFERS);
2793	2834	s_ctx->setInstanceDataBuffer(_handle, _startVertex, _num);
2794	2835	}
2795	2836
2796	2837	void setInstanceDataBuffer(DynamicVertexBufferHandle _handle, uint32_t _startVertex, uint32_t _num)
2797	2838	{
2798	2839	BGFX_CHECK_MAIN_THREAD();
	2840	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS);
2799	2841	s_ctx->setInstanceDataBuffer(_handle, _startVertex, _num);
2800	2842	}
2801	2843
2802	2844	void setProgram(ProgramHandle _handle)
2803	2845	{
2804	2846	BGFX_CHECK_MAIN_THREAD();
	2847	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_PROGRAMS);
2805	2848	s_ctx->setProgram(_handle);
2806	2849	}
2807	2850
r244647	r244648
2826	2869	void setBuffer(uint8_t _stage, IndexBufferHandle _handle, Access::Enum _access)
2827	2870	{
2828	2871	BGFX_CHECK_MAIN_THREAD();
	2872	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_INDEX_BUFFERS);
2829	2873	s_ctx->setBuffer(_stage, _handle, _access);
2830	2874	}
2831	2875
2832	2876	void setBuffer(uint8_t _stage, VertexBufferHandle _handle, Access::Enum _access)
2833	2877	{
2834	2878	BGFX_CHECK_MAIN_THREAD();
	2879	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_VERTEX_BUFFERS);
2835	2880	s_ctx->setBuffer(_stage, _handle, _access);
2836	2881	}
2837	2882
2838	2883	void setBuffer(uint8_t _stage, DynamicIndexBufferHandle _handle, Access::Enum _access)
2839	2884	{
2840	2885	BGFX_CHECK_MAIN_THREAD();
	2886	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS);
2841	2887	s_ctx->setBuffer(_stage, _handle, _access);
2842	2888	}
2843	2889
2844	2890	void setBuffer(uint8_t _stage, DynamicVertexBufferHandle _handle, Access::Enum _access)
2845	2891	{
2846	2892	BGFX_CHECK_MAIN_THREAD();
	2893	BGFX_CHECK_HANDLE(_handle, BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS);
2847	2894	s_ctx->setBuffer(_stage, _handle, _access);
2848	2895	}
2849	2896
2850		void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, TextureFormat::Enum _format~~, Access::Enum _access~~)
	2897	void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, Access::Enum _access, TextureFormat::Enum _format)
2851	2898	{
2852	2899	BGFX_CHECK_MAIN_THREAD();
2853		s_ctx->setImage(_stage, _sampler, _handle, _mip, _~~form~~a~~t, _a~~ccess);
	2900	s_ctx->setImage(_stage, _sampler, _handle, _mip, _access, _format);
2854	2901	}
2855	2902
2856		void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, TextureFormat::Enum _format~~, Access::Enum _access~~)
	2903	void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, Access::Enum _access, TextureFormat::Enum _format)
2857	2904	{
2858	2905	BGFX_CHECK_MAIN_THREAD();
2859		s_ctx->setImage(_stage, _sampler, _handle, _attachment, _~~form~~a~~t, _a~~ccess);
	2906	s_ctx->setImage(_stage, _sampler, _handle, _attachment, _access, _format);
2860	2907	}
2861	2908
2862	2909	void dispatch(uint8_t _id, ProgramHandle _handle, uint16_t _numX, uint16_t _numY, uint16_t _numZ, uint8_t _flags)
r244647	r244648
3466	3513	return bgfx::submit(_id, _depth);
3467	3514	}
3468	3515
3469		BGFX_C_API void bgfx_set_image(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_texture_handle_t _handle, uint8_t _mip, bgfx_texture_format_t _format~~, bgfx_access_t _access~~)
	3516	BGFX_C_API void bgfx_set_image(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_texture_handle_t _handle, uint8_t _mip, bgfx_access_t _access, bgfx_texture_format_t _format)
3470	3517	{
3471	3518	union { bgfx_uniform_handle_t c; bgfx::UniformHandle cpp; } sampler = { _sampler };
3472	3519	union { bgfx_texture_handle_t c; bgfx::TextureHandle cpp; } handle = { _handle };
3473		bgfx::setImage(_stage, sampler.cpp, handle.cpp, _mip, bgfx::Te~~xtureFormat~~::Enum(_~~form~~at), bgfx::~~Acc~~ess::Enum(_a~~ccess~~) );
	3520	bgfx::setImage(_stage, sampler.cpp, handle.cpp, _mip, bgfx::Access::Enum(_access), bgfx::TextureFormat::Enum(_format) );
3474	3521	}
3475	3522
3476		BGFX_C_API void bgfx_set_image_from_frame_buffer(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_frame_buffer_handle_t _handle, uint8_t _attachment, bgfx_texture_format_t _format~~, bgfx_access_t _access~~)
	3523	BGFX_C_API void bgfx_set_image_from_frame_buffer(uint8_t _stage, bgfx_uniform_handle_t _sampler, bgfx_frame_buffer_handle_t _handle, uint8_t _attachment, bgfx_access_t _access, bgfx_texture_format_t _format)
3477	3524	{
3478	3525	union { bgfx_uniform_handle_t c; bgfx::UniformHandle cpp; } sampler = { _sampler };
3479	3526	union { bgfx_frame_buffer_handle_t c; bgfx::FrameBufferHandle cpp; } handle = { _handle };
3480		bgfx::setImage(_stage, sampler.cpp, handle.cpp, _attachment, bgfx::Te~~xtureFormat~~::Enum(_~~form~~at), bgfx::~~Acc~~ess::Enum(_a~~ccess~~) );
	3527	bgfx::setImage(_stage, sampler.cpp, handle.cpp, _attachment, bgfx::Access::Enum(_access), bgfx::TextureFormat::Enum(_format) );
3481	3528	}
3482	3529
3483	3530	BGFX_C_API void bgfx_dispatch(uint8_t _id, bgfx_program_handle_t _handle, uint16_t _numX, uint16_t _numY, uint16_t _numZ, uint8_t _flags)

trunk/3rdparty/bgfx/src/bgfx_compute.sh
r244647	r244648
16	16	vec2 uintBitsToFloat(uint2 _x) { return asfloat(_x); }
17	17	vec3 uintBitsToFloat(uint3 _x) { return asfloat(_x); }
18	18	vec4 uintBitsToFloat(uint4 _x) { return asfloat(_x); }
19		uint floatBitsToUint(float _x) { return asuint(_x); }
20		uvec2 floatBitsToUint(vec2 _x) { return asuint(_x); }
21		uvec3 floatBitsToUint(vec3 _x) { return asuint(_x); }
22		uvec4 floatBitsToUint(vec4 _x) { return asuint(_x); }
23		int floatBitsToInt(float _x) { return asint(_x); }
24		ivec2 floatBitsToInt(vec2 _x) { return asint(_x); }
25		ivec3 floatBitsToInt(vec3 _x) { return asint(_x); }
26		ivec4 floatBitsToInt(vec4 _x) { return asint(_x); }
27	19
	20	uint floatBitsToUint(float _x) { return asuint(_x); }
	21	uvec2 floatBitsToUint(vec2 _x) { return asuint(_x); }
	22	uvec3 floatBitsToUint(vec3 _x) { return asuint(_x); }
	23	uvec4 floatBitsToUint(vec4 _x) { return asuint(_x); }
	24
	25	int floatBitsToInt(float _x) { return asint(_x); }
	26	ivec2 floatBitsToInt(vec2 _x) { return asint(_x); }
	27	ivec3 floatBitsToInt(vec3 _x) { return asint(_x); }
	28	ivec4 floatBitsToInt(vec4 _x) { return asint(_x); }
	29
	30	uint bitfieldReverse(uint _x) { return reversebits(_x); }
	31	uint2 bitfieldReverse(uint2 _x) { return reversebits(_x); }
	32	uint3 bitfieldReverse(uint3 _x) { return reversebits(_x); }
	33	uint4 bitfieldReverse(uint4 _x) { return reversebits(_x); }
	34
	35	uint packHalf2x16(vec2 _x)
	36	{
	37	return (f32tof16(_x.x)<<16) \| f32tof16(_x.y);
	38	}
	39
	40	vec2 unpackHalf2x16(uint _x)
	41	{
	42	return vec2(f16tof32(_x >> 16), f16tof32(_x) );
	43	}
	44
28	45	#define SHARED groupshared
29	46
30	47	#define IMAGE2D_RO(_name, _reg) Texture2D _name : register(t[_reg])
r244647	r244648
42	59	return _image.Load(uint3(_uv.xy, 0) );
43	60	}
44	61
45		uint imageLoad(Texture2D<uint> _image, ivec2 _uv)
	62	uint4 imageLoad(Texture2D<uint> _image, ivec2 _uv)
46	63	{
47		return _image.Load(uint3(_uv.xy, 0) );
	64	uint rr = _image.Load(uint3(_uv.xy, 0) );
	65	return uint4(rr, rr, rr, rr);
48	66	}
49	67
50		uint imageLoad(RWTexture2D<uint> _image, ivec2 _uv)
	68	uint4 imageLoad(RWTexture2D<uint> _image, ivec2 _uv)
51	69	{
52		return _image[_uv.xy];
	70	uint rr = _image[_uv.xy];
	71	return uint4(rr, rr, rr, rr);
53	72	}
54	73
55	74	ivec2 imageSize(Texture2D _image)

trunk/3rdparty/bgfx/src/bgfx_p.h
r244647	r244648
679	679	};
680	680
681	681	#define SORT_KEY_RENDER_DRAW (UINT64_C(1)<<0x2b)
	682	#define SORT_KEY_VIEW_SHIFT UINT8_C(0x37)
	683	#define SORT_KEY_VIEW_MASK ( (uint64_t(BGFX_CONFIG_MAX_VIEWS-1) )<<SORT_KEY_VIEW_SHIFT)
682	684
683		BX_STATIC_ASSERT(BGFX_CONFIG_MAX_VIEWS <= 32);
	685	BX_STATIC_ASSERT(BGFX_CONFIG_MAX_VIEWS <= 256);
684	686	BX_STATIC_ASSERT( (BGFX_CONFIG_MAX_PROGRAMS & (BGFX_CONFIG_MAX_PROGRAMS-1) ) == 0); // must be power of 2
685	687
686	688	struct SortKey
r244647	r244648
689	691	{
690	692	// \| 3 2 1 0\|
691	693	// \|fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210\|
692		// \| vvvvvsssssssssssdttpppppppppdddddddddddddddddddddddddddddddd\|
	694	// \| vvvvvvvvsssssssssssdttpppppppppdddddddddddddddddddddddddddddddd\|
693	695	// \| ^ ^^ ^ ^ ^\|
694	696	// \| \| \|\| \| \| \|\|
695	697	// \| view-+ seq-+\| +-trans +-program depth-+\|
r244647	r244648
699	701	const uint64_t program = uint64_t(m_program)<<0x20;
700	702	const uint64_t trans = uint64_t(m_trans )<<0x29;
701	703	const uint64_t seq = uint64_t(m_seq )<<0x2c;
702		const uint64_t view = uint64_t(m_view )<<~~0x37~~;
	704	const uint64_t view = uint64_t(m_view )<<SORT_KEY_VIEW_SHIFT;
703	705	const uint64_t key = depth\|program\|trans\|SORT_KEY_RENDER_DRAW\|seq\|view;
704	706	return key;
705	707	}
r244647	r244648
708	710	{
709	711	// \| 3 2 1 0\|
710	712	// \|fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210\|
711		// \| vvvvvsssssssssssdppppppppp \|
	713	// \| vvvvvvvvsssssssssssdppppppppp \|
712	714	// \| ^ ^^ ^ \|
713	715	// \| \| \|\| \| \|
714	716	// \| view-+ seq-+\| +-program \|
r244647	r244648
716	718
717	719	const uint64_t program = uint64_t(m_program)<<0x22;
718	720	const uint64_t seq = uint64_t(m_seq )<<0x2c;
719		const uint64_t view = uint64_t(m_view )<<~~0x37~~;
	721	const uint64_t view = uint64_t(m_view )<<SORT_KEY_VIEW_SHIFT;
720	722	const uint64_t key = program\|seq\|view;
721	723	return key;
722	724	}
r244647	r244648
725	727	bool decode(uint64_t _key)
726	728	{
727	729	m_seq = (_key>>0x2c)& 0x7ff;
728		m_view = (_key~~>>0x37)~~&~~(BGFX_C~~ONFIG_MAX_VIEWS-1);
	730	m_view = uint8_t( (_key&SORT_KEY_VIEW_MASK)>>SORT_KEY_VIEW_SHIFT);
729	731	if (_key & SORT_KEY_RENDER_DRAW)
730	732	{
731	733	m_depth = _key & 0xffffffff;
r244647	r244648
738	740	return true; // compute
739	741	}
740	742
	743	bool decode(uint64_t _key, uint8_t _viewRemap[BGFX_CONFIG_MAX_VIEWS])
	744	{
	745	bool compute = decode(_key);
	746	m_view = _viewRemap[m_view];
	747	return compute;
	748	}
	749
	750	static uint64_t remapView(uint64_t _key, uint8_t _viewRemap[BGFX_CONFIG_MAX_VIEWS])
	751	{
	752	const uint8_t oldView = uint8_t( (_key & SORT_KEY_VIEW_MASK) >> SORT_KEY_VIEW_SHIFT);
	753	const uint64_t view = uint64_t(_viewRemap[oldView]) << SORT_KEY_VIEW_SHIFT;
	754	const uint64_t key = (_key & ~SORT_KEY_VIEW_MASK) \| view;
	755	return key;
	756	}
	757
741	758	void reset()
742	759	{
743	760	m_depth = 0;
r244647	r244648
1353	1370
1354	1371	void setVertexBuffer(VertexBufferHandle _handle, uint32_t _startVertex, uint32_t _numVertices)
1355	1372	{
1356		BX_CHECK(_handle.idx < BGFX_CONFIG_MAX_VERTEX_BUFFERS, "Invalid vertex buffer handle. %d (< %d)", _handle.idx, BGFX_CONFIG_MAX_VERTEX_BUFFERS);
1357	1373	m_draw.m_startVertex = _startVertex;
1358	1374	m_draw.m_numVertices = _numVertices;
1359	1375	m_draw.m_vertexBuffer = _handle;
r244647	r244648
1394	1410
1395	1411	void setProgram(ProgramHandle _handle)
1396	1412	{
1397		BX_CHECK(isValid(_handle), "Can't set program with invalid handle.");
1398	1413	m_key.m_program = _handle.idx;
1399	1414	}
1400	1415
r244647	r244648
1432	1447	bind.m_un.m_compute.m_mip = 0;
1433	1448	}
1434	1449
1435		void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, TextureFormat::Enum _format~~, Access::Enum _access~~)
	1450	void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, Access::Enum _access, TextureFormat::Enum _format)
1436	1451	{
1437	1452	Binding& bind = m_compute.m_bind[_stage];
1438	1453	bind.m_idx = _handle.idx;
r244647	r244648
1564	1579
1565	1580	SortKey m_key;
1566	1581
	1582	uint8_t m_viewRemap[BGFX_CONFIG_MAX_VIEWS];
1567	1583	FrameBufferHandle m_fb[BGFX_CONFIG_MAX_VIEWS];
1568	1584	Clear m_clear[BGFX_CONFIG_MAX_VIEWS];
1569	1585	float m_clearColor[BGFX_CONFIG_MAX_CLEAR_COLOR_PALETTE][4];
r244647	r244648
1720	1736	m_free.push_back(Free(_ptr, _size) );
1721	1737	}
1722	1738
	1739	uint64_t remove()
	1740	{
	1741	BX_CHECK(0 == m_used.size(), "");
	1742
	1743	if (0 < m_free.size() )
	1744	{
	1745	Free free = m_free.front();
	1746	m_free.pop_front();
	1747	return free.m_ptr;
	1748	}
	1749
	1750	return 0;
	1751	}
	1752
1723	1753	uint64_t alloc(uint32_t _size)
1724	1754	{
1725	1755	for (FreeList::iterator it = m_free.begin(), itEnd = m_free.end(); it != itEnd; ++it)
r244647	r244648
1758	1788	}
1759	1789	}
1760	1790
1761		void compact()
	1791	bool compact()
1762	1792	{
1763	1793	m_free.sort();
1764	1794
r244647	r244648
1775	1805	++next;
1776	1806	}
1777	1807	}
	1808
	1809	return 0 == m_used.size();
1778	1810	}
1779	1811
1780	1812	private:
r244647	r244648
2147	2179	else
2148	2180	{
2149	2181	m_dynIndexBufferAllocator.free(uint64_t(dib.m_handle.idx)<<32 \| dib.m_offset);
2150		m_dynIndexBufferAllocator.compact();
	2182	if (m_dynIndexBufferAllocator.compact() )
	2183	{
	2184	for (uint64_t ptr = m_dynIndexBufferAllocator.remove(); 0 != ptr; ptr = m_dynIndexBufferAllocator.remove() )
	2185	{
	2186	IndexBufferHandle handle = { uint16_t(ptr>>32) };
	2187	destroyIndexBuffer(handle);
	2188	}
	2189	}
2151	2190	}
2152	2191
2153	2192	m_dynamicIndexBufferHandle.free(_handle.idx);
r244647	r244648
2292	2331	else
2293	2332	{
2294	2333	m_dynVertexBufferAllocator.free(uint64_t(dvb.m_handle.idx)<<32 \| dvb.m_offset);
2295		m_dynVertexBufferAllocator.compact();
	2334	if (m_dynVertexBufferAllocator.compact() )
	2335	{
	2336	for (uint64_t ptr = m_dynVertexBufferAllocator.remove(); 0 != ptr; ptr = m_dynVertexBufferAllocator.remove() )
	2337	{
	2338	VertexBufferHandle handle = { uint16_t(ptr>>32) };
	2339	destroyVertexBuffer(handle);
	2340	}
	2341	}
2296	2342	}
2297	2343
2298	2344	m_dynamicVertexBufferHandle.free(_handle.idx);
r244647	r244648
2672	2718
2673	2719	BGFX_API_FUNC(TextureHandle createTexture(const Memory* _mem, uint32_t _flags, uint8_t _skip, TextureInfo* _info) )
2674	2720	{
2675		if (NULL != _info)
	2721	TextureInfo ti;
	2722	if (NULL == _info)
2676	2723	{
2677		ImageContainer imageContainer;
2678		if (imageParse(imageContainer, _mem->data, _mem->size) )
2679		{
2680		calcTextureSize(*_info
2681		, (uint16_t)imageContainer.m_width
2682		, (uint16_t)imageContainer.m_height
2683		, (uint16_t)imageContainer.m_depth
2684		, imageContainer.m_cubeMap
2685		, imageContainer.m_numMips
2686		, TextureFormat::Enum(imageContainer.m_format)
2687		);
2688		}
2689		else
2690		{
2691		_info->format = TextureFormat::Unknown;
2692		_info->storageSize = 0;
2693		_info->width = 0;
2694		_info->height = 0;
2695		_info->depth = 0;
2696		_info->numMips = 0;
2697		_info->bitsPerPixel = 0;
2698		_info->cubeMap = false;
2699		}
	2724	_info = &ti;
2700	2725	}
2701	2726
	2727	ImageContainer imageContainer;
	2728	if (imageParse(imageContainer, _mem->data, _mem->size) )
	2729	{
	2730	calcTextureSize(*_info
	2731	, (uint16_t)imageContainer.m_width
	2732	, (uint16_t)imageContainer.m_height
	2733	, (uint16_t)imageContainer.m_depth
	2734	, imageContainer.m_cubeMap
	2735	, imageContainer.m_numMips
	2736	, TextureFormat::Enum(imageContainer.m_format)
	2737	);
	2738	}
	2739	else
	2740	{
	2741	_info->format = TextureFormat::Unknown;
	2742	_info->storageSize = 0;
	2743	_info->width = 0;
	2744	_info->height = 0;
	2745	_info->depth = 0;
	2746	_info->numMips = 0;
	2747	_info->bitsPerPixel = 0;
	2748	_info->cubeMap = false;
	2749	}
	2750
2702	2751	TextureHandle handle = { m_textureHandle.alloc() };
2703	2752	BX_WARN(isValid(handle), "Failed to allocate texture handle.");
2704	2753	if (isValid(handle) )
2705	2754	{
2706	2755	TextureRef& ref = m_textureRef[handle.idx];
2707	2756	ref.m_refCount = 1;
	2757	ref.m_format = uint8_t(_info->format);
2708	2758
2709	2759	CommandBuffer& cmdbuf = getCommandBuffer(CommandBuffer::CreateTexture);
2710	2760	cmdbuf.write(handle);
r244647	r244648
3038	3088	}
3039	3089	}
3040	3090
	3091	BGFX_API_FUNC(void setViewRemap(uint8_t _id, uint8_t _num, const void* _remap) )
	3092	{
	3093	const uint32_t num = bx::uint32_min( (BGFX_CONFIG_MAX_VIEWS - _id) + _num, BGFX_CONFIG_MAX_VIEWS) - _id;
	3094	if (NULL == _remap)
	3095	{
	3096	for (uint32_t ii = 0; ii < num; ++ii)
	3097	{
	3098	uint8_t id = uint8_t(ii+_id);
	3099	m_viewRemap[id] = id;
	3100	}
	3101	}
	3102	else
	3103	{
	3104	memcpy(&m_viewRemap[_id], _remap, num);
	3105	}
	3106	}
	3107
3041	3108	BGFX_API_FUNC(void setMarker(const char* _marker) )
3042	3109	{
3043	3110	m_submit->setMarker(_marker);
r244647	r244648
3190	3257	m_submit->setBuffer(_stage, dvb.m_handle, _access);
3191	3258	}
3192	3259
3193		BGFX_API_FUNC(void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, TextureFormat::Enum _format~~, Access::Enum _access~~) )
	3260	BGFX_API_FUNC(void setImage(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint8_t _mip, Access::Enum _access, TextureFormat::Enum _format) )
3194	3261	{
3195		m_submit->setImage(_stage, _sampler, _handle, _mip, _format, _access);
	3262	_format = TextureFormat::Count == _format ? TextureFormat::Enum(m_textureRef[_handle.idx].m_format) : _format;
	3263	m_submit->setImage(_stage, _sampler, _handle, _mip, _access, _format);
3196	3264	}
3197	3265
3198		BGFX_API_FUNC(void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, TextureFormat::Enum _format~~, Access::Enum _access~~) )
	3266	BGFX_API_FUNC(void setImage(uint8_t _stage, UniformHandle _sampler, FrameBufferHandle _handle, uint8_t _attachment, Access::Enum _access, TextureFormat::Enum _format) )
3199	3267	{
3200	3268	BX_CHECK(_attachment < g_caps.maxFBAttachments, "Frame buffer attachment index %d is invalid.", _attachment);
3201	3269	TextureHandle textureHandle = BGFX_INVALID_HANDLE;
r244647	r244648
3207	3275	BX_CHECK(isValid(textureHandle), "Frame buffer texture %d is invalid.", _attachment);
3208	3276	}
3209	3277
3210		setImage(_stage, _sampler, textureHandle, 0, _~~form~~a~~t, _a~~ccess);
	3278	setImage(_stage, _sampler, textureHandle, 0, _access, _format);
3211	3279	}
3212	3280
3213	3281	BGFX_API_FUNC(uint32_t dispatch(uint8_t _id, ProgramHandle _handle, uint16_t _numX, uint16_t _numY, uint16_t _numZ, uint8_t _flags) )
r244647	r244648
3337	3405	struct TextureRef
3338	3406	{
3339	3407	int16_t m_refCount;
	3408	uint8_t m_format;
3340	3409	};
3341	3410
3342	3411	struct FrameBufferRef
r244647	r244648
3358	3427	FrameBufferRef m_frameBufferRef[BGFX_CONFIG_MAX_FRAME_BUFFERS];
3359	3428	VertexDeclRef m_declRef;
3360	3429
	3430	uint8_t m_viewRemap[BGFX_CONFIG_MAX_VIEWS];
3361	3431	FrameBufferHandle m_fb[BGFX_CONFIG_MAX_VIEWS];
3362	3432	Clear m_clear[BGFX_CONFIG_MAX_VIEWS];
3363	3433

trunk/3rdparty/bgfx/src/bgfx_shader.sh
r244647	r244648
189	189	vec3 vec3_splat(float _x) { return vec3(_x, _x, _x); }
190	190	vec4 vec4_splat(float _x) { return vec4(_x, _x, _x, _x); }
191	191
	192	uvec2 uvec2_splat(uint _x) { return uvec2(_x, _x); }
	193	uvec3 uvec3_splat(uint _x) { return uvec3(_x, _x, _x); }
	194	uvec4 uvec4_splat(uint _x) { return uvec4(_x, _x, _x, _x); }
	195
192	196	vec3 instMul(vec3 _vec, mat3 _mtx) { return mul(_mtx, _vec); }
193	197	vec3 instMul(mat3 _mtx, vec3 _vec) { return mul(_vec, _mtx); }
194	198	vec4 instMul(vec4 _vec, mat4 _mtx) { return mul(_mtx, _vec); }
r244647	r244648
239	243	# define vec2_splat(_x) vec2(_x)
240	244	# define vec3_splat(_x) vec3(_x)
241	245	# define vec4_splat(_x) vec4(_x)
	246	# define uvec2_splat(_x) uvec2(_x)
	247	# define uvec3_splat(_x) uvec3(_x)
	248	# define uvec4_splat(_x) uvec4(_x)
242	249
243	250	vec3 instMul(vec3 _vec, mat3 _mtx) { return mul(_vec, _mtx); }
244	251	vec3 instMul(mat3 _mtx, vec3 _vec) { return mul(_mtx, _vec); }

trunk/3rdparty/bgfx/src/config.h
r244647	r244648
168	168
169	169	#ifndef BGFX_CONFIG_MAX_VIEWS
170	170	// Do not change. Must be power of 2.
171		# define BGFX_CONFIG_MAX_VIEWS 32
	171	# define BGFX_CONFIG_MAX_VIEWS 256
172	172	#endif // BGFX_CONFIG_MAX_VIEWS
173	173
174	174	#define BGFX_CONFIG_MAX_VIEW_NAME_RESERVED 5

trunk/3rdparty/bgfx/src/glimports.h
r244647	r244648
481	481
482	482	GL_IMPORT (true, PFNGLINVALIDATEFRAMEBUFFERPROC, glInvalidateFramebuffer, glDiscardFramebufferEXT);
483	483
484		#else
	484	#elif !BGFX_USE_GL_DYNAMIC_LIB
485	485	GL_IMPORT______(true, PFNGLTEXIMAGE3DPROC, glTexImage3D);
486	486	GL_IMPORT______(true, PFNGLTEXSUBIMAGE3DPROC, glTexSubImage3D);
487	487	GL_IMPORT______(true, PFNGLCOMPRESSEDTEXIMAGE3DPROC, glCompressedTexImage3D);

trunk/3rdparty/bgfx/src/renderer_d3d11.cpp
r244647	r244648
665	665	#endif // BX_PLATFORM_WINRT
666	666	BGFX_FATAL(SUCCEEDED(hr), Fatal::UnableToInitialize, "Failed to create swap chain.");
667	667
	668	DX_CHECK(m_factory->MakeWindowAssociation(g_bgfxHwnd, 0
	669	\| DXGI_MWA_NO_WINDOW_CHANGES
	670	\| DXGI_MWA_NO_ALT_ENTER
	671	) );
	672
668	673	m_numWindows = 1;
669	674
670	675	if (BX_ENABLED(BGFX_CONFIG_DEBUG) )
r244647	r244648
726	731	}
727	732
728	733	// Init reserved part of view name.
729		for (uint8_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
	734	for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
730	735	{
731	736	char name[BGFX_CONFIG_MAX_VIEW_NAME_RESERVED+1];
732	737	bx::snprintf(name, sizeof(name), "%3d ", ii);
r244647	r244648
3051	3056	int32_t numItems = _render->m_num;
3052	3057	for (int32_t item = 0, restartItem = numItems; item < numItems \|\| restartItem < numItems;)
3053	3058	{
3054		const bool isCompute = key.decode(_render->m_sortKeys[item]);
	3059	const bool isCompute = key.decode(_render->m_sortKeys[item], _render->m_viewRemap);
3055	3060	const bool viewChanged = 0
3056	3061	\|\| key.m_view != view
3057	3062	\|\| item == numItems

trunk/3rdparty/bgfx/src/renderer_d3d9.cpp
r244647	r244648
570	570	}
571	571
572	572	// Init reserved part of view name.
573		for (uint8_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
	573	for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
574	574	{
575	575	char name[BGFX_CONFIG_MAX_VIEW_NAME_RESERVED+1];
576	576	bx::snprintf(name, sizeof(name), "%3d ", ii);
r244647	r244648
2864	2864	{
2865	2865	for (uint32_t item = 0, numItems = _render->m_num; item < numItems; ++item)
2866	2866	{
2867		const bool isCompute = key.decode(_render->m_sortKeys[item]);
	2867	const bool isCompute = key.decode(_render->m_sortKeys[item], _render->m_viewRemap);
2868	2868
2869	2869	if (isCompute)
2870	2870	{

trunk/3rdparty/bgfx/src/renderer_gl.cpp
r244647	r244648
232	232	{ GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, false }, // D16F
233	233	{ GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, false }, // D24F
234	234	{ GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, false }, // D32F
235		{ GL_STENCIL_INDEX8, GL_~~DEPTH_~~STENCIL, GL_UNSIGNED_BYTE, false }, // D0S8
	235	{ GL_STENCIL_INDEX8, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, false }, // D0S8
236	236	};
237	237	BX_STATIC_ASSERT(TextureFormat::Count == BX_COUNTOF(s_textureFormat) );
238	238
r244647	r244648
430	430	OES_texture_npot,
431	431	OES_texture_half_float,
432	432	OES_texture_half_float_linear,
	433	OES_texture_stencil8,
433	434	OES_vertex_array_object,
434	435	OES_vertex_half_float,
435	436	OES_vertex_type_10_10_10_2,
r244647	r244648
590	591	{ "OES_texture_npot", false, true },
591	592	{ "OES_texture_half_float", false, true },
592	593	{ "OES_texture_half_float_linear", false, true },
	594	{ "OES_texture_stencil8", false, true },
593	595	{ "OES_vertex_array_object", false, !BX_PLATFORM_IOS },
594	596	{ "OES_vertex_half_float", false, true },
595	597	{ "OES_vertex_type_10_10_10_2", false, true },
r244647	r244648
1165	1167	}
1166	1168	}
1167	1169
1168		if (!isTextureFormatValid(TextureFormat::R8) )
	1170	if (BX_ENABLED(BX_PLATFORM_EMSCRIPTEN)
	1171	\|\| !isTextureFormatValid(TextureFormat::R8) )
1169	1172	{
1170	1173	// GL core has to use GL_R8 Issue#208, GLES2 has to use GL_LUMINANCE issue#226
1171	1174	s_textureFormat[TextureFormat::R8].m_internalFmt = GL_LUMINANCE;
r244647	r244648
1385	1388	}
1386	1389
1387	1390	// Init reserved part of view name.
1388		for (uint8_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
	1391	for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
1389	1392	{
1390	1393	bx::snprintf(s_viewName[ii], BGFX_CONFIG_MAX_VIEW_NAME_RESERVED+1, "%3d ", ii);
1391	1394	}
r244647	r244648
2554	2557	GLSL_TYPE(GL_IMAGE_2D);
2555	2558	GLSL_TYPE(GL_IMAGE_3D);
2556	2559	GLSL_TYPE(GL_IMAGE_CUBE);
	2560	GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_1D);
	2561	GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_2D);
	2562	GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_3D);
	2563	GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_CUBE);
2557	2564	}
2558	2565
2559	2566	#undef GLSL_TYPE
r244647	r244648
2636	2643	case GL_IMAGE_2D:
2637	2644	case GL_IMAGE_3D:
2638	2645	case GL_IMAGE_CUBE:
	2646	case GL_UNSIGNED_INT_IMAGE_1D:
	2647	case GL_UNSIGNED_INT_IMAGE_2D:
	2648	case GL_UNSIGNED_INT_IMAGE_3D:
	2649	case GL_UNSIGNED_INT_IMAGE_CUBE:
2639	2650	return UniformType::Uniform1iv;
2640	2651	};
2641	2652
r244647	r244648
2833	2844	case GL_IMAGE_2D:
2834	2845	case GL_IMAGE_3D:
2835	2846	case GL_IMAGE_CUBE:
	2847	case GL_UNSIGNED_INT_IMAGE_1D:
	2848	case GL_UNSIGNED_INT_IMAGE_2D:
	2849	case GL_UNSIGNED_INT_IMAGE_3D:
	2850	case GL_UNSIGNED_INT_IMAGE_CUBE:
2836	2851	BX_TRACE("Sampler #%d at location %d.", m_numSamplers, loc);
2837	2852	m_sampler[m_numSamplers] = loc;
2838	2853	m_numSamplers++;
r244647	r244648
4279	4294	int32_t numItems = _render->m_num;
4280	4295	for (int32_t item = 0, restartItem = numItems; item < numItems \|\| restartItem < numItems;)
4281	4296	{
4282		const bool isCompute = key.decode(_render->m_sortKeys[item]);
	4297	const bool isCompute = key.decode(_render->m_sortKeys[item], _render->m_viewRemap);
4283	4298	const bool viewChanged = 0
4284	4299	\|\| key.m_view != view
4285	4300	\|\| item == numItems

trunk/3rdparty/bgfx/src/renderer_gl.h
r244647	r244648
167	167	# define GL_RGBA32F 0x8814
168	168	#endif // GL_RGBA32F
169	169
	170	#ifndef GL_STENCIL_INDEX
	171	# define GL_STENCIL_INDEX 0x1901
	172	#endif // GL_STENCIL_INDEX
	173
170	174	#ifndef GL_RED
171	175	# define GL_RED 0x1903
172	176	#endif // GL_RED
r244647	r244648
472	476	# define GL_IMAGE_CUBE 0x9050
473	477	#endif // GL_IMAGE_CUBE
474	478
	479	#ifndef GL_UNSIGNED_INT_IMAGE_1D
	480	# define GL_UNSIGNED_INT_IMAGE_1D 0x9062
	481	#endif // GL_UNSIGNED_INT_IMAGE_1D
	482
	483	#ifndef GL_UNSIGNED_INT_IMAGE_2D
	484	# define GL_UNSIGNED_INT_IMAGE_2D 0x9063
	485	#endif // GL_UNSIGNED_INT_IMAGE_2D
	486
	487	#ifndef GL_UNSIGNED_INT_IMAGE_3D
	488	# define GL_UNSIGNED_INT_IMAGE_3D 0x9064
	489	#endif // GL_UNSIGNED_INT_IMAGE_3D
	490
	491	#ifndef GL_UNSIGNED_INT_IMAGE_CUBE
	492	# define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066
	493	#endif // GL_UNSIGNED_INT_IMAGE_CUBE
	494
475	495	#ifndef GL_PROGRAM_INPUT
476	496	# define GL_PROGRAM_INPUT 0x92E3
477	497	#endif // GL_PROGRAM_INPUT
r244647	r244648
892	912	GLint m_attributes[Attrib::Count]; // sparse
893	913	GLint m_instanceData[BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT];
894	914
895		GLint m_sampler[BGFX_CONFIG_MAX_TEXTURES];
	915	GLint m_sampler[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS];
896	916	uint8_t m_numSamplers;
897	917
898	918	ConstantBuffer* m_constantBuffer;

trunk/3rdparty/bx/scripts/genie.lua
r244647	r244648
17	17
18	18	language "C++"
19	19
20		BX_DIR = (path.getabsolute("..") .. "/")
21		local BX_BUILD_DIR = (BX_DIR .. ".build/")
22		local BX_THIRD_PARTY_DIR = (BX_DIR .. "3rdparty/")
	20	BX_DIR = path.getabsolute("..")
	21	local BX_BUILD_DIR = path.join(BX_DIR, ".build")
	22	local BX_THIRD_PARTY_DIR = path.join(BX_DIR, "3rdparty")
23	23
24	24	defines {
25	25	"BX_CONFIG_ENABLE_MSVC_LEVEL4_WARNINGS=1"
r244647	r244648
39	39	uuid "8a653da8-23d6-11e3-acb4-887628d43830"
40	40	kind "ConsoleApp"
41	41
42		debugdir (BX_DIR .. "tests")
	42	debugdir (path.join(BX_DIR, "tests"))
43	43
44	44	removeflags {
45	45	"NoExceptions",
46	46	}
47	47
48	48	includedirs {
49		BX_DIR .. "include",
50		BX_THIRD_PARTY_DIR .. "UnitTest++/src/",
	49	path.join(BX_DIR, "include"),
	50	path.join(BX_THIRD_PARTY_DIR, "UnitTest++/src"),
51	51	}
52	52
53	53	links {
r244647	r244648
55	55	}
56	56
57	57	files {
58		BX_DIR .. "tests/**.cpp",
59		BX_DIR .. "tests/**.H",
	58	path.join(BX_DIR, "tests/**.cpp"),
	59	path.join(BX_DIR, "tests/**.H"),
60	60	}
61	61
62	62	configuration { "vs*" }

trunk/3rdparty/bx/scripts/toolchain.lua
r244647	r244648
3	3	-- License: https://github.com/bkaradzic/bx#license-bsd-2-clause
4	4	--
5	5
6		local bxDir = (path.getabsolute("..~~") .. "/~~")
	6	local bxDir = path.getabsolute("..")
7	7	local naclToolchain = ""
8	8
9	9	function toolchain(_buildDir, _libDir)
r244647	r244648
71	71	-- Avoid error when invoking genie --help.
72	72	if (_ACTION == nil) then return false end
73	73
74		location (_buildDir .. "projects/" .. _ACTION)
	74	location (path.join(_buildDir, "projects", _ACTION))
75	75
76	76	if _ACTION == "clean" then
77	77	os.rmdir(BUILD_DIR)
r244647	r244648
107	107	premake.gcc.cc = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-gcc"
108	108	premake.gcc.cxx = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-g++"
109	109	premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar"
110		location (_buildDir .. "projects/" .. _ACTION .. "-android-arm")
	110	location (path.join(_buildDir, "projects", _ACTION .. "-android-arm"))
111	111	end
112	112
113	113	if "android-mips" == _OPTIONS["gcc"] then
r244647	r244648
119	119	premake.gcc.cc = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-gcc"
120	120	premake.gcc.cxx = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-g++"
121	121	premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar"
122		location (_buildDir .. "projects/" .. _ACTION .. "-android-mips")
	122	location (path.join(_buildDir, "projects", _ACTION .. "-android-mips"))
123	123	end
124	124
125	125	if "android-x86" == _OPTIONS["gcc"] then
r244647	r244648
131	131	premake.gcc.cc = "$(ANDROID_NDK_X86)/bin/i686-linux-android-gcc"
132	132	premake.gcc.cxx = "$(ANDROID_NDK_X86)/bin/i686-linux-android-g++"
133	133	premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar"
134		location (_buildDir .. "projects/" .. _ACTION .. "-android-x86")
	134	location (path.join(_buildDir, "projects", _ACTION .. "-android-x86"))
135	135	end
136	136
137	137	if "asmjs" == _OPTIONS["gcc"] then
r244647	r244648
144	144	premake.gcc.cxx = "$(EMSCRIPTEN)/em++"
145	145	premake.gcc.ar = "$(EMSCRIPTEN)/emar"
146	146	premake.gcc.llvm = true
147		location (_buildDir .. "projects/" .. _ACTION .. "-asmjs")
	147	location (path.join(_buildDir, "projects", _ACTION .. "-asmjs"))
148	148	end
149	149
150	150	if "freebsd" == _OPTIONS["gcc"] then
151		location (_buildDir .. "projects/" .. _ACTION .. "-freebsd")
	151	location (path.join(_buildDir, "projects", _ACTION .. "-freebsd"))
152	152	end
153	153
154	154	if "ios-arm" == _OPTIONS["gcc"] then
155	155	premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
156	156	premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
157	157	premake.gcc.ar = "ar"
158		location (_buildDir .. "projects/" .. _ACTION .. "-ios-arm")
	158	location (path.join(_buildDir, "projects", _ACTION .. "-ios-arm"))
159	159	end
160	160
161	161	if "ios-simulator" == _OPTIONS["gcc"] then
162	162	premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
163	163	premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
164	164	premake.gcc.ar = "ar"
165		location (_buildDir .. "projects/" .. _ACTION .. "-ios-simulator")
	165	location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator"))
166	166	end
167	167
168	168	if "linux-gcc" == _OPTIONS["gcc"] then
169		location (_buildDir .. "projects/" .. _ACTION .. "-linux")
	169	location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
170	170	end
171	171
172	172	if "linux-clang" == _OPTIONS["gcc"] then
173	173	premake.gcc.cc = "clang"
174	174	premake.gcc.cxx = "clang++"
175	175	premake.gcc.ar = "ar"
176		location (_buildDir .. "projects/" .. _ACTION .. "-linux-clang")
	176	location (path.join(_buildDir, "projects", _ACTION .. "-linux-clang"))
177	177	end
178	178
179	179	if "mingw-gcc" == _OPTIONS["gcc"] then
180	180	premake.gcc.cc = "$(MINGW)/bin/x86_64-w64-mingw32-gcc"
181	181	premake.gcc.cxx = "$(MINGW)/bin/x86_64-w64-mingw32-g++"
182	182	premake.gcc.ar = "$(MINGW)/bin/ar"
183		location (_buildDir .. "projects/" .. _ACTION .. "-mingw-gcc")
	183	location (path.join(_buildDir, "projects", _ACTION .. "-mingw-gcc"))
184	184	end
185	185
186	186	if "mingw-clang" == _OPTIONS["gcc"] then
r244647	r244648
189	189	premake.gcc.ar = "$(MINGW)/bin/ar"
190	190	-- premake.gcc.ar = "$(CLANG)/bin/llvm-ar"
191	191	-- premake.gcc.llvm = true
192		location (_buildDir .. "projects/" .. _ACTION .. "-mingw-clang")
	192	location (path.join(_buildDir, "projects", _ACTION .. "-mingw-clang"))
193	193	end
194	194
195	195	if "nacl" == _OPTIONS["gcc"] then
r244647	r244648
208	208	premake.gcc.cc = naclToolchain .. "gcc"
209	209	premake.gcc.cxx = naclToolchain .. "g++"
210	210	premake.gcc.ar = naclToolchain .. "ar"
211		location (_buildDir .. "projects/" .. _ACTION .. "-nacl")
	211	location (path.join(_buildDir, "projects", _ACTION .. "-nacl"))
212	212	end
213	213
214	214	if "nacl-arm" == _OPTIONS["gcc"] then
r244647	r244648
227	227	premake.gcc.cc = naclToolchain .. "gcc"
228	228	premake.gcc.cxx = naclToolchain .. "g++"
229	229	premake.gcc.ar = naclToolchain .. "ar"
230		location (_buildDir .. "projects/" .. _ACTION .. "-nacl-arm")
	230	location (path.join(_buildDir, "projects", _ACTION .. "-nacl-arm"))
231	231	end
232	232
233	233	if "osx" == _OPTIONS["gcc"] then
r244647	r244648
237	237	premake.gcc.cxx = osxToolchain .. "clang++"
238	238	premake.gcc.ar = osxToolchain .. "ar"
239	239	end
240		location (_buildDir .. "projects/" .. _ACTION .. "-osx")
	240	location (path.join(_buildDir, "projects", _ACTION .. "-osx"))
241	241	end
242	242
243	243	if "pnacl" == _OPTIONS["gcc"] then
r244647	r244648
256	256	premake.gcc.cc = naclToolchain .. "clang"
257	257	premake.gcc.cxx = naclToolchain .. "clang++"
258	258	premake.gcc.ar = naclToolchain .. "ar"
259		location (_buildDir .. "projects/" .. _ACTION .. "-pnacl")
	259	location (path.join(_buildDir, "projects", _ACTION .. "-pnacl"))
260	260	end
261	261
262	262	if "qnx-arm" == _OPTIONS["gcc"] then
r244647	r244648
268	268	premake.gcc.cc = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-gcc"
269	269	premake.gcc.cxx = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-g++"
270	270	premake.gcc.ar = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-ar"
271		location (_buildDir .. "projects/" .. _ACTION .. "-qnx-arm")
	271	location (path.join(_buildDir, "projects", _ACTION .. "-qnx-arm"))
272	272	end
273	273
274	274	if "rpi" == _OPTIONS["gcc"] then
275		location (_buildDir .. "projects/" .. _ACTION .. "-rpi")
	275	location (path.join(_buildDir, "projects", _ACTION .. "-rpi"))
276	276	end
277	277	elseif _ACTION == "vs2012" or _ACTION == "vs2013" or _ACTION == "vs2015" then
278	278
279	279	if (_ACTION .. "-clang") == _OPTIONS["vs"] then
280	280	premake.vstudio.toolset = ("LLVM-" .. _ACTION)
281		location (_buildDir .. "projects/" .. _ACTION .. "-clang")
	281	location (path.join(_buildDir, "projects", _ACTION .. "-clang"))
282	282	end
283	283
284	284	if "winphone8" == _OPTIONS["vs"] then
285	285	premake.vstudio.toolset = "v110_wp80"
286		location (_buildDir .. "projects/" .. _ACTION .. "-winphone8")
	286	location (path.join(_buildDir, "projects", _ACTION .. "-winphone8"))
287	287	end
288	288
289	289	if "winphone81" == _OPTIONS["vs"] then
290	290	premake.vstudio.toolset = "v120_wp81"
291	291	platforms { "ARM" }
292		location (_buildDir .. "projects/" .. _ACTION .. "-winphone81")
	292	location (path.join(_buildDir, "projects", _ACTION .. "-winphone81"))
293	293	end
294	294	elseif _ACTION == "xcode4" then
295	295
296	296	if "osx" == _OPTIONS["xcode"] then
297	297	premake.xcode.toolset = "macosx"
298		location (_buildDir .. "projects/" .. _ACTION .. "-osx")
	298	location (path.join(_buildDir, "projects", _ACTION .. "-osx"))
299	299	end
300	300	if "ios" == _OPTIONS["xcode"] then
301	301	premake.xcode.toolset = "iphoneos"
302		location (_buildDir .. "projects/" .. _ACTION .. "-ios")
	302	location (path.join(_buildDir, "projects", _ACTION .. "-ios"))
303	303	end
304	304	end
305	305
r244647	r244648
334	334	}
335	335
336	336	configuration { "vs*" }
337		includedirs { bxDir .. "include/compat/msvc" }
	337	includedirs { path.join(bxDir, "include/compat/msvc") }
338	338	defines {
339	339	"WIN32",
340	340	"_WIN32",
r244647	r244648
355	355	}
356	356
357	357	configuration { "vs2008" }
358		includedirs { bxDir .. "include/compat/msvc/pre1600" }
	358	includedirs { path.join(bxDir .. "include/compat/msvc/pre1600") }
359	359
360	360	configuration { "x32", "vs*" }
361		targetdir (_buildDir .. "win32_" .. _ACTION .. "/bin")
362		objdir (_buildDir .. "win32_" .. _ACTION .. "/obj")
	361	targetdir (path.join(_buildDir, "win32_" .. _ACTION, "bin"))
	362	objdir (path.join(_buildDir, "win32_" .. _ACTION, "obj"))
363	363	libdirs {
364		_libDir .. "lib/win32_" .. _ACTION,
	364	path.join(_libDir, "lib/win32_" .. _ACTION),
365	365	"$(DXSDK_DIR)/lib/x86",
366	366	}
367	367
368	368	configuration { "x64", "vs*" }
369	369	defines { "_WIN64" }
370		targetdir (_buildDir .. "win64_" .. _ACTION .. "/bin")
371		objdir (_buildDir .. "win64_" .. _ACTION .. "/obj")
	370	targetdir (path.join(_buildDir, "win64_" .. _ACTION, "bin"))
	371	objdir (path.join(_buildDir, "win64_" .. _ACTION, "obj"))
372	372	libdirs {
373		_libDir .. "lib/win64_" .. _ACTION,
	373	path.join(_libDir, "lib/win64_" .. _ACTION),
374	374	"$(DXSDK_DIR)/lib/x64",
375	375	}
376	376
377	377	configuration { "ARM", "vs*" }
378		targetdir (_buildDir .. "arm_" .. _ACTION .. "/bin")
379		objdir (_buildDir .. "arm_" .. _ACTION .. "/obj")
	378	targetdir (path.join(_buildDir, "arm_" .. _ACTION, "bin"))
	379	objdir (path.join(_buildDir, "arm_" .. _ACTION, "obj"))
380	380
381	381	configuration { "vs*-clang" }
382	382	buildoptions {
r244647	r244648
384	384	}
385	385
386	386	configuration { "x32", "vs*-clang" }
387		targetdir (_buildDir .. "win32_" .. _ACTION .. "-clang/bin")
388		objdir (_buildDir .. "win32_" .. _ACTION .. "-clang/obj")
	387	targetdir (path.join(_buildDir, "win32_" .. _ACTION .. "-clang/bin"))
	388	objdir (path.join(_buildDir, "win32_" .. _ACTION .. "-clang/obj"))
389	389
390	390	configuration { "x64", "vs*-clang" }
391		targetdir (_buildDir .. "win64_" .. _ACTION .. "-clang/bin")
392		objdir (_buildDir .. "win64_" .. _ACTION .. "-clang/obj")
	391	targetdir (path.join(_buildDir, "win64_" .. _ACTION .. "-clang/bin"))
	392	objdir (path.join(_buildDir, "win64_" .. _ACTION .. "-clang/obj"))
393	393
394	394	configuration { "winphone8*" }
395	395	removeflags {
r244647	r244648
399	399
400	400	configuration { "mingw-*" }
401	401	defines { "WIN32" }
402		includedirs { bxDir .. "include/compat/mingw" }
	402	includedirs { path.join(bxDir, "include/compat/mingw") }
403	403	buildoptions {
404	404	"-std=c++11",
405	405	"-Wunused-value",
r244647	r244648
416	416	}
417	417
418	418	configuration { "x32", "mingw-gcc" }
419		targetdir (_buildDir .. "win32_mingw-gcc" .. "/bin")
420		objdir (_buildDir .. "win32_mingw-gcc" .. "/obj")
	419	targetdir (path.join(_buildDir, "win32_mingw-gcc/bin"))
	420	objdir (path.join(_buildDir, "win32_mingw-gcc/obj"))
421	421	libdirs {
422		_libDir .. "lib/win32_mingw-gcc",
	422	path.join(_libDir, "lib/win32_mingw-gcc"),
423	423	"$(DXSDK_DIR)/lib/x86",
424	424	}
425	425	buildoptions { "-m32" }
426	426
427	427	configuration { "x64", "mingw-gcc" }
428		targetdir (_buildDir .. "win64_mingw-gcc" .. "/bin")
429		objdir (_buildDir .. "win64_mingw-gcc" .. "/obj")
	428	targetdir (path.join(_buildDir, "win64_mingw-gcc/bin"))
	429	objdir (path.join(_buildDir, "win64_mingw-gcc/obj"))
430	430	libdirs {
431		_libDir .. "lib/win64_mingw-gcc",
	431	path.join(_libDir, "lib/win64_mingw-gcc"),
432	432	"$(DXSDK_DIR)/lib/x64",
433	433	"$(GLES_X64_DIR)",
434	434	}
r244647	r244648
446	446	}
447	447
448	448	configuration { "x32", "mingw-clang" }
449		targetdir (_buildDir .. "win32_mingw-clang" .. "/bin")
450		objdir (_buildDir .. "win32_mingw-clang" .. "/obj")
	449	targetdir (path.join(_buildDir, "win32_mingw-clang/bin"))
	450	objdir (path.join(_buildDir, "win32_mingw-clang/obj"))
451	451	libdirs {
452		_libDir .. "lib/win32_mingw-clang",
	452	path.join(_libDir, "lib/win32_mingw-clang"),
453	453	"$(DXSDK_DIR)/lib/x86",
454	454	}
455	455	buildoptions { "-m32" }
456	456
457	457	configuration { "x64", "mingw-clang" }
458		targetdir (_buildDir .. "win64_mingw-clang" .. "/bin")
459		objdir (_buildDir .. "win64_mingw-clang" .. "/obj")
	458	targetdir (path.join(_buildDir, "win64_mingw-clang/bin"))
	459	objdir (path.join(_buildDir, "win64_mingw-clang/obj"))
460	460	libdirs {
461		_libDir .. "lib/win64_mingw-clang",
	461	path.join(_libDir, "lib/win64_mingw-clang"),
462	462	"$(DXSDK_DIR)/lib/x64",
463	463	"$(GLES_X64_DIR)",
464	464	}
r244647	r244648
487	487	}
488	488
489	489	configuration { "linux-gcc", "x32" }
490		targetdir (_buildDir .. "linux32_gcc" .. "/bin")
491		objdir (_buildDir .. "linux32_gcc" .. "/obj")
492		libdirs { _libDir .. "lib/linux32_gcc" }
	490	targetdir (path.join(_buildDir, "linux32_gcc/bin"))
	491	objdir (path.join(_buildDir, "linux32_gcc/obj"))
	492	libdirs { path.join(_libDir, "lib/linux32_gcc") }
493	493	buildoptions {
494	494	"-m32",
495	495	}
496	496
497	497	configuration { "linux-gcc", "x64" }
498		targetdir (_buildDir .. "linux64_gcc" .. "/bin")
499		objdir (_buildDir .. "linux64_gcc" .. "/obj")
500		libdirs { _libDir .. "lib/linux64_gcc" }
	498	targetdir (path.join(_buildDir, "linux64_gcc/bin"))
	499	objdir (path.join(_buildDir, "linux64_gcc/obj"))
	500	libdirs { path.join(_libDir, "lib/linux64_gcc") }
501	501	buildoptions {
502	502	"-m64",
503	503	}
504	504
505	505	configuration { "linux-clang", "x32" }
506		targetdir (_buildDir .. "linux32_clang" .. "/bin")
507		objdir (_buildDir .. "linux32_clang" .. "/obj")
508		libdirs { _libDir .. "lib/linux32_clang" }
	506	targetdir (path.join(_buildDir, "linux32_clang/bin"))
	507	objdir (path.join(_buildDir, "linux32_clang/obj"))
	508	libdirs { path.join(_libDir, "lib/linux32_clang") }
509	509	buildoptions {
510	510	"-m32",
511	511	}
512	512
513	513	configuration { "linux-clang", "x64" }
514		targetdir (_buildDir .. "linux64_clang" .. "/bin")
515		objdir (_buildDir .. "linux64_clang" .. "/obj")
516		libdirs { _libDir .. "lib/linux64_clang" }
	514	targetdir (path.join(_buildDir, "linux64_clang/bin"))
	515	objdir (path.join(_buildDir, "linux64_clang/obj"))
	516	libdirs { path.join(_libDir, "lib/linux64_clang") }
517	517	buildoptions {
518	518	"-m64",
519	519	}
r244647	r244648
559	559	}
560	560
561	561	configuration { "android-arm" }
562		targetdir (_buildDir .. "android-arm" .. "/bin")
563		objdir (_buildDir .. "android-arm" .. "/obj")
	562	targetdir (path.join(_buildDir, "android-arm/bin"))
	563	objdir (path.join(_buildDir, "android-arm/obj"))
564	564	libdirs {
565		_libDir .. "lib/android-arm",
	565	path.join(_libDir, "lib/android-arm"),
566	566	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a",
567	567	}
568	568	includedirs {
569	569	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include",
570	570	}
571	571	buildoptions {
572		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm",
	572	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm"),
573	573	"-mthumb",
574	574	"-march=armv7-a",
575	575	"-mfloat-abi=softfp",
r244647	r244648
578	578	"-Wundef",
579	579	}
580	580	linkoptions {
581		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm",
582		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtbegin_so.o",
583		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtend_so.o",
	581	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm"),
	582	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm/usr/lib/crtbegin_so.o"),
	583	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm/usr/lib/crtend_so.o"),
584	584	"-march=armv7-a",
585	585	"-Wl,--fix-cortex-a8",
586	586	}
587	587
588	588	configuration { "android-mips" }
589		targetdir (_buildDir .. "android-mips" .. "/bin")
590		objdir (_buildDir .. "android-mips" .. "/obj")
	589	targetdir (path.join(_buildDir, "android-mips/bin"))
	590	objdir (path.join(_buildDir, "android-mips/obj"))
591	591	libdirs {
592		_libDir .. "lib/android-mips",
	592	path.join(_libDir, "lib/android-mips"),
593	593	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips",
594	594	}
595	595	includedirs {
596	596	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include",
597	597	}
598	598	buildoptions {
599		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips",
	599	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-mips"),
600	600	"-Wunused-value",
601	601	"-Wundef",
602	602	}
603	603	linkoptions {
604		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips",
605		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o",
606		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o",
	604	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-mips"),
	605	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-mips/usr/lib/crtbegin_so.o"),
	606	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-mips/usr/lib/crtend_so.o"),
607	607	}
608	608
609	609	configuration { "android-x86" }
610		targetdir (_buildDir .. "android-x86" .. "/bin")
611		objdir (_buildDir .. "android-x86" .. "/obj")
	610	targetdir (path.join(_buildDir, "android-x86/bin"))
	611	objdir (path.join(_buildDir, "android-x86/obj"))
612	612	libdirs {
613		_libDir .. "lib/android-x86",
	613	path.join(_libDir, "lib/android-x86"),
614	614	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86",
615	615	}
616	616	includedirs {
617	617	"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include",
618	618	}
619	619	buildoptions {
620		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86",
	620	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86"),
621	621	"-march=i686",
622	622	"-mtune=atom",
623	623	"-mstackrealign",
r244647	r244648
627	627	"-Wundef",
628	628	}
629	629	linkoptions {
630		"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86",
631		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtbegin_so.o",
632		"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtend_so.o",
	630	"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86"),
	631	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86/usr/lib/crtbegin_so.o"),
	632	path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "/arch-x86/usr/lib/crtend_so.o"),
633	633	}
634	634
635	635	configuration { "asmjs" }
636		targetdir (_buildDir .. "asmjs" .. "/bin")
637		objdir (_buildDir .. "asmjs" .. "/obj")
638		libdirs { _libDir .. "lib/asmjs" }
	636	targetdir (path.join(_buildDir, "asmjs/bin"))
	637	objdir (path.join(_buildDir, "asmjs/obj"))
	638	libdirs { path.join(_libDir, "lib/asmjs") }
639	639	buildoptions {
640	640	"-isystem$(EMSCRIPTEN)/system/include",
641	641	"-isystem$(EMSCRIPTEN)/system/include/libc",
r244647	r244648
644	644	}
645	645
646	646	configuration { "freebsd" }
647		targetdir (_buildDir .. "freebsd" .. "/bin")
648		objdir (_buildDir .. "freebsd" .. "/obj")
649		libdirs { _libDir .. "lib/freebsd" }
	647	targetdir (path.join(_buildDir, "freebsd/bin"))
	648	objdir (path.join(_buildDir, "freebsd/obj"))
	649	libdirs { path.join(_libDir, "lib/freebsd") }
650	650	includedirs {
651		bxDir .. "include/compat/freebsd",
	651	path.join(bxDir, "include/compat/freebsd"),
652	652	}
653	653
654	654	configuration { "nacl or nacl-arm or pnacl" }
r244647	r244648
664	664	}
665	665	includedirs {
666	666	"$(NACL_SDK_ROOT)/include",
667		bxDir .. "include/compat/nacl",
	667	path.join(bxDir, "include/compat/nacl"),
668	668	}
669	669
670	670	configuration { "nacl" }
r244647	r244648
678	678	}
679	679
680	680	configuration { "x32", "nacl" }
681		targetdir (_buildDir .. "nacl-x86" .. "/bin")
682		objdir (_buildDir .. "nacl-x86" .. "/obj")
683		libdirs { _libDir .. "lib/nacl-x86" }
	681	targetdir (path.join(_buildDir, "nacl-x86/bin"))
	682	objdir (path.join(_buildDir, "nacl-x86/obj"))
	683	libdirs { path.join(_libDir, "lib/nacl-x86") }
684	684	linkoptions { "-melf32_nacl" }
685	685
686	686	configuration { "x32", "nacl", "Debug" }
r244647	r244648
690	690	libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" }
691	691
692	692	configuration { "x64", "nacl" }
693		targetdir (_buildDir .. "nacl-x64" .. "/bin")
694		objdir (_buildDir .. "nacl-x64" .. "/obj")
695		libdirs { _libDir .. "lib/nacl-x64" }
	693	targetdir (path.join(_buildDir, "nacl-x64/bin"))
	694	objdir (path.join(_buildDir, "nacl-x64/obj"))
	695	libdirs { path.join(_libDir, "lib/nacl-x64") }
696	696	linkoptions { "-melf64_nacl" }
697	697
698	698	configuration { "x64", "nacl", "Debug" }
r244647	r244648
705	705	buildoptions {
706	706	"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
707	707	}
708		targetdir (_buildDir .. "nacl-arm" .. "/bin")
709		objdir (_buildDir .. "nacl-arm" .. "/obj")
710		libdirs { _libDir .. "lib/nacl-arm" }
	708	targetdir (path.join(_buildDir, "nacl-arm/bin"))
	709	objdir (path.join(_buildDir, "nacl-arm/obj"))
	710	libdirs { path.join(_libDir, "lib/nacl-arm") }
711	711
712	712	configuration { "nacl-arm", "Debug" }
713	713	libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" }
r244647	r244648
716	716	libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" }
717	717
718	718	configuration { "pnacl" }
719		targetdir (_buildDir .. "pnacl" .. "/bin")
720		objdir (_buildDir .. "pnacl" .. "/obj")
721		libdirs { _libDir .. "lib/pnacl" }
	719	targetdir (path.join(_buildDir, "pnacl/bin"))
	720	objdir (path.join(_buildDir, "pnacl/obj"))
	721	libdirs { path.join(_libDir, "lib/pnacl") }
722	722
723	723	configuration { "pnacl", "Debug" }
724	724	libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" }
r244647	r244648
727	727	libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
728	728
729	729	configuration { "Xbox360" }
730		targetdir (_buildDir .. "xbox360" .. "/bin")
731		objdir (_buildDir .. "xbox360" .. "/obj")
732		includedirs { bxDir .. "include/compat/msvc" }
733		libdirs { _libDir .. "lib/xbox360" }
	730	targetdir (path.join(_buildDir, "xbox360/bin"))
	731	objdir (path.join(_buildDir, "xbox360/obj"))
	732	includedirs { path.join(bxDir, "include/compat/msvc") }
	733	libdirs { path.join(_libDir, "lib/xbox360") }
734	734	defines {
735	735	"NOMINMAX",
736	736	"_XBOX",
737	737	}
738	738
739	739	configuration { "osx", "x32" }
740		targetdir (_buildDir .. "osx32_clang" .. "/bin")
741		objdir (_buildDir .. "osx32_clang" .. "/obj")
742		libdirs { _libDir .. "lib/osx32_clang" }
	740	targetdir (path.join(_buildDir, "osx32_clang/bin"))
	741	objdir (path.join(_buildDir, "osx32_clang/obj"))
	742	libdirs { path.join(_libDir, "lib/osx32_clang") }
743	743	buildoptions {
744	744	"-m32",
745	745	}
746	746
747	747	configuration { "osx", "x64" }
748		targetdir (_buildDir .. "osx64_clang" .. "/bin")
749		objdir (_buildDir .. "osx64_clang" .. "/obj")
750		libdirs { _libDir .. "lib/osx64_clang" }
	748	targetdir (path.join(_buildDir, "osx64_clang/bin"))
	749	objdir (path.join(_buildDir, "osx64_clang/obj"))
	750	libdirs { path.join(_libDir, "lib/osx64_clang") }
751	751	buildoptions {
752	752	"-m64",
753	753	}
r244647	r244648
759	759	"-Wunused-value",
760	760	"-Wundef",
761	761	}
762		includedirs { bxDir .. "include/compat/osx" }
	762	includedirs { path.join(bxDir, "include/compat/osx") }
763	763
764	764	configuration { "ios*" }
765	765	linkoptions {
r244647	r244648
770	770	"-Wunused-value",
771	771	"-Wundef",
772	772	}
773		includedirs { bxDir .. "include/compat/ios" }
	773	includedirs { path.join(bxDir, "include/compat/ios") }
774	774
775	775	configuration { "ios-arm" }
776		targetdir (_buildDir .. "ios-arm" .. "/bin")
777		objdir (_buildDir .. "ios-arm" .. "/obj")
778		libdirs { _libDir .. "lib/ios-arm" }
	776	targetdir (path.join(_buildDir, "ios-arm/bin"))
	777	objdir (path.join(_buildDir, "ios-arm/obj"))
	778	libdirs { path.join(_libDir, "lib/ios-arm") }
779	779	linkoptions {
780	780	"-miphoneos-version-min=7.0",
781	781	"-arch armv7",
r244647	r244648
791	791	}
792	792
793	793	configuration { "ios-simulator" }
794		targetdir (_buildDir .. "ios-simulator" .. "/bin")
795		objdir (_buildDir .. "ios-simulator" .. "/obj")
796		libdirs { _libDir .. "lib/ios-simulator" }
	794	targetdir (path.join(_buildDir, "ios-simulator/bin"))
	795	objdir (path.join(_buildDir, "ios-simulator/obj"))
	796	libdirs { path.join(_libDir, "lib/ios-simulator") }
797	797	linkoptions {
798	798	"-mios-simulator-version-min=7.0",
799	799	"-arch i386",
r244647	r244648
809	809	}
810	810
811	811	configuration { "qnx-arm" }
812		targetdir (_buildDir .. "qnx-arm" .. "/bin")
813		objdir (_buildDir .. "qnx-arm" .. "/obj")
814		libdirs { _libDir .. "lib/qnx-arm" }
815		-- includedirs { bxDir .. "include/compat/qnx" }
	812	targetdir (path.join(_buildDir, "qnx-arm/bin"))
	813	objdir (path.join(_buildDir, "qnx-arm/obj"))
	814	libdirs { path.join(_libDir, "lib/qnx-arm") }
	815	-- includedirs { path.join(bxDir, "include/compat/qnx") }
816	816	buildoptions {
817	817	"-std=c++0x",
818	818	"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
r244647	r244648
821	821	}
822	822
823	823	configuration { "rpi" }
824		targetdir (_buildDir .. "rpi" .. "/bin")
825		objdir (_buildDir .. "rpi" .. "/obj")
	824	targetdir (path.join(_buildDir, "rpi/bin"))
	825	objdir (path.join(_buildDir, "rpi/obj"))
826	826	libdirs {
827		_libDir .. "lib/rpi",
	827	path.join(_libDir, "lib/rpi"),
828	828	"/opt/vc/lib",
829	829	}
830	830	defines {

trunk/3rdparty/genie/README.md
r244647	r244648
61	61	- Added ability to configure Visual Studio toolset from GENie script.
62	62	- Added `UnsignedChar` flag to force char to be unsigned.
63	63	- Removed vs2002, vs2003, vs2005, Solaris, and Haiku support.
64		- Allow source files in the same project to have the same name.
	64	- Allow source files in the same project to have the same name. Added
	65	`SingleOutputDir` flag to use single output directory (original behaviour).
65	66	- Added WinRT support.
66	67	- Added `removeflags`, `removelinks`.
67	68	- Added vs2015 support.
68	69	- Added `targetsubdir`.
69	70	- Added support for solution folders `group`.
70		- Added `options` section (and `ForceCpp` to enforce C++ compile even if extension is for C files)
71		- Added `msgcompile`, `msgresource`, `msglinking` and `msgarchiving` as overrides for make messages
72		- Added `messageskip` list to disable some of compiler messages
	71	- Added `options` section (and `ForceCpp` to enforce C++ compile even if
	72	extension is for C files)
	73	- Added `msgcompile`, `msgresource`, `msglinking` and `msgarchiving` as
	74	overrides for make messages.
	75	- Added `messageskip` list to disable some of compiler messages.
73	76
74	77	## Why fork?
75	78

trunk/3rdparty/genie/src/actions/make/make_cpp.lua
r244647	r244648
324	324
325	325	_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), " "))
326	326
327		_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions)))
328		_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions_cpp)))
	327	_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))
	328	_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))
329	329
330	330	_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',
331	331	make.list(table.join(cc.getdefines(cfg.resdefines),

trunk/3rdparty/genie/src/base/api.lua
r244647	r244648
42	42	scope = "config",
43	43	},
44	44
	45	buildoptions_c =
	46	{
	47	kind = "list",
	48	scope = "config",
	49	},
	50
45	51	buildoptions_cpp =
46	52	{
47	53	kind = "list",
r244647	r244648
130	136	NoNativeWChar = 1,
131	137	NoPCH = 1,
132	138	NoRTTI = 1,
	139	SingleOutputDir = 1,
133	140	Optimize = 1,
134	141	OptimizeSize = 1,
135	142	OptimizeSpeed = 1,

trunk/3rdparty/genie/src/base/bake.lua
r244647	r244648
380	380	dir = cfg_dirs[cfg][v]
381	381	if hit_counts[dir] == 1 then break end
382	382	end
383		cfg.objectsdir = path.getrelative(cfg.location, dir)
	383	if (cfg.flags.SingleOutputDir) then
	384	cfg.objectsdir = cfg.objdir or cfg.project.objdir or "obj"
	385	else
	386	cfg.objectsdir = path.getrelative(cfg.location, dir)
	387	end
384	388	end
385	389	end
386	390	end

trunk/3rdparty/genie/src/host/scripts.c
r244647	r244648
69	69	"m)\ntbl[item] = item\nend\nend\nend\nreturn tbl\nend\nlocal function removevalues(tbl, removes)\nfor i=#tbl,1,-1 do\n for _, pattern in ipairs(removes) do\n if pattern == tbl[i] then\n table.remove(tbl, i)\n break\n end\n end\n end\nend\nlocal function mergeobject(dest, src)\nif not src then \nreturn \nend\nfor fieldname, value in pairs(src) do\nif not nocopy[fieldname] then\nlocal field = premake.fields[fieldname]\nif field then\nif type(value) == \"table\" then\ndest[fieldname] = mergefield(field.kind, dest[fieldname], value)\nif src.removes then\nremoves = src.removes[fieldname]\nif removes then\nremovevalues(dest[fieldname], removes)\nend\nend\nelse\ndest[fieldname] = value\nend\nelse\ndest[fieldname] = value\nend\nend\nend\nend\nlocal function merge(dest, obj, basis, terms, cfgname, pltname)\nlocal key = cfgname or \"\"\npltname = pltname or \"Native\"\nif pltname ~= \"Native\" then\nkey = key .. pltname\nend"
70	70	"\nterms.config = (cfgname or \"\"):lower()\nterms.platform = pltname:lower()\nlocal cfg = {}\nmergeobject(cfg, basis[key])\nadjustpaths(obj.location, cfg)\nmergeobject(cfg, obj)\nif (cfg.kind) then \nterms['kind']=cfg.kind:lower()\nend\nfor _, blk in ipairs(obj.blocks) do\nif (premake.iskeywordsmatch(blk.keywords, terms))then\nmergeobject(cfg, blk)\nif (cfg.kind and not cfg.terms.kind) then \ncfg.terms['kind'] = cfg.kind:lower()\nterms['kind'] = cfg.kind:lower()\nend\nend\nend\ncfg.name = cfgname\ncfg.platform = pltname\nfor k,v in pairs(terms) do\ncfg.terms[k] =v\nend\ndest[key] = cfg\nend\nlocal function collapse(obj, basis)\nlocal result = {}\nbasis = basis or {}\nlocal sln = obj.solution or obj\nlocal terms = premake.getactiveterms()\nmerge(result, obj, basis, terms)--this adjusts terms\nfor _, cfgname in ipairs(sln.configurations) do\nlocal terms_local = {}\nfor k,v in pairs(terms)do terms_local[k]=v end\nmerge(result, obj, basis, terms_local, cfgname, \"Native\")--terms cam also be adjusted here\nf"
71	71	"or _, pltname in ipairs(sln.platforms or {}) do\nif pltname ~= \"Native\" then\nmerge(result, obj, basis,terms_local, cfgname, pltname)--terms also here\nend\nend\nend\nreturn result\nend\nlocal function builduniquedirs()\nlocal num_variations = 4\nlocal cfg_dirs = {}\nlocal hit_counts = {}\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nfor _, cfg in pairs(prj.__configs) do\nlocal dirs = { }\ndirs[1] = path.getabsolute(path.join(cfg.location, cfg.objdir or cfg.project.objdir or \"obj\"))\ndirs[2] = path.join(dirs[1], iif(cfg.platform == \"Native\", \"\", cfg.platform))\ndirs[3] = path.join(dirs[2], cfg.name)\ndirs[4] = path.join(dirs[3], cfg.project.name)\ncfg_dirs[cfg] = dirs\nlocal start = iif(cfg.name, 2, 1)\nfor v = start, num_variations do\nlocal d = dirs[v]\nhit_counts[d] = (hit_counts[d] or 0) + 1\nend\nend\nend\nend\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nfor _, cfg in pairs(prj.__configs) do\nlocal dir\nlocal start = iif(cfg.name, "
72		"2, 1)\nfor v = start, num_variations do\ndir = cfg_dirs[cfg][v]\nif hit_counts[dir] == 1 then break end\nend\ncfg.objectsdir = path.getrelative(cfg.location, dir)\nend\nend\nend\nend\nlocal function buildtargets()\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nfor _, cfg in pairs(prj.__configs) do\nlocal pathstyle = premake.getpathstyle(cfg)\nlocal namestyle = premake.getnamestyle(cfg)\ncfg.buildtarget = premake.gettarget(cfg, \"build\", pathstyle, namestyle, cfg.system)\ncfg.linktarget = premake.gettarget(cfg, \"link\", pathstyle, namestyle, cfg.system)\nif pathstyle == \"windows\" then\ncfg.objectsdir = path.translate(cfg.objectsdir, \"\\\\\")\nend\nend\nend\nend\nend\n local function getCfgKind(cfg)\n if(cfg.kind) then\n return cfg.kind;\n end\n \n if(cfg.project.__configs[\"\"] and cfg.project.__configs[\"\"].kind) then\n return cfg.project.__configs[\"\"].kind;\n end\n \n return nil\n end\n \n local function getprojrec(dstArray, foundList, cfg, cfgname, searc"
73		"hField, bLinkage)\n if(not cfg) then return end\n \n local foundUsePrjs = {};\n for _, useName in ipairs(cfg[searchField]) do\n local testName = useName:lower();\n if((not foundList[testName])) then\n local theProj = nil;\n local theUseProj = nil;\n for _, prj in ipairs(cfg.project.solution.projects) do\n if (prj.name:lower() == testName) then\n if(prj.usage) then\n theUseProj = prj;\n else\n theProj = prj;\n end\n end\n end\n \n --Must connect to a usage project.\n if(theUseProj) then\n foundList[testName] = true;\n local prjEntry = {\n name = testName,\n proj = theProj,\n usageProj = theUseProj,\n bLinkageOnly = bLinkage,\n };\n dstArray[testName] = prjEntry;\n table.insert(foundUsePrjs, theUseProj);\n end\n end\n end\n \n for _, usePrj in ipairs(foundUsePrjs) do\n --Links can only recurse through static libraries.\n if((searchField ~= \"links\") or\n (getCfgKind(usePrj.__configs[cfgname]) == \"StaticLib\")) then\n getprojrec(dstArray, foundList, usePrj.__configs[cfgname"
74		"],\n cfgname, searchField, bLinkage);\n end\n end\n end\n \n --\n -- This function will recursively get all projects that the given configuration has in its \"uses\"\n -- field. The return values are a list of tables. Each table in that list contains the following:\n --name = The lowercase name of the project.\n --proj = The project. Can be nil if it is usage-only.\n --usageProj = The usage project. Can't be nil, as using a project that has no\n -- usage project is not put into the list.\n --bLinkageOnly = If this is true, then only the linkage information should be copied.\n -- The recursion will only look at the \"uses\" field on usage projects.\n -- This function will also add projects to the list that are mentioned in the \"links\"\n -- field of usage projects. These will only copy linker information, but they will recurse.\n -- through other \"links\" fields.\n --\n local function getprojectsconnections(cfg, cfgname)\n local dstArray = {};\n local foundList = {};\n foundList[cfg.pr"
75		"oject.name:lower()] = true;\n \n --First, follow the uses recursively.\n getprojrec(dstArray, foundList, cfg, cfgname, \"uses\", false);\n \n --Next, go through all of the usage projects and recursively get their links.\n --But only if they're not already there. Get the links as linkage-only.\n local linkArray = {};\n for prjName, prjEntry in pairs(dstArray) do\n getprojrec(linkArray, foundList, prjEntry.usageProj.__configs[cfgname], cfgname, \n \"links\", true);\n end\n \n --Copy from linkArray into dstArray.\n for prjName, prjEntry in pairs(linkArray) do\n dstArray[prjName] = prjEntry;\n end\n \n return dstArray;\n end\n \n \n local function isnameofproj(cfg, strName)\n local sln = cfg.project.solution;\n local strTest = strName:lower();\n for prjIx, prj in ipairs(sln.projects) do\n if (prj.name:lower() == strTest) then\n return true;\n end\n end\n \n return false;\n end\n --\n -- Copies the field from dstCfg to srcCfg.\n --\n local function copydependentfield(srcCfg, dstC"
76		"fg, strSrcField)\n local srcField = premake.fields[strSrcField];\n local strDstField = strSrcField;\n \n if type(srcCfg[strSrcField]) == \"table\" then\n --handle paths.\n if (srcField.kind == \"dirlist\" or srcField.kind == \"filelist\") and\n (not keeprelative[strSrcField]) then\n for i,p in ipairs(srcCfg[strSrcField]) do\n table.insert(dstCfg[strDstField],\n path.rebase(p, srcCfg.project.location, dstCfg.project.location))\n end\n else\n if(strSrcField == \"links\") then\n for i,p in ipairs(srcCfg[strSrcField]) do\n if(not isnameofproj(dstCfg, p)) then\n table.insert(dstCfg[strDstField], p)\n else\n printf(\"Failed to copy '%s' from proj '%s'.\",\n p, srcCfg.project.name);\n end\n end\n else\n for i,p in ipairs(srcCfg[strSrcField]) do\n table.insert(dstCfg[strDstField], p)\n end\n end\n end\n else\n if(srcField.kind == \"path\" and (not keeprelative[strSrcField])) then\n dstCfg[strDstField] = path.rebase(srcCfg[strSrcField],\n prj.location, dstCfg.project.location);\n else\n "
77		" dstCfg[strDstField] = srcCfg[strSrcField];\n end\n end\n end\n \n --\n -- This function will take the list of project entries and apply their usage project data\n -- to the given configuration. It will copy compiling information for the projects that are\n -- not listed as linkage-only. It will copy the linking information for projects only if\n -- the source project is not a static library. It won't copy linking information\n -- if the project is in this solution; instead it will add that project to the configuration's\n -- links field, expecting that Premake will handle the rest.\n --\n local function copyusagedata(cfg, cfgname, linkToProjs)\n local myPrj = cfg.project;\n local bIsStaticLib = (getCfgKind(cfg) == \"StaticLib\");\n \n for prjName, prjEntry in pairs(linkToProjs) do\n local srcPrj = prjEntry.usageProj;\n local srcCfg = srcPrj.__configs[cfgname];\n \n for name, field in pairs(premake.fields) do\n if(srcCfg[name]) then\n if(field.usagecopy) then\n if(not prjEntry.bLinkageO"
78		"nly) then\n copydependentfield(srcCfg, cfg, name)\n end\n elseif(field.linkagecopy) then\n --Copy the linkage data if we're building a non-static thing\n --and this is a pure usage project. If it's not pure-usage, then\n --we will simply put the project's name in the links field later.\n if((not bIsStaticLib) and (not prjEntry.proj)) then\n copydependentfield(srcCfg, cfg, name)\n end\n end\n end\n end\n \n if((not bIsStaticLib) and prjEntry.proj) then\n table.insert(cfg.links, prjEntry.proj.name);\n end\n end\n end\nfunction premake.bake.buildconfigs()\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nprj.location = prj.location or sln.location or prj.basedir\nadjustpaths(prj.location, prj)\nfor _, blk in ipairs(prj.blocks) do\nadjustpaths(prj.location, blk)\nend\nend\nsln.location = sln.location or sln.basedir\nend\nfor sln in premake.solution.each() do\nlocal basis = collapse(sln)\nfor _, prj in ipairs(sln.projects) do\nprj.__configs = collapse(prj, basis)\nfor "
79		"_, cfg in pairs(prj.__configs) do\nbake.postprocess(prj, cfg)\nend\nend\nend\nfor sln in premake.solution.each() do\nfor prjIx, prj in ipairs(sln.projects) do\nif(not prj.usage) then\nfor cfgname, cfg in pairs(prj.__configs) do\nlocal usesPrjs = getprojectsconnections(cfg, cfgname);\ncopyusagedata(cfg, cfgname, usesPrjs)\nend\nend\nend\nend\nfor sln in premake.solution.each() do\nlocal removeList = {};\nfor index, prj in ipairs(sln.projects) do\nif(prj.usage) then\ntable.insert(removeList, 1, index); --Add in reverse order.\nend\nend\nfor _, index in ipairs(removeList) do\ntable.remove(sln.projects, index);\nend\nend\nbuilduniquedirs()\nbuildtargets(cfg)\nend\nfunction premake.bake.postprocess(prj, cfg)\ncfg.project = prj\ncfg.shortname = premake.getconfigname(cfg.name, cfg.platform, true)\ncfg.longname = premake.getconfigname(cfg.name, cfg.platform)\ncfg.location = cfg.location or cfg.basedir\nlocal platform = premake.platforms[cfg.platform]\nif platform.iscrosscompiler then\ncfg.system = cfg.platform\nels"
80		"e\ncfg.system = os.get()\nend\nif cfg.kind == \"SharedLib\" and platform.nosharedlibs then\ncfg.kind = \"StaticLib\"\nend\nlocal files = { }\nfor _, fname in ipairs(cfg.files) do\nlocal excluded = false\nfor _, exclude in ipairs(cfg.excludes) do\nexcluded = (fname == exclude)\nif (excluded) then break end\nend\nif (not excluded) then\ntable.insert(files, fname)\nend\nend\ncfg.files = files\nfor name, field in pairs(premake.fields) do\nif field.isflags then\nlocal values = cfg[name]\nfor _, flag in ipairs(values) do values[flag] = true end\nend\nend\ncfg.__fileconfigs = { }\nfor _, fname in ipairs(cfg.files) do\ncfg.terms.required = fname:lower()\nlocal fcfg = {}\nfor _, blk in ipairs(cfg.project.blocks) do\nif (premake.iskeywordsmatch(blk.keywords, cfg.terms)) then\nmergeobject(fcfg, blk)\nend\nend\nfcfg.name = fname\ncfg.__fileconfigs[fname] = fcfg\ntable.insert(cfg.__fileconfigs, fcfg)\nend\nend\n",
	72	"2, 1)\nfor v = start, num_variations do\ndir = cfg_dirs[cfg][v]\nif hit_counts[dir] == 1 then break end\nend\nif (cfg.flags.SingleOutputDir) then\ncfg.objectsdir = cfg.objdir or cfg.project.objdir or \"obj\"\nelse\ncfg.objectsdir = path.getrelative(cfg.location, dir)\nend\nend\nend\nend\nend\nlocal function buildtargets()\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nfor _, cfg in pairs(prj.__configs) do\nlocal pathstyle = premake.getpathstyle(cfg)\nlocal namestyle = premake.getnamestyle(cfg)\ncfg.buildtarget = premake.gettarget(cfg, \"build\", pathstyle, namestyle, cfg.system)\ncfg.linktarget = premake.gettarget(cfg, \"link\", pathstyle, namestyle, cfg.system)\nif pathstyle == \"windows\" then\ncfg.objectsdir = path.translate(cfg.objectsdir, \"\\\\\")\nend\nend\nend\nend\nend\n local function getCfgKind(cfg)\n if(cfg.kind) then\n return cfg.kind;\n end\n \n if(cfg.project.__configs[\"\"] and cfg.project.__configs[\"\"].kind) then\n return cfg.project.__configs[\"\"].k"
	73	"ind;\n end\n \n return nil\n end\n \n local function getprojrec(dstArray, foundList, cfg, cfgname, searchField, bLinkage)\n if(not cfg) then return end\n \n local foundUsePrjs = {};\n for _, useName in ipairs(cfg[searchField]) do\n local testName = useName:lower();\n if((not foundList[testName])) then\n local theProj = nil;\n local theUseProj = nil;\n for _, prj in ipairs(cfg.project.solution.projects) do\n if (prj.name:lower() == testName) then\n if(prj.usage) then\n theUseProj = prj;\n else\n theProj = prj;\n end\n end\n end\n \n --Must connect to a usage project.\n if(theUseProj) then\n foundList[testName] = true;\n local prjEntry = {\n name = testName,\n proj = theProj,\n usageProj = theUseProj,\n bLinkageOnly = bLinkage,\n };\n dstArray[testName] = prjEntry;\n table.insert(foundUsePrjs, theUseProj);\n end\n end\n end\n \n for _, usePrj in ipairs(foundUsePrjs) do\n --Links can only recurse through static libraries.\n if((searchField ~= \"links\") or\n (getCfgKind("
	74	"usePrj.__configs[cfgname]) == \"StaticLib\")) then\n getprojrec(dstArray, foundList, usePrj.__configs[cfgname],\n cfgname, searchField, bLinkage);\n end\n end\n end\n \n --\n -- This function will recursively get all projects that the given configuration has in its \"uses\"\n -- field. The return values are a list of tables. Each table in that list contains the following:\n --name = The lowercase name of the project.\n --proj = The project. Can be nil if it is usage-only.\n --usageProj = The usage project. Can't be nil, as using a project that has no\n -- usage project is not put into the list.\n --bLinkageOnly = If this is true, then only the linkage information should be copied.\n -- The recursion will only look at the \"uses\" field on usage projects.\n -- This function will also add projects to the list that are mentioned in the \"links\"\n -- field of usage projects. These will only copy linker information, but they will recurse.\n -- through other \"links\" fields.\n --\n local func"
	75	"tion getprojectsconnections(cfg, cfgname)\n local dstArray = {};\n local foundList = {};\n foundList[cfg.project.name:lower()] = true;\n \n --First, follow the uses recursively.\n getprojrec(dstArray, foundList, cfg, cfgname, \"uses\", false);\n \n --Next, go through all of the usage projects and recursively get their links.\n --But only if they're not already there. Get the links as linkage-only.\n local linkArray = {};\n for prjName, prjEntry in pairs(dstArray) do\n getprojrec(linkArray, foundList, prjEntry.usageProj.__configs[cfgname], cfgname, \n \"links\", true);\n end\n \n --Copy from linkArray into dstArray.\n for prjName, prjEntry in pairs(linkArray) do\n dstArray[prjName] = prjEntry;\n end\n \n return dstArray;\n end\n \n \n local function isnameofproj(cfg, strName)\n local sln = cfg.project.solution;\n local strTest = strName:lower();\n for prjIx, prj in ipairs(sln.projects) do\n if (prj.name:lower() == strTest) then\n return true;\n end\n end\n \n return false;\n e"
	76	"nd\n --\n -- Copies the field from dstCfg to srcCfg.\n --\n local function copydependentfield(srcCfg, dstCfg, strSrcField)\n local srcField = premake.fields[strSrcField];\n local strDstField = strSrcField;\n \n if type(srcCfg[strSrcField]) == \"table\" then\n --handle paths.\n if (srcField.kind == \"dirlist\" or srcField.kind == \"filelist\") and\n (not keeprelative[strSrcField]) then\n for i,p in ipairs(srcCfg[strSrcField]) do\n table.insert(dstCfg[strDstField],\n path.rebase(p, srcCfg.project.location, dstCfg.project.location))\n end\n else\n if(strSrcField == \"links\") then\n for i,p in ipairs(srcCfg[strSrcField]) do\n if(not isnameofproj(dstCfg, p)) then\n table.insert(dstCfg[strDstField], p)\n else\n printf(\"Failed to copy '%s' from proj '%s'.\",\n p, srcCfg.project.name);\n end\n end\n else\n for i,p in ipairs(srcCfg[strSrcField]) do\n table.insert(dstCfg[strDstField], p)\n end\n end\n end\n else\n if(srcField.kind == \"path\" and (not keeprelative[strSrcField])) then\n"
	77	" dstCfg[strDstField] = path.rebase(srcCfg[strSrcField],\n prj.location, dstCfg.project.location);\n else\n dstCfg[strDstField] = srcCfg[strSrcField];\n end\n end\n end\n \n --\n -- This function will take the list of project entries and apply their usage project data\n -- to the given configuration. It will copy compiling information for the projects that are\n -- not listed as linkage-only. It will copy the linking information for projects only if\n -- the source project is not a static library. It won't copy linking information\n -- if the project is in this solution; instead it will add that project to the configuration's\n -- links field, expecting that Premake will handle the rest.\n --\n local function copyusagedata(cfg, cfgname, linkToProjs)\n local myPrj = cfg.project;\n local bIsStaticLib = (getCfgKind(cfg) == \"StaticLib\");\n \n for prjName, prjEntry in pairs(linkToProjs) do\n local srcPrj = prjEntry.usageProj;\n local srcCfg = srcPrj.__configs[cfgname];\n \n for name, field"
	78	" in pairs(premake.fields) do\n if(srcCfg[name]) then\n if(field.usagecopy) then\n if(not prjEntry.bLinkageOnly) then\n copydependentfield(srcCfg, cfg, name)\n end\n elseif(field.linkagecopy) then\n --Copy the linkage data if we're building a non-static thing\n --and this is a pure usage project. If it's not pure-usage, then\n --we will simply put the project's name in the links field later.\n if((not bIsStaticLib) and (not prjEntry.proj)) then\n copydependentfield(srcCfg, cfg, name)\n end\n end\n end\n end\n \n if((not bIsStaticLib) and prjEntry.proj) then\n table.insert(cfg.links, prjEntry.proj.name);\n end\n end\n end\nfunction premake.bake.buildconfigs()\nfor sln in premake.solution.each() do\nfor _, prj in ipairs(sln.projects) do\nprj.location = prj.location or sln.location or prj.basedir\nadjustpaths(prj.location, prj)\nfor _, blk in ipairs(prj.blocks) do\nadjustpaths(prj.location, blk)\nend\nend\nsln.location = sln.location or sln.basedir\nend\nfor sln in premake.solution.each() do\n"
	79	"local basis = collapse(sln)\nfor _, prj in ipairs(sln.projects) do\nprj.__configs = collapse(prj, basis)\nfor _, cfg in pairs(prj.__configs) do\nbake.postprocess(prj, cfg)\nend\nend\nend\nfor sln in premake.solution.each() do\nfor prjIx, prj in ipairs(sln.projects) do\nif(not prj.usage) then\nfor cfgname, cfg in pairs(prj.__configs) do\nlocal usesPrjs = getprojectsconnections(cfg, cfgname);\ncopyusagedata(cfg, cfgname, usesPrjs)\nend\nend\nend\nend\nfor sln in premake.solution.each() do\nlocal removeList = {};\nfor index, prj in ipairs(sln.projects) do\nif(prj.usage) then\ntable.insert(removeList, 1, index); --Add in reverse order.\nend\nend\nfor _, index in ipairs(removeList) do\ntable.remove(sln.projects, index);\nend\nend\nbuilduniquedirs()\nbuildtargets(cfg)\nend\nfunction premake.bake.postprocess(prj, cfg)\ncfg.project = prj\ncfg.shortname = premake.getconfigname(cfg.name, cfg.platform, true)\ncfg.longname = premake.getconfigname(cfg.name, cfg.platform)\ncfg.location = cfg.location or cfg.basedir\nloca"
	80	"l platform = premake.platforms[cfg.platform]\nif platform.iscrosscompiler then\ncfg.system = cfg.platform\nelse\ncfg.system = os.get()\nend\nif cfg.kind == \"SharedLib\" and platform.nosharedlibs then\ncfg.kind = \"StaticLib\"\nend\nlocal files = { }\nfor _, fname in ipairs(cfg.files) do\nlocal excluded = false\nfor _, exclude in ipairs(cfg.excludes) do\nexcluded = (fname == exclude)\nif (excluded) then break end\nend\nif (not excluded) then\ntable.insert(files, fname)\nend\nend\ncfg.files = files\nfor name, field in pairs(premake.fields) do\nif field.isflags then\nlocal values = cfg[name]\nfor _, flag in ipairs(values) do values[flag] = true end\nend\nend\ncfg.__fileconfigs = { }\nfor _, fname in ipairs(cfg.files) do\ncfg.terms.required = fname:lower()\nlocal fcfg = {}\nfor _, blk in ipairs(cfg.project.blocks) do\nif (premake.iskeywordsmatch(blk.keywords, cfg.terms)) then\nmergeobject(fcfg, blk)\nend\nend\nfcfg.name = fname\ncfg.__fileconfigs[fname] = fcfg\ntable.insert(cfg.__fileconfigs, fcfg)\nend\nend\n",
81	81
82	82	/* base/api.lua */
83		"premake.fields =\n{\narchivesplit_size =\n{\nkind = \"string\",\nscope = \"config\",\n},\nbasedir =\n{\nkind = \"path\",\nscope = \"container\",\n},\nbuildaction =\n{\nkind = \"string\",\nscope = \"config\",\nallowed = {\n\"Compile\",\n\"Copy\",\n\"Embed\",\n\"None\"\n}\n},\nbuildoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nbuildoptions_cpp =\n{\nkind = \"list\",\nscope = \"config\",\n},\nconfigurations =\n{\nkind = \"list\",\nscope = \"solution\",\n},\ndebugargs =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndebugdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\ndebugenvs =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndefines =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndeploymentoptions =\n{\nkind = \"list\",\nscope = \"config\",\nusagecopy = true,\n},\nexcludes =\n{\nkind = \"filelist\",\nscope = \"config\",\n},\nfiles =\n{\nkind = \"filelist\",\nscope = \"config\",\n},\nflags =\n{\nkind = \"list\",\nscope = \"config\",\nisflags = true,\nusagecopy = true,\nallowed = functi"
84		"on(value)\nlocal allowed_flags = {\nATL = 1,\nDebugEnvsDontMerge = 1,\nDebugEnvsInherit = 1,\nEnableMinimalRebuild = 1,\nEnableSSE = 1,\nEnableSSE2 = 1,\nExtraWarnings = 1,\nFatalWarnings = 1,\nFloatFast = 1,\nFloatStrict = 1,\nManaged = 1,\nMFC = 1,\nNativeWChar = 1,\nNo64BitChecks = 1,\nNoEditAndContinue = 1,\nNoExceptions = 1,\nNoFramePointer = 1,\nNoImportLib = 1,\nNoIncrementalLink = 1,\nNoManifest = 1,\nNoMultiProcessorCompilation = 1,\nNoNativeWChar = 1,\nNoPCH = 1,\nNoRTTI = 1,\nOptimize = 1,\nOptimizeSize = 1,\nOptimizeSpeed = 1,\nSEH = 1,\nStaticATL = 1,\nStaticRuntime = 1,\nSymbols = 1,\nUnicode = 1,\nUnsafe = 1,\nUnsignedChar = 1,\nWinMain = 1,\n}\nlocal englishToAmericanSpelling =\n{\noptimise = 'optimize',\noptimisesize = 'optimizesize',\noptimisespeed = 'optimizespeed',\n}\nlocal lowervalue = value:lower()\nlowervalue = englishToAmericanSpelling[lowervalue] or lowervalue\nfor v, _ in pairs(allowed_flags) do\nif v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid flag\"\nend,"
85		"\n},\nframework =\n{\nkind = \"string\",\nscope = \"container\",\nallowed = {\n\"1.0\",\n\"1.1\",\n\"2.0\",\n\"3.0\",\n\"3.5\",\n\"4.0\",\n\"4.5\",\n}\n},\nforcedincludes = \n{\nkind = \"absolutefilelist\",\nscope = \"config\",\n},\nimagepath =\n{\nkind = \"path\",\nscope = \"config\",\n},\nimageoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nimplibdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\nimplibextension =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibname =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibprefix =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibsuffix =\n{\nkind = \"string\",\nscope = \"config\",\n},\nincludedirs =\n{\nkind = \"dirlist\",\nscope = \"config\",\nusagecopy = true,\n},\nkind =\n{\nkind = \"string\",\nscope = \"config\",\nallowed = {\n\"ConsoleApp\",\n\"WindowedApp\",\n\"StaticLib\",\n\"SharedLib\"\n}\n},\nlanguage =\n{\nkind = \"string\",\nscope = \"container\",\nallowed = {\n\"C\",\n\"C++\",\n\"C#\"\n}\n},\nlibdirs =\n{\nkind "
86		" = \"dirlist\",\nscope = \"config\",\nlinkagecopy = true,\n},\nlinkoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nlinks =\n{\nkind = \"list\",\nscope = \"config\",\nallowed = function(value)\nif value:find('/', nil, true) then\nvalue = path.getabsolute(value)\nend\nreturn value\nend,\nlinkagecopy = true,\n},\nlocation =\n{\nkind = \"path\",\nscope = \"container\",\n},\nmakesettings =\n{\nkind = \"list\",\nscope = \"config\",\n},\nmessageskip =\n{\nkind = \"list\",\nscope = \"solution\",\nisflags = true,\nusagecopy = true,\nallowed = function(value)\nlocal allowed_messages = {\nSkipCreatingMessage = 1,\nSkipBuildingMessage = 1,\nSkipCleaningMessage = 1,\n}\nlocal lowervalue = value:lower()\nfor v, _ in pairs(allowed_messages) do\nif v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid message to skip\"\nend,\n},\nmsgarchiving =\n{\nkind = \"string\",\nscope = \"config\",\n},\nmsgcompile =\n{\nkind = \"string\",\nscope = \"config\",\n},\nmsgresource =\n{\nkind = \"string\",\ns"
87		"cope = \"config\",\n},\nmsglinking =\n{\nkind = \"string\",\nscope = \"config\",\n},\nobjdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\noptions =\n{\nkind = \"list\",\nscope = \"container\",\nisflags = true,\nusagecopy = true,\nallowed = function(value)\nlocal allowed_options = {\nForceCPP = 1,\nArchiveSplit = 1\n}\nlocal lowervalue = value:lower()\nfor v, _ in pairs(allowed_options) do\nif v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid option\"\nend,\n},\npchheader =\n{\nkind = \"string\",\nscope = \"config\",\n},\npchsource =\n{\nkind = \"path\",\nscope = \"config\",\n},\nplatforms =\n{\nkind = \"list\",\nscope = \"solution\",\nallowed = table.keys(premake.platforms),\n},\npostbuildcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nprebuildcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nprelinkcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nresdefines =\n{\nkind = \"list\",\nscope = \"config\",\n},\nresincludedirs =\n{\nkind = \"dirlist\","
88		"\nscope = \"config\",\n},\nresoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nstartproject =\n{\nkind = \"string\",\nscope = \"solution\",\n},\ntargetdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\ntargetsubdir =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetextension =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetname =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetprefix =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetsuffix =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntrimpaths =\n{\nkind = \"dirlist\",\nscope = \"config\",\n},\nuuid =\n{\nkind = \"string\",\nscope = \"container\",\nallowed = function(value)\nlocal ok = true\nif (#value ~= 36) then ok = false end\nfor i=1,36 do\nlocal ch = value:sub(i,i)\nif (not ch:find(\"[ABCDEFabcdef0123456789-]\")) then ok = false end\nend\nif (value:sub(9,9) ~= \"-\") then ok = false end\nif (value:sub(14,14) ~= \"-\") then ok = false end\nif (value:sub(19,19) ~= \"-\") then ok = false end\nif (value:s"
89		"ub(24,24) ~= \"-\") then ok = false end\nif (not ok) then\nreturn nil, \"invalid UUID\"\nend\nreturn value:upper()\nend\n},\nuses =\n{\nkind = \"list\",\nscope = \"config\",\n},\nvpaths =\n{\nkind = \"keypath\",\nscope = \"container\",\n},\n}\nfunction premake.checkvalue(value, allowed)\nif (allowed) then\nif (type(allowed) == \"function\") then\nreturn allowed(value)\nelse\nfor _,v in ipairs(allowed) do\nif (value:lower() == v:lower()) then\nreturn v\nend\nend\nreturn nil, \"invalid value '\" .. value .. \"'\"\nend\nelse\nreturn value\nend\nend\nfunction premake.getobject(t)\nlocal container\nif (t == \"container\" or t == \"solution\") then\ncontainer = premake.CurrentContainer\nelse\ncontainer = premake.CurrentConfiguration\nend\nif t == \"solution\" then\nif type(container) == \"project\" then\ncontainer = container.solution\nend\nif type(container) ~= \"solution\" then\ncontainer = nil\nend\nend\nlocal msg\nif (not container) then\nif (t == \"container\") then\nmsg = \"no active solution or project\"\nel"
90		"seif (t == \"solution\") then\nmsg = \"no active solution\"\nelse\nmsg = \"no active solution, project, or configuration\"\nend\nend\nreturn container, msg\nend\nfunction premake.setarray(obj, fieldname, value, allowed)\nobj[fieldname] = obj[fieldname] or {}\nlocal function add(value, depth)\nif type(value) == \"table\" then\nfor _,v in ipairs(value) do\nadd(v, depth + 1)\nend\nelse\nvalue, err = premake.checkvalue(value, allowed)\nif not value then\nerror(err, depth)\nend\ntable.insert(obj[fieldname], value)\nend\nend\nif value then\nadd(value, 5)\nend\nreturn obj[fieldname]\nend\nlocal function domatchedarray(ctype, fieldname, value, matchfunc)\nlocal result = { }\nfunction makeabsolute(value, depth)\nif (type(value) == \"table\") then\nfor _, item in ipairs(value) do\nmakeabsolute(item, depth + 1)\nend\nelseif type(value) == \"string\" then\nif value:find(\"*\") then\nmakeabsolute(matchfunc(value), depth + 1)\nelse\ntable.insert(result, path.getabsolute(value))\nend\nelse\nerror(\"Invalid value in list: exp"
91		"ected string, got \" .. type(value), depth)\nend\nend\nmakeabsolute(value, 3)\nreturn premake.setarray(ctype, fieldname, result)\nend\nfunction premake.setdirarray(ctype, fieldname, value)\nreturn domatchedarray(ctype, fieldname, value, os.matchdirs)\nend\nfunction premake.setfilearray(ctype, fieldname, value)\nreturn domatchedarray(ctype, fieldname, value, os.matchfiles)\nend\nfunction premake.setkeyvalue(ctype, fieldname, values)\nlocal container, err = premake.getobject(ctype)\nif not container then\nerror(err, 4)\nend\nif not container[fieldname] then\ncontainer[fieldname] = {}\nend\nif type(values) ~= \"table\" then\nerror(\"invalid value; table expected\", 4)\nend\nlocal field = container[fieldname]\nfor key,value in pairs(values) do\nif not field[key] then\nfield[key] = {}\nend\ntable.insertflat(field[key], value)\nend\nreturn field\nend\nfunction premake.setstring(ctype, fieldname, value, allowed)\nlocal container, err = premake.getobject(ctype)\nif (not container) then\nerror(err, 4)\nend\nif (value) "
92		"then\nvalue, err = premake.checkvalue(value, allowed)\nif (not value) then\nerror(err, 4)\nend\ncontainer[fieldname] = value\nend\nreturn container[fieldname]\nend\nfunction premake.remove(fieldname, value)\nlocal cfg = premake.CurrentConfiguration\ncfg.removes = cfg.removes or {}\ncfg.removes[fieldname] = premake.setarray(cfg.removes, fieldname, value)\nend\nlocal function accessor(name, value)\nlocal kind = premake.fields[name].kind\nlocal scope = premake.fields[name].scope\nlocal allowed = premake.fields[name].allowed\nif (kind == \"string\" or kind == \"path\") and value then\nif type(value) ~= \"string\" then\nerror(\"string value expected\", 3)\nend\nend\nlocal container, err = premake.getobject(scope)\nif (not container) then\nerror(err, 3)\nend\nif kind == \"string\" then\nreturn premake.setstring(scope, name, value, allowed)\nelseif kind == \"path\" then\nif value then value = path.getabsolute(value) end\nreturn premake.setstring(scope, name, value)\nelseif kind == \"list\" then\nreturn premake.s"
93		"etarray(container, name, value, allowed)\nelseif kind == \"dirlist\" then\nreturn premake.setdirarray(container, name, value)\nelseif kind == \"filelist\" or kind == \"absolutefilelist\" then\nreturn premake.setfilearray(container, name, value)\nelseif kind == \"keyvalue\" or kind == \"keypath\" then\nreturn premake.setkeyvalue(scope, name, value)\nend\nend\nfor name, info in pairs(premake.fields) do\n_G[name] = function(value)\nreturn accessor(name, value)\nend\nif info.kind == \"list\" or \n info.kind == \"dirlist\" or \n info.kind == \"filelist\" or\n info.kind == \"absolutefilelist\" \nthen\n_G[\"remove\"..name] = function(value)\npremake.remove(name, value)\nend\nend\nend\nfunction configuration(terms)\nif not terms then\nreturn premake.CurrentConfiguration\nend\nlocal container, err = premake.getobject(\"container\")\nif (not container) then\nerror(err, 2)\nend\nlocal cfg = { }\ncfg.terms = table.flatten({terms})\ntable.insert(container.blocks, cfg)\npremake.CurrentConfiguration = cfg\ncfg.keywords"
94		" = { }\nfor _, word in ipairs(cfg.terms) do\ntable.insert(cfg.keywords, path.wildcards(word):lower())\nend\nfor name, field in pairs(premake.fields) do\nif (field.kind ~= \"string\" and field.kind ~= \"path\") then\ncfg[name] = { }\nend\nend\nreturn cfg\nend\nlocal function creategroup(name, sln, parent, inpath)\nlocal group = {}\nsetmetatable(group, {\n__type = \"group\"\n})\ntable.insert(sln.groups, group)\nsln.groups[inpath] = group\ngroup.solution = sln\ngroup.name = name\ngroup.uuid = os.uuid(group.name)\ngroup.parent = parent\nreturn group\nend\nlocal function creategroupsfrompath(inpath, sln)\nif inpath == nil then return nil end\ninpath = path.translate(inpath, \"/\")\nlocal groups = string.explode(inpath, \"/\")\nlocal curpath = \"\"\nlocal lastgroup = nil\nfor i, v in ipairs(groups) do\ncurpath = curpath .. \"/\" .. v:lower()\nlocal group = sln.groups[curpath]\nif group == nil then\ngroup = creategroup(v, sln, lastgroup, curpath)\nend\nlastgroup = group\nend\nreturn lastgroup\nend\nlocal function cre"
95		"ateproject(name, sln, isUsage)\nlocal prj = {}\nsetmetatable(prj, {\n__type = \"project\",\n})\ntable.insert(sln.projects, prj)\nif(isUsage) then\nif(sln.projects[name]) then\nsln.projects[name].usageProj = prj;\nelse\nsln.projects[name] = prj\nend\nelse\nif(sln.projects[name]) then\nprj.usageProj = sln.projects[name];\nend\nsln.projects[name] = prj\nend\nlocal group = creategroupsfrompath(premake.CurrentGroup, sln)\nprj.solution = sln\nprj.name = name\nprj.basedir = os.getcwd()\nprj.uuid = os.uuid(prj.name)\nprj.blocks = { }\nprj.usage = isUsage\nprj.group = group\nreturn prj;\nend\nfunction usage(name)\nif (not name) then\nif(type(premake.CurrentContainer) ~= \"project\") then return nil end\nif(not premake.CurrentContainer.usage) then return nil end\nreturn premake.CurrentContainer\nend\nlocal sln\nif (type(premake.CurrentContainer) == \"project\") then\nsln = premake.CurrentContainer.solution\nelse\nsln = premake.CurrentContainer\nend\nif (type(sln) ~= \""
96		"solution\") then\nerror(\"no active solution\", 2)\nend\n -- if this is a new project, or the project in that slot doesn't have a usage, create it\n if((not sln.projects[name]) or\n ((not sln.projects[name].usage) and (not sln.projects[name].usageProj))) then\n premake.CurrentContainer = createproject(name, sln, true)\n else\n premake.CurrentContainer = iff(sln.projects[name].usage,\n sln.projects[name], sln.projects[name].usageProj)\n end\n -- add an empty, global configuration to the project\n configuration { }\n return premake.CurrentContainer\n end\n function project(name)\n if (not name) then\n --Only return non-usage projects\n if(type(premake.CurrentContainer) ~= \"project\") then return nil end\n if(premake.CurrentContainer.usage) then return nil end\n return premake.CurrentContainer\nend\n -- identify the parent solution\n local sln\n if (type(premake.CurrentContainer) == \"project\") then\n sln = premake.CurrentContainer.solution\n else\n sln = premake.CurrentContainer\n end"
97		"\n if (type(sln) ~= \"solution\") then\n error(\"no active solution\", 2)\n end\n -- if this is a new project, or the old project is a usage project, create it\n if((not sln.projects[name]) or sln.projects[name].usage) then\n premake.CurrentContainer = createproject(name, sln)\n else\n premake.CurrentContainer = sln.projects[name];\n end\nconfiguration { }\nreturn premake.CurrentContainer\nend\nfunction solution(name)\nif not name then\nif type(premake.CurrentContainer) == \"project\" then\nreturn premake.CurrentContainer.solution\nelse\nreturn premake.CurrentContainer\nend\nend\npremake.CurrentContainer = premake.solution.get(name)\nif (not premake.CurrentContainer) then\npremake.CurrentContainer = premake.solution.new(name)\nend\nconfiguration { }\nreturn premake.CurrentContainer\nend\nfunction group(name)\nif not name then \nreturn premake.CurrentGroup\nend\npremake.CurrentGroup = name\nreturn premake.CurrentGroup\nend\nfunction newaction(a)\npremake.action.add(a)\nend\nfunction newoption(opt)\npre"
98		"make.option.add(opt)\nend\n",
	83	"premake.fields =\n{\narchivesplit_size =\n{\nkind = \"string\",\nscope = \"config\",\n},\nbasedir =\n{\nkind = \"path\",\nscope = \"container\",\n},\nbuildaction =\n{\nkind = \"string\",\nscope = \"config\",\nallowed = {\n\"Compile\",\n\"Copy\",\n\"Embed\",\n\"None\"\n}\n},\nbuildoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nbuildoptions_c =\n{\nkind = \"list\",\nscope = \"config\",\n},\nbuildoptions_cpp =\n{\nkind = \"list\",\nscope = \"config\",\n},\nconfigurations =\n{\nkind = \"list\",\nscope = \"solution\",\n},\ndebugargs =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndebugdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\ndebugenvs =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndefines =\n{\nkind = \"list\",\nscope = \"config\",\n},\ndeploymentoptions =\n{\nkind = \"list\",\nscope = \"config\",\nusagecopy = true,\n},\nexcludes =\n{\nkind = \"filelist\",\nscope = \"config\",\n},\nfiles =\n{\nkind = \"filelist\",\nscope = \"config\",\n},\nflags =\n{\nkind = \"list\",\nscope = "
	84	"\"config\",\nisflags = true,\nusagecopy = true,\nallowed = function(value)\nlocal allowed_flags = {\nATL = 1,\nDebugEnvsDontMerge = 1,\nDebugEnvsInherit = 1,\nEnableMinimalRebuild = 1,\nEnableSSE = 1,\nEnableSSE2 = 1,\nExtraWarnings = 1,\nFatalWarnings = 1,\nFloatFast = 1,\nFloatStrict = 1,\nManaged = 1,\nMFC = 1,\nNativeWChar = 1,\nNo64BitChecks = 1,\nNoEditAndContinue = 1,\nNoExceptions = 1,\nNoFramePointer = 1,\nNoImportLib = 1,\nNoIncrementalLink = 1,\nNoManifest = 1,\nNoMultiProcessorCompilation = 1,\nNoNativeWChar = 1,\nNoPCH = 1,\nNoRTTI = 1,\nSingleOutputDir = 1,\nOptimize = 1,\nOptimizeSize = 1,\nOptimizeSpeed = 1,\nSEH = 1,\nStaticATL = 1,\nStaticRuntime = 1,\nSymbols = 1,\nUnicode = 1,\nUnsafe = 1,\nUnsignedChar = 1,\nWinMain = 1,\n}\nlocal englishToAmericanSpelling =\n{\noptimise = 'optimize',\noptimisesize = 'optimizesize',\noptimisespeed = 'optimizespeed',\n}\nlocal lowervalue = value:lower()\nlowervalue = englishToAmericanSpelling[lowervalue] or lowervalue\nfor v, _ in pairs(allowed_flags) do\ni"
	85	"f v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid flag\"\nend,\n},\nframework =\n{\nkind = \"string\",\nscope = \"container\",\nallowed = {\n\"1.0\",\n\"1.1\",\n\"2.0\",\n\"3.0\",\n\"3.5\",\n\"4.0\",\n\"4.5\",\n}\n},\nforcedincludes = \n{\nkind = \"absolutefilelist\",\nscope = \"config\",\n},\nimagepath =\n{\nkind = \"path\",\nscope = \"config\",\n},\nimageoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nimplibdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\nimplibextension =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibname =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibprefix =\n{\nkind = \"string\",\nscope = \"config\",\n},\nimplibsuffix =\n{\nkind = \"string\",\nscope = \"config\",\n},\nincludedirs =\n{\nkind = \"dirlist\",\nscope = \"config\",\nusagecopy = true,\n},\nkind =\n{\nkind = \"string\",\nscope = \"config\",\nallowed = {\n\"ConsoleApp\",\n\"WindowedApp\",\n\"StaticLib\",\n\"SharedLib\"\n}\n},\nlanguage =\n{\nkind = \"string\",\nsco"
	86	"pe = \"container\",\nallowed = {\n\"C\",\n\"C++\",\n\"C#\"\n}\n},\nlibdirs =\n{\nkind = \"dirlist\",\nscope = \"config\",\nlinkagecopy = true,\n},\nlinkoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nlinks =\n{\nkind = \"list\",\nscope = \"config\",\nallowed = function(value)\nif value:find('/', nil, true) then\nvalue = path.getabsolute(value)\nend\nreturn value\nend,\nlinkagecopy = true,\n},\nlocation =\n{\nkind = \"path\",\nscope = \"container\",\n},\nmakesettings =\n{\nkind = \"list\",\nscope = \"config\",\n},\nmessageskip =\n{\nkind = \"list\",\nscope = \"solution\",\nisflags = true,\nusagecopy = true,\nallowed = function(value)\nlocal allowed_messages = {\nSkipCreatingMessage = 1,\nSkipBuildingMessage = 1,\nSkipCleaningMessage = 1,\n}\nlocal lowervalue = value:lower()\nfor v, _ in pairs(allowed_messages) do\nif v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid message to skip\"\nend,\n},\nmsgarchiving =\n{\nkind = \"string\",\nscope = \"config\",\n},\nmsgcompile =\n{\n"
	87	"kind = \"string\",\nscope = \"config\",\n},\nmsgresource =\n{\nkind = \"string\",\nscope = \"config\",\n},\nmsglinking =\n{\nkind = \"string\",\nscope = \"config\",\n},\nobjdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\noptions =\n{\nkind = \"list\",\nscope = \"container\",\nisflags = true,\nusagecopy = true,\nallowed = function(value)\nlocal allowed_options = {\nForceCPP = 1,\nArchiveSplit = 1\n}\nlocal lowervalue = value:lower()\nfor v, _ in pairs(allowed_options) do\nif v:lower() == lowervalue then\nreturn v\nend\nend\nreturn nil, \"invalid option\"\nend,\n},\npchheader =\n{\nkind = \"string\",\nscope = \"config\",\n},\npchsource =\n{\nkind = \"path\",\nscope = \"config\",\n},\nplatforms =\n{\nkind = \"list\",\nscope = \"solution\",\nallowed = table.keys(premake.platforms),\n},\npostbuildcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nprebuildcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nprelinkcommands =\n{\nkind = \"list\",\nscope = \"config\",\n},\nresdefines =\n{\n"
	88	"kind = \"list\",\nscope = \"config\",\n},\nresincludedirs =\n{\nkind = \"dirlist\",\nscope = \"config\",\n},\nresoptions =\n{\nkind = \"list\",\nscope = \"config\",\n},\nstartproject =\n{\nkind = \"string\",\nscope = \"solution\",\n},\ntargetdir =\n{\nkind = \"path\",\nscope = \"config\",\n},\ntargetsubdir =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetextension =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetname =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetprefix =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntargetsuffix =\n{\nkind = \"string\",\nscope = \"config\",\n},\ntrimpaths =\n{\nkind = \"dirlist\",\nscope = \"config\",\n},\nuuid =\n{\nkind = \"string\",\nscope = \"container\",\nallowed = function(value)\nlocal ok = true\nif (#value ~= 36) then ok = false end\nfor i=1,36 do\nlocal ch = value:sub(i,i)\nif (not ch:find(\"[ABCDEFabcdef0123456789-]\")) then ok = false end\nend\nif (value:sub(9,9) ~= \"-\") then ok = false end\nif (value:sub(14,14) ~= \"-\")"
	89	" then ok = false end\nif (value:sub(19,19) ~= \"-\") then ok = false end\nif (value:sub(24,24) ~= \"-\") then ok = false end\nif (not ok) then\nreturn nil, \"invalid UUID\"\nend\nreturn value:upper()\nend\n},\nuses =\n{\nkind = \"list\",\nscope = \"config\",\n},\nvpaths =\n{\nkind = \"keypath\",\nscope = \"container\",\n},\n}\nfunction premake.checkvalue(value, allowed)\nif (allowed) then\nif (type(allowed) == \"function\") then\nreturn allowed(value)\nelse\nfor _,v in ipairs(allowed) do\nif (value:lower() == v:lower()) then\nreturn v\nend\nend\nreturn nil, \"invalid value '\" .. value .. \"'\"\nend\nelse\nreturn value\nend\nend\nfunction premake.getobject(t)\nlocal container\nif (t == \"container\" or t == \"solution\") then\ncontainer = premake.CurrentContainer\nelse\ncontainer = premake.CurrentConfiguration\nend\nif t == \"solution\" then\nif type(container) == \"project\" then\ncontainer = container.solution\nend\nif type(container) ~= \"solution\" then\ncontainer = nil\nend\nend\nlocal msg\nif (not conta"
	90	"iner) then\nif (t == \"container\") then\nmsg = \"no active solution or project\"\nelseif (t == \"solution\") then\nmsg = \"no active solution\"\nelse\nmsg = \"no active solution, project, or configuration\"\nend\nend\nreturn container, msg\nend\nfunction premake.setarray(obj, fieldname, value, allowed)\nobj[fieldname] = obj[fieldname] or {}\nlocal function add(value, depth)\nif type(value) == \"table\" then\nfor _,v in ipairs(value) do\nadd(v, depth + 1)\nend\nelse\nvalue, err = premake.checkvalue(value, allowed)\nif not value then\nerror(err, depth)\nend\ntable.insert(obj[fieldname], value)\nend\nend\nif value then\nadd(value, 5)\nend\nreturn obj[fieldname]\nend\nlocal function domatchedarray(ctype, fieldname, value, matchfunc)\nlocal result = { }\nfunction makeabsolute(value, depth)\nif (type(value) == \"table\") then\nfor _, item in ipairs(value) do\nmakeabsolute(item, depth + 1)\nend\nelseif type(value) == \"string\" then\nif value:find(\"*\") then\nmakeabsolute(matchfunc(value), depth + 1)\nelse\ntable.i"
	91	"nsert(result, path.getabsolute(value))\nend\nelse\nerror(\"Invalid value in list: expected string, got \" .. type(value), depth)\nend\nend\nmakeabsolute(value, 3)\nreturn premake.setarray(ctype, fieldname, result)\nend\nfunction premake.setdirarray(ctype, fieldname, value)\nreturn domatchedarray(ctype, fieldname, value, os.matchdirs)\nend\nfunction premake.setfilearray(ctype, fieldname, value)\nreturn domatchedarray(ctype, fieldname, value, os.matchfiles)\nend\nfunction premake.setkeyvalue(ctype, fieldname, values)\nlocal container, err = premake.getobject(ctype)\nif not container then\nerror(err, 4)\nend\nif not container[fieldname] then\ncontainer[fieldname] = {}\nend\nif type(values) ~= \"table\" then\nerror(\"invalid value; table expected\", 4)\nend\nlocal field = container[fieldname]\nfor key,value in pairs(values) do\nif not field[key] then\nfield[key] = {}\nend\ntable.insertflat(field[key], value)\nend\nreturn field\nend\nfunction premake.setstring(ctype, fieldname, value, allowed)\nlocal container, err"
	92	" = premake.getobject(ctype)\nif (not container) then\nerror(err, 4)\nend\nif (value) then\nvalue, err = premake.checkvalue(value, allowed)\nif (not value) then\nerror(err, 4)\nend\ncontainer[fieldname] = value\nend\nreturn container[fieldname]\nend\nfunction premake.remove(fieldname, value)\nlocal cfg = premake.CurrentConfiguration\ncfg.removes = cfg.removes or {}\ncfg.removes[fieldname] = premake.setarray(cfg.removes, fieldname, value)\nend\nlocal function accessor(name, value)\nlocal kind = premake.fields[name].kind\nlocal scope = premake.fields[name].scope\nlocal allowed = premake.fields[name].allowed\nif (kind == \"string\" or kind == \"path\") and value then\nif type(value) ~= \"string\" then\nerror(\"string value expected\", 3)\nend\nend\nlocal container, err = premake.getobject(scope)\nif (not container) then\nerror(err, 3)\nend\nif kind == \"string\" then\nreturn premake.setstring(scope, name, value, allowed)\nelseif kind == \"path\" then\nif value then value = path.getabsolute(value) end\nreturn "
	93	"premake.setstring(scope, name, value)\nelseif kind == \"list\" then\nreturn premake.setarray(container, name, value, allowed)\nelseif kind == \"dirlist\" then\nreturn premake.setdirarray(container, name, value)\nelseif kind == \"filelist\" or kind == \"absolutefilelist\" then\nreturn premake.setfilearray(container, name, value)\nelseif kind == \"keyvalue\" or kind == \"keypath\" then\nreturn premake.setkeyvalue(scope, name, value)\nend\nend\nfor name, info in pairs(premake.fields) do\n_G[name] = function(value)\nreturn accessor(name, value)\nend\nif info.kind == \"list\" or \n info.kind == \"dirlist\" or \n info.kind == \"filelist\" or\n info.kind == \"absolutefilelist\" \nthen\n_G[\"remove\"..name] = function(value)\npremake.remove(name, value)\nend\nend\nend\nfunction configuration(terms)\nif not terms then\nreturn premake.CurrentConfiguration\nend\nlocal container, err = premake.getobject(\"container\")\nif (not container) then\nerror(err, 2)\nend\nlocal cfg = { }\ncfg.terms = table.flatten({terms})\n"
	94	"table.insert(container.blocks, cfg)\npremake.CurrentConfiguration = cfg\ncfg.keywords = { }\nfor _, word in ipairs(cfg.terms) do\ntable.insert(cfg.keywords, path.wildcards(word):lower())\nend\nfor name, field in pairs(premake.fields) do\nif (field.kind ~= \"string\" and field.kind ~= \"path\") then\ncfg[name] = { }\nend\nend\nreturn cfg\nend\nlocal function creategroup(name, sln, parent, inpath)\nlocal group = {}\nsetmetatable(group, {\n__type = \"group\"\n})\ntable.insert(sln.groups, group)\nsln.groups[inpath] = group\ngroup.solution = sln\ngroup.name = name\ngroup.uuid = os.uuid(group.name)\ngroup.parent = parent\nreturn group\nend\nlocal function creategroupsfrompath(inpath, sln)\nif inpath == nil then return nil end\ninpath = path.translate(inpath, \"/\")\nlocal groups = string.explode(inpath, \"/\")\nlocal curpath = \"\"\nlocal lastgroup = nil\nfor i, v in ipairs(groups) do\ncurpath = curpath .. \"/\" .. v:lower()\nlocal group = sln.groups[curpath]\nif group == nil then\ngroup = creategroup(v, sln, lastgr"
	95	"oup, curpath)\nend\nlastgroup = group\nend\nreturn lastgroup\nend\nlocal function createproject(name, sln, isUsage)\nlocal prj = {}\nsetmetatable(prj, {\n__type = \"project\",\n})\ntable.insert(sln.projects, prj)\nif(isUsage) then\nif(sln.projects[name]) then\nsln.projects[name].usageProj = prj;\nelse\nsln.projects[name] = prj\nend\nelse\nif(sln.projects[name]) then\nprj.usageProj = sln.projects[name];\nend\nsln.projects[name] = prj\nend\nlocal group = creategroupsfrompath(premake.CurrentGroup, sln)\nprj.solution = sln\nprj.name = name\nprj.basedir = os.getcwd()\nprj.uuid = os.uuid(prj.name)\nprj.blocks = { }\nprj.usage = isUsage\nprj.group = group\nreturn prj;\nend\nfunction usage(name)\nif (not name) then\nif(type(premake.CurrentContainer) ~= \"project\") then return nil end\nif(not premake.CurrentContainer.usage) then return nil end\nreturn premake.CurrentContainer\nend\nlocal sln\nif (type(premake.CurrentContainer) == \"project\") then\nsln = premake.Curr"
	96	"entContainer.solution\nelse\nsln = premake.CurrentContainer\nend\nif (type(sln) ~= \"solution\") then\nerror(\"no active solution\", 2)\nend\n -- if this is a new project, or the project in that slot doesn't have a usage, create it\n if((not sln.projects[name]) or\n ((not sln.projects[name].usage) and (not sln.projects[name].usageProj))) then\n premake.CurrentContainer = createproject(name, sln, true)\n else\n premake.CurrentContainer = iff(sln.projects[name].usage,\n sln.projects[name], sln.projects[name].usageProj)\n end\n -- add an empty, global configuration to the project\n configuration { }\n return premake.CurrentContainer\n end\n function project(name)\n if (not name) then\n --Only return non-usage projects\n if(type(premake.CurrentContainer) ~= \"project\") then return nil end\n if(premake.CurrentContainer.usage) then return nil end\n return premake.CurrentContainer\nend\n -- identify the parent solution\n local sln\n if (type(premake.CurrentContainer) == \"project\") then\n sln "
	97	"= premake.CurrentContainer.solution\n else\n sln = premake.CurrentContainer\n end\n if (type(sln) ~= \"solution\") then\n error(\"no active solution\", 2)\n end\n -- if this is a new project, or the old project is a usage project, create it\n if((not sln.projects[name]) or sln.projects[name].usage) then\n premake.CurrentContainer = createproject(name, sln)\n else\n premake.CurrentContainer = sln.projects[name];\n end\nconfiguration { }\nreturn premake.CurrentContainer\nend\nfunction solution(name)\nif not name then\nif type(premake.CurrentContainer) == \"project\" then\nreturn premake.CurrentContainer.solution\nelse\nreturn premake.CurrentContainer\nend\nend\npremake.CurrentContainer = premake.solution.get(name)\nif (not premake.CurrentContainer) then\npremake.CurrentContainer = premake.solution.new(name)\nend\nconfiguration { }\nreturn premake.CurrentContainer\nend\nfunction group(name)\nif not name then \nreturn premake.CurrentGroup\nend\npremake.CurrentGroup = name\nreturn premake.CurrentGroup\n"
	98	"end\nfunction newaction(a)\npremake.action.add(a)\nend\nfunction newoption(opt)\npremake.option.add(opt)\nend\n",
99	99
100	100	/* base/cmdline.lua */
101	101	"newoption \n{\ntrigger = \"cc\",\nvalue = \"VALUE\",\ndescription = \"Choose a C/C++ compiler set\",\nallowed = {\n{ \"gcc\", \"GNU GCC (gcc/g++)\" },\n{ \"ow\", \"OpenWatcom\" },\n}\n}\nnewoption\n{\ntrigger = \"dotnet\",\nvalue = \"VALUE\",\ndescription = \"Choose a .NET compiler set\",\nallowed = {\n{ \"msnet\", \"Microsoft .NET (csc)\" },\n{ \"mono\", \"Novell Mono (mcs)\" },\n{ \"pnet\", \"Portable.NET (cscc)\" },\n}\n}\nnewoption\n{\ntrigger = \"file\",\nvalue = \"FILE\",\ndescription = \"Read FILE as a Premake script; default is 'premake4.lua'\"\n}\nnewoption\n{\ntrigger = \"help\",\ndescription = \"Display this information\"\n}\nnewoption\n{\ntrigger = \"os\",\nvalue = \"VALUE\",\ndescription = \"Generate files for a different operating system\",\nallowed = {\n{ \"bsd\", \"OpenBSD, NetBSD, or FreeBSD\" },\n{ \"linux\", \"Linux\" },\n{ \"macosx\", \"Apple Mac OS X\" },\n{ \"windows\", \"Microsoft Windows\" },\n}\n}\nnewoption\n{"
r244647	r244648
185	185	"$(SILENT) if exist $(subst /,\\\\\\\\,$(OBJDIR)) rmdir /s /q $(subst /,\\\\\\\\,$(OBJDIR))')\n_p('endif')\n_p('')\n_p('prebuild:')\n_p('\\t$(PREBUILDCMDS)')\n_p('')\n_p('prelink:')\n_p('\\t$(PRELINKCMDS)')\n_p('')\ncpp.pchrules(prj)\ncpp.fileRules(prj)\n_p('-include $(OBJECTS:%%.o=%%.d)')\n_p('ifneq (,$(PCH))')\n_p(' -include $(OBJDIR)/$(notdir $(PCH)).d')\n_p('endif')\nend\nfunction premake.gmake_cpp_header(prj, cc, platforms)\n_p('# %s project makefile autogenerated by GENie', premake.action.current().shortname)\n_p('ifndef config')\n_p(' config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))\n_p('endif')\n_p('')\n_p('ifndef verbose')\n_p(' SILENT = @')\n_p('endif')\n_p('')\n_p('SHELLTYPE := msdos')\n_p('ifeq (,$(ComSpec)$(COMSPEC))')\n_p(' SHELLTYPE := posix')\n_p('endif')\n_p('ifeq (/bin,$(findstring /bin,$(SHELL)))')\n_p(' SHELLTYPE := posix')\n_p('endif')\n_p('')\n_p('ifeq (posix,$(SHELLTYPE))')\n_p(' MKDIR = $(SILENT) mkdir -p \"$(1)\"')\n_p(' COPY = $("
186	186	"SILENT) cp -fR \"$(1)\" \"$(2)\"')\n_p('else')\n_p(' MKDIR = $(SILENT) mkdir \"$(subst /,\\\\\\\\,$(1))\" 2> nul \|\| exit 0')\n_p(' COPY = $(SILENT) copy /Y \"$(subst /,\\\\\\\\,$(1))\" \"$(subst /,\\\\\\\\,$(2))\"')\n_p('endif')\n_p('')\n_p('CC = %s', cc.cc)\n_p('CXX = %s', cc.cxx)\n_p('AR = %s', cc.ar)\n_p('')\n_p('ifndef RESCOMP')\n_p(' ifdef WINDRES')\n_p(' RESCOMP = $(WINDRES)')\n_p(' else')\n_p(' RESCOMP = windres')\n_p(' endif')\n_p('endif')\n_p('')\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(config),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\n_p(' OBJDIR = %s', _MAKE.esc(cfg.objectsdir))\n_p(' TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p(' DEFINES +=%s', make.list(cc.getdefines(cfg.defines)))\n_p(' INCLUDES +=%s', make.list(cc.getincludedirs(cfg.includedirs)))\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(cfg, cc)\n_p(' OBJECTS := \\\\')\nfor _, fi"
187	187	"le in ipairs(prj.files) do\nif path.iscppfile(file) then\nlocal excluded = false\nfor _, exclude in ipairs(cfg.excludes) do\nexcluded = (exclude == file)\nif (excluded) then break end\nend\nif excluded == false then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p(' define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platfor"
188		"m = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,premake.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions_cpp)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedir"
189		"s(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(cfg, cc)\n_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p(' LDDEPS +=%s', make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\"))))\n_p(' LIBS += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p(' LINKCMD = libtool -o $(TARGET)')\nelse\nif cc.llvm then\n_p(' LINKCMD = $(AR) rcs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET)')\nend\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\n"
190		"local testname = path.join(abspath, pch)\nif os.isfile(testname) then\npch = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p(' PCH = %s', _MAKE.esc(pch))\n_p(' GCH = $(OBJDIR)/$(notdir $(PCH)).gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH)')\n_p('\\t@echo $(notdir $<)')\nlocal cmd = iif(prj.language == \"C\", \"$(CC) -x c-header $(ALL_CFLAGS)\", \"$(CXX) -x c++-header $(ALL_CXXFLAGS)\")\n_p('\\t$(SILENT) %s -MMD -MP $(DEFINES) $(INCLUDES) -o \"$@\" -MF \"$(@:%%.gch=%%.d)\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj)\nfor _, file in ipairs(prj.files or {}) do\nif path.iscppfile(file) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n)\nif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\n_p('')\nelseif (path.getextension(file) == \".rc\") then\n_p('$(OB"
191		"JDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\nif prj.msgresource then\n_p('\\t@echo ' .. prj.msgresource)\nelse\n_p('\\t@echo $(notdir $<)')\nend\n_p('\\t$(SILENT) $(RESCOMP) $< -O coff -o \"$@\" $(ALL_RESFLAGS)')\n_p('')\nend\nend\nend\nfunction cpp.buildcommand(iscfile, objext)\nlocal flags = iif(iscfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')\n_p('\\t$(SILENT) %s $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.%s=%%.d) -c \"$<\"', flags, objext)\nend\n",
	188	"m = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,premake.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resd"
	189	"efines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(cfg, cc)\n_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p(' LDDEPS +=%s', make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\"))))\n_p(' LIBS += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p(' LINKCMD = libtool -o $(TARGET)')\nelse\nif cc.llvm then\n_p(' LINKCMD = $(AR) rcs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET)')\nend\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = p"
	190	"ath.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath, pch)\nif os.isfile(testname) then\npch = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p(' PCH = %s', _MAKE.esc(pch))\n_p(' GCH = $(OBJDIR)/$(notdir $(PCH)).gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH)')\n_p('\\t@echo $(notdir $<)')\nlocal cmd = iif(prj.language == \"C\", \"$(CC) -x c-header $(ALL_CFLAGS)\", \"$(CXX) -x c++-header $(ALL_CXXFLAGS)\")\n_p('\\t$(SILENT) %s -MMD -MP $(DEFINES) $(INCLUDES) -o \"$@\" -MF \"$(@:%%.gch=%%.d)\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj)\nfor _, file in ipairs(prj.files or {}) do\nif path.iscppfile(file) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n)\nif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\n_p('')\n"
	191	"elseif (path.getextension(file) == \".rc\") then\n_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\nif prj.msgresource then\n_p('\\t@echo ' .. prj.msgresource)\nelse\n_p('\\t@echo $(notdir $<)')\nend\n_p('\\t$(SILENT) $(RESCOMP) $< -O coff -o \"$@\" $(ALL_RESFLAGS)')\n_p('')\nend\nend\nend\nfunction cpp.buildcommand(iscfile, objext)\nlocal flags = iif(iscfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')\n_p('\\t$(SILENT) %s $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.%s=%%.d) -c \"$<\"', flags, objext)\nend\n",
192	192
193	193	/* actions/make/make_csharp.lua */
194	194	"local function getresourcefilename(cfg, fname)\nif path.getextension(fname) == \".resx\" then\n local name = cfg.buildtarget.basename .. \".\"\n local dir = path.getdirectory(fname)\n if dir ~= \".\" then \nname = name .. path.translate(dir, \".\") .. \".\"\nend\nreturn \"$(OBJDIR)/\" .. _MAKE.esc(name .. path.getbasename(fname)) .. \".resources\"\nelse\nreturn fname\nend\nend\nfunction premake.make_csharp(prj)\nlocal csc = premake.dotnet\nlocal cfglibs = { }\nlocal cfgpairs = { }\nlocal anycfg\nfor cfg in premake.eachconfig(prj) do\nanycfg = cfg\ncfglibs[cfg] = premake.getlinks(cfg, \"siblings\", \"fullpath\")\ncfgpairs[cfg] = { }\nfor _, fname in ipairs(cfglibs[cfg]) do\nif path.getdirectory(fname) ~= cfg.buildtarget.directory then\ncfgpairs[cfg][\"$(TARGETDIR)/\" .. _MAKE.esc(path.getname(fname))] = _MAKE.esc(fname)\nend\nend\nend\nlocal sources = {}\nlocal embedded = { }\nlocal copypairs = { }\nfor fcfg in premake.project.eachfile(prj) do\nlocal action = csc.getbuildaction(fcfg)\nif action == \"Co"

trunk/3rdparty/mongoose/docs/API.md
r244647	r244648
1	1	# Mongoose API Reference
2	2
3		struct mg_server mg_create_server(void server_param);
	3	struct mg_server mg_create_server(void server_param, mg_handler_t handler);
4	4
5	5	Creates web server instance. Returns opaque instance pointer, or NULL if
6	6	there is not enough memory. `server_param`: Could be any pointer, or NULL.
r244647	r244648
173	173	Mongoose will call a handler repeatedly after each socket write.
174	174
175	175	<!-- -->
176
	176
177	177	void mg_send_file(struct mg_connection , const char path);
178	178
179	179	Tells Mongoose to serve given file. Mongoose handles file according to
r244647	r244648
187	187	const char *data, size_t data_len);
188	188
189	189	Similar to `mg_write()`, but wraps the data into a websocket frame with a
190		given websocket `opcode`.
	190	given websocket `opcode`.
191	191
192	192	const char mg_get_header(const struct mg_connection , const char *name);
193	193
r244647	r244648
219	219	const char *user,
220	220	const char *password);
221	221
222		Add, edit or delete the entry in the passwords file.
	222	Add, edit or delete the entry in the passwords file.
223	223	This function allows an application to manipulate .htpasswd files on the
224	224	fly by adding, deleting and changing user records. This is one of the
225		several ways of implementing authentication on the server side.
	225	several ways of implementing authentication on the server side.
226	226	If password is not NULL, entry is added (or modified if already exists).
227		If password is NULL, entry is deleted.
	227	If password is NULL, entry is deleted.
228	228	Return: 1 on success, 0 on error.
229	229
230
	230
231	231	int mg_parse_multipart(const char *buf, int buf_len,
232	232	char *var_name, int var_name_len,
233	233	char *file_name, int file_name_len,

trunk/3rdparty/mongoose/docs/LuaSqlite.md
r244647	r244648
1		# Mongoose Lua Server Pages
2
3		Pre-built Windows and Mac mongoose binaries support Lua Server Pages
4		functionality.
5		That means it is possible to write PHP-like scripts with mongoose
6		using Lua programming language instead of PHP. Lua is known
7		for it's speed and small size. Mongoose uses Lua version 5.2.3, the
8		documentation for it can be found at
9		[Lua 5.2 reference manual](http://www.lua.org/manual/5.2/).
10
11		To create a Lua Page, make a file that is called `ANY_NAME.lp`. For example,
12		`my_page.lp`. It is important to have a file
13		name that ends up with `.lp`, cause this is the way mongoose recognises
14		Lua Page file. The contents of the file, just like
15		with PHP, is HTML with embedded Lua code. Lua code must be enclosed within
16		`<? ?>` blocks, and can appear anywhere on the page.
17
18		Mongoose does not send HTTP headers for Lua pages. Therefore,
19		every Lua Page must begin with HTTP status line and headers, like this:
20
21		<? mg.write('HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n') ?>
22		<html><body>
23		<span>Today is:</span> <? mg.write(os.date("%A")) ?>
24		</body></html>
25
26		Note that this example uses function `mg.write()`, which prints data to the
27		web page. Using function `mg.write()` is the way to generate web content from
28		inside Lua code. In addition to `mg.write()`, all standard library functions
29		are accessible from the Lua code (please check reference manual for details).
30		Information about the request is available via the `mg.request_info` object.
31		I contains request method, all headers, etcetera. Please refer to
32		`struct mg_request_info` definition in
33		[mongoose.h](https://github.com/cesanta/mongoose/blob/master/mongoose.h)
34		to see what is available via the `mg.request_info` object.
35		Check out [prime_numbers.lp](https://github.com/cesanta/mongoose/blob/master/examples/lua/prime_numbers.lp) for some example.
36
37		Mongoose exports the following to the Lua Server Page:
38
39		mg.write(str) -- writes string to the client
40		mg.onerror(msg) -- error handler, can be overridden
41		mg.request_info -- a table with request information
42
43		Using Lua scripting it is easy to emulate SSI functionality. For example,
44		to include the content of another file, one can write:
45
46		<? mg.write(io.open('MY_FILE.TXT'):read('*all')) ?>
47
48		To serve a Lua Page, mongoose creates Lua context. That context is used for
49		all Lua blocks within the page. That means, all Lua blocks on the same page
50		share the same context. If one block defines a variable, for example, that
51		variable is visible in all following blocks.

trunk/3rdparty/mongoose/mongoose.c
r244647	r244648
124	124	#include <sys/socket.h>
125	125	#include <sys/select.h>
126	126	#define closesocket(x) close(x)
127		#ifndef __OS2__
128	127	#define __cdecl
129		#else
130		#include <sys/time.h>
131		typedef int socklen_t;
132		#endif
133	128	#define INVALID_SOCKET (-1)
134	129	#define to64(x) strtoll(x, NULL, 10)
135	130	typedef int sock_t;
r244647	r244648
606	601
607	602	// TODO(lsm): use non-blocking resolver
608	603	static int ns_resolve2(const char host, struct in_addr ina) {
	604	#ifdef NS_ENABLE_GETADDRINFO
	605	int rv = 0;
	606	struct addrinfo hints, servinfo, p;
	607	struct sockaddr_in *h = NULL;
	608	char *ip = NS_MALLOC(17);
	609	memset(ip, '\0', 17);
	610
	611	memset(&hints, 0, sizeof hints);
	612	hints.ai_family = AF_INET;
	613	hints.ai_socktype = SOCK_STREAM;
	614
	615	if((rv = getaddrinfo(host, NULL , NULL, &servinfo)) != 0) {
	616	DBG(("getaddrinfo(%s) failed: %s", host, strerror(errno)));
	617	return 0;
	618	}
	619
	620	for(p = servinfo; p != NULL; p = p->ai_next) {
	621	memcpy(&h, &p->ai_addr, sizeof(struct sockaddr_in *));
	622	memcpy(ina, &h->sin_addr, sizeof(ina));
	623	}
	624
	625	freeaddrinfo(servinfo);
	626	return 1;
	627	#else
609	628	struct hostent *he;
610	629	if ((he = gethostbyname(host)) == NULL) {
611	630	DBG(("gethostbyname(%s) failed: %s", host, strerror(errno)));
r244647	r244648
614	633	return 1;
615	634	}
616	635	return 0;
	636	#endif
617	637	}
618	638
619	639	// Resolve FDQN "host", store IP address in the "ip".
r244647	r244648
1559	1579	#define MAP_FAILED NULL
1560	1580	#define MAP_PRIVATE 0
1561	1581	#define PROT_READ 0
1562		#elif defined(__OS2__)
1563		static void mmap(void addr, int64_t len, int prot, int flags, int fd,
1564		int offset) {
1565		void *p;
1566
1567		int pos = lseek( fd, 0, SEEK_CUR ); /* Get a current position */
1568
1569		if (pos == -1)
1570		return NULL;
1571
1572		/* Seek to offset offset */
1573		if (lseek( fd, offset, SEEK_SET) == -1)
1574		return NULL;
1575
1576		p = malloc(len);
1577
1578		/* Read in a file */
1579		if (!p \|\| read(fd, p, len) == -1) {
1580		free(p);
1581		p = NULL;
1582		}
1583
1584		/* Restore the position */
1585		lseek(fd, pos, SEEK_SET);
1586
1587		return p;
1588		}
1589		#define munmap(x, y) free(x)
1590		#define MAP_FAILED NULL
1591		#define MAP_PRIVATE 0
1592		#define PROT_READ 0
1593	1582	#else
1594	1583	#include <sys/mman.h>
1595	1584	#endif
r244647	r244648
3009	2998	copy_len = 4 + data_len;
3010	2999	} else {
3011	3000	// 64-bit length field
3012		copy[1] = 127;
3013	3001	const uint32_t hi = htonl((uint32_t) ((uint64_t) data_len >> 32));
3014	3002	const uint32_t lo = htonl(data_len & 0xffffffff);
	3003	copy[1] = 127;
3015	3004	memcpy(copy+2,&hi,sizeof(hi));
3016	3005	memcpy(copy+6,&lo,sizeof(lo));
3017	3006	memcpy(copy + 10, data, data_len);

trunk/src/emu/video/tms34061.c
r244647	r244648
100	100	save_pointer(NAME(m_vram), m_vramsize);
101	101	save_pointer(NAME(m_latchram), m_vramsize);
102	102	save_item(NAME(m_latchdata));
103		save_pointer(NAME(m_shiftreg), m_vramsize);
104	103	}
105	104
106	105	//-------------------------------------------------

https://github.com/mamedev/mame/commit/9c8566ca30e3f8ec4d9686d6a9ec7a81e98daab7

199869 Revisions