summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-17 11:08:12 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-17 11:08:12 +0100
commitc14b7008256da37f3c1a947276eb47f1a37e7d26 (patch)
tree42aeb6cb4c0a4e067cce837fde9e7dd08c87a716
parent1fa8cffd2705b0f7d4ac96c63e5d3546eb923ad6 (diff)
Sync with latest (nw)
-rw-r--r--3rdparty/bgfx/README.md31
-rw-r--r--3rdparty/bgfx/examples/08-update/fs_update_3d.sc17
-rw-r--r--3rdparty/bgfx/examples/08-update/update.cpp72
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry_osx.mm4
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry_sdl.cpp33
-rw-r--r--3rdparty/bgfx/examples/common/imgui/imgui.cpp174
-rw-r--r--3rdparty/bgfx/examples/common/imgui/imgui.h3
-rw-r--r--3rdparty/bgfx/examples/common/nanovg/nanovg.cpp11
-rw-r--r--3rdparty/bgfx/examples/common/nanovg/nanovg.h3
-rw-r--r--3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp7
-rw-r--r--3rdparty/bgfx/examples/runtime/shaders/dx11/fs_update_3d.binbin0 -> 489 bytes
-rw-r--r--3rdparty/bgfx/examples/runtime/shaders/dx9/fs_update_3d.binbin0 -> 410 bytes
-rw-r--r--3rdparty/bgfx/examples/runtime/shaders/gles/fs_update_3d.binbin0 -> 374 bytes
-rw-r--r--3rdparty/bgfx/examples/runtime/shaders/glsl/fs_update_3d.binbin0 -> 306 bytes
-rw-r--r--3rdparty/bgfx/scripts/bgfx.lua5
-rw-r--r--3rdparty/bgfx/src/renderer_d3d11.cpp46
-rw-r--r--3rdparty/bgfx/src/renderer_d3d9.h2
-rw-r--r--3rdparty/bgfx/src/renderer_gl.cpp121
-rw-r--r--3rdparty/bgfx/src/renderer_gl.h40
-rw-r--r--3rdparty/bx/include/bx/platform.h14
-rw-r--r--3rdparty/bx/tools/bin/darwin/geniebin385392 -> 389488 bytes
-rw-r--r--3rdparty/bx/tools/bin/linux/geniebin372064 -> 372064 bytes
-rw-r--r--3rdparty/bx/tools/bin/windows/genie.exebin354816 -> 355328 bytes
-rw-r--r--3rdparty/genie/README.md2
-rw-r--r--3rdparty/genie/build/gmake.darwin/genie.make374
-rw-r--r--3rdparty/genie/build/gmake.linux/genie.make230
-rw-r--r--3rdparty/genie/build/gmake.windows/genie.make234
-rw-r--r--3rdparty/genie/makefile5
-rw-r--r--3rdparty/genie/src/actions/make/make_cpp.lua23
-rw-r--r--3rdparty/genie/src/actions/vstudio/_vstudio.lua2
-rw-r--r--3rdparty/genie/src/host/scripts.c32
31 files changed, 897 insertions, 588 deletions
diff --git a/3rdparty/bgfx/README.md b/3rdparty/bgfx/README.md
index bdad511f2cb..bd82dbb4e8e 100644
--- a/3rdparty/bgfx/README.md
+++ b/3rdparty/bgfx/README.md
@@ -319,18 +319,27 @@ Building
Steps bellow are for default build system inside bgfx repository. There is
alterative way to build bgfx and examples with [fips](https://github.com/floooh/fips-bgfx/#fips-bgfx).
-### Prerequisites
-
-Windows users download GnuWin32 utilities from:
-[http://gnuwin32.sourceforge.net/packages/make.htm](http://gnuwin32.sourceforge.net/packages/make.htm)
-[http://gnuwin32.sourceforge.net/packages/coreutils.htm](http://gnuwin32.sourceforge.net/packages/coreutils.htm)
-[http://gnuwin32.sourceforge.net/packages/libiconv.htm](http://gnuwin32.sourceforge.net/packages/libiconv.htm)
-[http://gnuwin32.sourceforge.net/packages/libintl.htm](http://gnuwin32.sourceforge.net/packages/libintl.htm)
-
### Getting source
git clone git://github.com/bkaradzic/bx.git
git clone git://github.com/bkaradzic/bgfx.git
+
+### Quick start (Windows with Visual Studio)
+
+Enter bgfx directory:
+
+ cd bgfx
+
+Generate Visual Studio 2013 project files:
+
+ ..\bx\tools\bin\windows\genie vs2013
+
+Open bgfx solution in Visual Studio 2013:
+
+ start .build\projects\vs2013\bgfx.sln
+
+### Generating project files for all targets
+
cd bgfx
make
@@ -361,6 +370,12 @@ Download Native Client SDK from:
### Prerequisites for Windows
+Windows users download GnuWin32 utilities from:
+[http://gnuwin32.sourceforge.net/packages/make.htm](http://gnuwin32.sourceforge.net/packages/make.htm)
+[http://gnuwin32.sourceforge.net/packages/coreutils.htm](http://gnuwin32.sourceforge.net/packages/coreutils.htm)
+[http://gnuwin32.sourceforge.net/packages/libiconv.htm](http://gnuwin32.sourceforge.net/packages/libiconv.htm)
+[http://gnuwin32.sourceforge.net/packages/libintl.htm](http://gnuwin32.sourceforge.net/packages/libintl.htm)
+
When building on Windows, you have to set DXSDK_DIR environment variable to
point to DirectX SDK directory.
diff --git a/3rdparty/bgfx/examples/08-update/fs_update_3d.sc b/3rdparty/bgfx/examples/08-update/fs_update_3d.sc
new file mode 100644
index 00000000000..dad87e9cfdb
--- /dev/null
+++ b/3rdparty/bgfx/examples/08-update/fs_update_3d.sc
@@ -0,0 +1,17 @@
+$input v_texcoord0
+
+/*
+ * Copyright 2011-2015 Branimir Karadzic. All rights reserved.
+ * License: http://www.opensource.org/licenses/BSD-2-Clause
+ */
+
+#include "../common/common.sh"
+
+SAMPLER3D(u_texColor, 0);
+uniform float u_time;
+
+void main()
+{
+ vec3 uvw = vec3(v_texcoord0.xy*0.5+0.5, sin(u_time)*0.5+0.5);
+ gl_FragColor = vec4_splat(texture3D(u_texColor, uvw).x);
+}
diff --git a/3rdparty/bgfx/examples/08-update/update.cpp b/3rdparty/bgfx/examples/08-update/update.cpp
index 0ed14fa3f9d..d87371aeb92 100644
--- a/3rdparty/bgfx/examples/08-update/update.cpp
+++ b/3rdparty/bgfx/examples/08-update/update.cpp
@@ -149,6 +149,31 @@ int _main_(int /*_argc*/, char** /*_argv*/)
loadTexture("texture_compression_ptc24.pvr"),
};
+ const bgfx::Memory* mem8 = bgfx::alloc(32*32*32);
+ const bgfx::Memory* mem16f = bgfx::alloc(32*32*32*2);
+ const bgfx::Memory* mem32f = bgfx::alloc(32*32*32*4);
+ for (uint8_t zz = 0; zz < 32; ++zz)
+ {
+ for (uint8_t yy = 0; yy < 32; ++yy)
+ {
+ for (uint8_t xx = 0; xx < 32; ++xx)
+ {
+ const uint32_t offset = ( (zz*32+yy)*32+xx);
+ const uint32_t val = xx ^ yy ^ zz;
+ mem8->data[offset] = val<<3;
+ *(uint16_t*)&mem16f->data[offset*2] = bx::halfFromFloat( (float)val/32.0f);
+ *(float*)&mem32f->data[offset*4] = (float)val/32.0f;
+ }
+ }
+ }
+
+ bgfx::TextureHandle textures3d[] =
+ {
+ bgfx::createTexture3D(32, 32, 32, 0, bgfx::TextureFormat::R8, BGFX_TEXTURE_U_CLAMP|BGFX_TEXTURE_V_CLAMP|BGFX_TEXTURE_W_CLAMP, mem8),
+ bgfx::createTexture3D(32, 32, 32, 0, bgfx::TextureFormat::R16F, BGFX_TEXTURE_U_CLAMP|BGFX_TEXTURE_V_CLAMP|BGFX_TEXTURE_W_CLAMP, mem16f),
+ bgfx::createTexture3D(32, 32, 32, 0, bgfx::TextureFormat::R32F, BGFX_TEXTURE_U_CLAMP|BGFX_TEXTURE_V_CLAMP|BGFX_TEXTURE_W_CLAMP, mem32f),
+ };
+
// Create static vertex buffer.
bgfx::VertexBufferHandle vbh = bgfx::createVertexBuffer(bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ), PosTexcoordVertex::ms_decl);
@@ -156,12 +181,14 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::IndexBufferHandle ibh = bgfx::createIndexBuffer(bgfx::makeRef(s_cubeIndices, sizeof(s_cubeIndices) ) );
// Create texture sampler uniforms.
- bgfx::UniformHandle u_texCube = bgfx::createUniform("u_texCube", bgfx::UniformType::Uniform1iv);
-
+ bgfx::UniformHandle u_texCube = bgfx::createUniform("u_texCube", bgfx::UniformType::Uniform1iv);
bgfx::UniformHandle u_texColor = bgfx::createUniform("u_texColor", bgfx::UniformType::Uniform1iv);
- bgfx::ProgramHandle program = loadProgram("vs_update", "fs_update");
- bgfx::ProgramHandle programCmp = loadProgram("vs_update", "fs_update_cmp");
+ bgfx::UniformHandle u_time = bgfx::createUniform("u_time", bgfx::UniformType::Uniform1f);
+
+ bgfx::ProgramHandle program = loadProgram("vs_update", "fs_update");
+ bgfx::ProgramHandle programCmp = loadProgram("vs_update", "fs_update_cmp");
+ bgfx::ProgramHandle program3d = loadProgram("vs_update", "fs_update_3d");
const uint32_t textureSide = 2048;
@@ -210,6 +237,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
const int64_t freq = bx::getHPFrequency();
const double toMs = 1000.0/double(freq);
float time = (float)( (now - timeOffset)/double(bx::getHPFrequency() ) );
+ bgfx::setUniform(u_time, &time);
// Use debug font to print information about this example.
bgfx::dbgTextClear();
@@ -345,10 +373,11 @@ int _main_(int /*_argc*/, char** /*_argv*/)
// Submit primitive for rendering to view 1.
bgfx::submit(1);
+ const float xpos = -8.0f - BX_COUNTOF(textures)*0.1f*0.5f;
for (uint32_t ii = 0; ii < BX_COUNTOF(textures); ++ii)
{
- bx::mtxTranslate(mtx, -8.0f - BX_COUNTOF(textures)*0.1f*0.5f + ii*2.1f, 4.0f, 0.0f);
+ bx::mtxTranslate(mtx, xpos + ii*2.1f, 4.0f, 0.0f);
// Set model matrix for rendering.
bgfx::setTransform(mtx);
@@ -370,9 +399,33 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::submit(1);
}
+ for (uint32_t ii = 0; ii < BX_COUNTOF(textures3d); ++ii)
+ {
+ bx::mtxTranslate(mtx, xpos + ii*2.1f, -4.0f, 0.0f);
+
+ // Set model matrix for rendering.
+ bgfx::setTransform(mtx);
+
+ // Set vertex and fragment shaders.
+ bgfx::setProgram(program3d);
+
+ // Set vertex and index buffer.
+ bgfx::setVertexBuffer(vbh);
+ bgfx::setIndexBuffer(ibh, 0, 6);
+
+ // Bind texture.
+ bgfx::setTexture(0, u_texColor, textures3d[ii]);
+
+ // Set render states.
+ bgfx::setState(BGFX_STATE_DEFAULT);
+
+ // Submit primitive for rendering to view 1.
+ bgfx::submit(1);
+ }
+
for (uint32_t ii = 0; ii < 3; ++ii)
{
- bx::mtxTranslate(mtx, -8.0f - BX_COUNTOF(textures)*0.1f*0.5f + 8*2.1f, -4.0f + ii*2.1f, 0.0f);
+ bx::mtxTranslate(mtx, xpos + 8*2.1f, -4.0f + ii*2.1f, 0.0f);
// Set model matrix for rendering.
bgfx::setTransform(mtx);
@@ -412,12 +465,19 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::destroyTexture(textures[ii]);
}
+ for (uint32_t ii = 0; ii < BX_COUNTOF(textures3d); ++ii)
+ {
+ bgfx::destroyTexture(textures3d[ii]);
+ }
+
bgfx::destroyTexture(texture2d);
bgfx::destroyTexture(textureCube);
bgfx::destroyIndexBuffer(ibh);
bgfx::destroyVertexBuffer(vbh);
+ bgfx::destroyProgram(program3d);
bgfx::destroyProgram(programCmp);
bgfx::destroyProgram(program);
+ bgfx::destroyUniform(u_time);
bgfx::destroyUniform(u_texColor);
bgfx::destroyUniform(u_texCube);
diff --git a/3rdparty/bgfx/examples/common/entry/entry_osx.mm b/3rdparty/bgfx/examples/common/entry/entry_osx.mm
index b46fbdb4b9f..14a4930128a 100644
--- a/3rdparty/bgfx/examples/common/entry/entry_osx.mm
+++ b/3rdparty/bgfx/examples/common/entry/entry_osx.mm
@@ -584,10 +584,10 @@ namespace entry
if (!s_ctx.m_fullscreen)
{
- [NSMenu setMenuBarVisible: false];
s_ctx.m_style &= ~NSTitledWindowMask;
dispatch_async(dispatch_get_main_queue()
, ^{
+ [NSMenu setMenuBarVisible: false];
[window setStyleMask: s_ctx.m_style];
[window setFrame:screenRect display:YES];
});
@@ -596,10 +596,10 @@ namespace entry
}
else
{
- [NSMenu setMenuBarVisible: true];
s_ctx.m_style |= NSTitledWindowMask;
dispatch_async(dispatch_get_main_queue()
, ^{
+ [NSMenu setMenuBarVisible: true];
[window setStyleMask: s_ctx.m_style];
[window setFrame:s_ctx.m_windowFrame display:YES];
});
diff --git a/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp b/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
index c279f0fd2a6..b9564339c11 100644
--- a/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
+++ b/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
@@ -211,6 +211,9 @@ namespace entry
: m_width(ENTRY_DEFAULT_WIDTH)
, m_height(ENTRY_DEFAULT_HEIGHT)
, m_aspectRatio(16.0f/9.0f)
+ , m_mx(0)
+ , m_my(0)
+ , m_mz(0)
, m_mouseLock(false)
, m_fullscreen(false)
{
@@ -376,10 +379,13 @@ namespace entry
case SDL_MOUSEMOTION:
{
const SDL_MouseMotionEvent& mev = event.motion;
+ m_mx = mev.x;
+ m_my = mev.y;
+
WindowHandle handle = findHandle(mev.windowID);
if (isValid(handle) )
{
- m_eventQueue.postMouseEvent(handle, mev.x, mev.y, 0);
+ m_eventQueue.postMouseEvent(handle, m_mx, m_my, m_mz);
}
}
break;
@@ -411,6 +417,30 @@ namespace entry
}
break;
+ case SDL_MOUSEWHEEL:
+ {
+ const SDL_MouseWheelEvent& mev = event.wheel;
+ m_mz += mev.y;
+
+ WindowHandle handle = findHandle(mev.windowID);
+ if (isValid(handle) )
+ {
+ m_eventQueue.postMouseEvent(handle, m_mx, m_my, m_mz);
+ }
+ }
+ break;
+
+ case SDL_TEXTINPUT:
+ {
+ const SDL_TextInputEvent& tev = event.text;
+ WindowHandle handle = findHandle(tev.windowID);
+ if (isValid(handle) )
+ {
+ m_eventQueue.postCharEvent(handle, 1, (const uint8_t*)tev.text);
+ }
+ }
+ break;
+
case SDL_KEYDOWN:
{
const SDL_KeyboardEvent& kev = event.key;
@@ -745,6 +775,7 @@ namespace entry
int32_t m_mx;
int32_t m_my;
+ int32_t m_mz;
bool m_mouseLock;
bool m_fullscreen;
};
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
index a2f572022d8..00e0bc675a4 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
@@ -388,6 +388,8 @@ struct Imgui
, m_halfTexel(0.0f)
, m_nvg(NULL)
, m_view(255)
+ , m_surfaceWidth(0)
+ , m_surfaceHeight(0)
, m_viewWidth(0)
, m_viewHeight(0)
, m_currentFontIdx(0)
@@ -810,21 +812,31 @@ struct Imgui
m_char = _inputChar;
}
- void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar, uint8_t _view)
+ void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, uint16_t _surfaceWidth, uint16_t _surfaceHeight, char _inputChar, uint8_t _view)
{
- IMGUI_beginFrame(_mx, _my, _button, _width, _height, _inputChar, _view);
- nvgViewId(m_nvg, _view);
-
m_view = _view;
m_viewWidth = _width;
m_viewHeight = _height;
+ m_surfaceWidth = _surfaceWidth;
+ m_surfaceHeight = _surfaceHeight;
+
+ const float xscale = float(m_surfaceWidth) /float(m_viewWidth);
+ const float yscale = float(m_surfaceHeight)/float(m_viewHeight);
+ const int32_t mx = int32_t(float(_mx)*xscale);
+ const int32_t my = int32_t(float(_my)*yscale);
+
+ IMGUI_beginFrame(mx, my, _button, _width, _height, _inputChar, _view);
+ nvgBeginFrameScaled(m_nvg, m_viewWidth, m_viewHeight, m_surfaceWidth, m_surfaceHeight, 1.0f);
+ nvgViewId(m_nvg, _view);
+
bgfx::setViewName(_view, "IMGUI");
bgfx::setViewSeq(_view, true);
const bgfx::HMD* hmd = bgfx::getHMD();
if (NULL != hmd)
{
- m_viewWidth = _width / 2;
+ m_viewWidth = _width / 2;
+ m_surfaceWidth = _surfaceWidth / 2;
float proj[16];
bx::mtxProj(proj, hmd->eye[0].fov, 0.1f, 100.0f);
@@ -837,22 +849,22 @@ struct Imgui
const float offset1 = -proj[8] + (hmd->eye[1].viewOffset[0] / dist * proj[0]);
float ortho[2][16];
- const float viewOffset = _width/4.0f;
- const float viewWidth = _width/2.0f;
- bx::mtxOrtho(ortho[0], viewOffset, viewOffset + viewWidth, (float)m_viewHeight, 0.0f, 0.0f, 1000.0f, offset0);
- bx::mtxOrtho(ortho[1], viewOffset, viewOffset + viewWidth, (float)m_viewHeight, 0.0f, 0.0f, 1000.0f, offset1);
+ const float viewOffset = _surfaceWidth/4.0f;
+ const float viewWidth = _surfaceWidth/2.0f;
+ bx::mtxOrtho(ortho[0], viewOffset, viewOffset + viewWidth, (float)m_surfaceHeight, 0.0f, 0.0f, 1000.0f, offset0);
+ bx::mtxOrtho(ortho[1], viewOffset, viewOffset + viewWidth, (float)m_surfaceHeight, 0.0f, 0.0f, 1000.0f, offset1);
bgfx::setViewTransform(_view, NULL, ortho[0], BGFX_VIEW_STEREO, ortho[1]);
bgfx::setViewRect(_view, 0, 0, hmd->width, hmd->height);
}
else
{
float ortho[16];
- bx::mtxOrtho(ortho, 0.0f, (float)m_viewWidth, (float)m_viewHeight, 0.0f, 0.0f, 1000.0f);
+ bx::mtxOrtho(ortho, 0.0f, (float)m_surfaceWidth, (float)m_surfaceHeight, 0.0f, 0.0f, 1000.0f);
bgfx::setViewTransform(_view, NULL, ortho);
bgfx::setViewRect(_view, 0, 0, _width, _height);
}
- updateInput(_mx, _my, _button, _scroll, _inputChar);
+ updateInput(mx, my, _button, _scroll, _inputChar);
m_hot = m_hotToBe;
m_hotToBe = 0;
@@ -884,6 +896,7 @@ struct Imgui
clearInput();
+ nvgEndFrame(m_nvg);
IMGUI_endFrame();
}
@@ -937,12 +950,7 @@ struct Imgui
setEnabled(m_areaId);
}
- nvgScissor(m_nvg
- , float(area.m_scissorX)
- , float(area.m_scissorY-1)
- , float(area.m_scissorWidth)
- , float(area.m_scissorHeight+1)
- );
+ nvgScissor(m_nvg, area);
m_insideArea |= area.m_inside;
@@ -1080,12 +1088,7 @@ struct Imgui
}
}
- nvgScissor(m_nvg
- , float(parentArea.m_scissorX)
- , float(parentArea.m_scissorY-1)
- , float(parentArea.m_scissorWidth)
- , float(parentArea.m_scissorHeight+1)
- );
+ nvgScissor(m_nvg, parentArea);
}
bool beginArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, bool _enabled, int32_t _r)
@@ -1159,13 +1162,7 @@ struct Imgui
}
area.m_scissorEnabled = true;
- nvgBeginFrame(m_nvg, m_viewWidth, m_viewHeight, 1.0f);
- nvgScissor(m_nvg
- , float(area.m_scissorX)
- , float(area.m_scissorY-1)
- , float(area.m_scissorWidth)
- , float(area.m_scissorHeight+1)
- );
+ nvgScissor(m_nvg, area);
m_insideArea |= area.m_inside;
return area.m_inside;
@@ -1173,8 +1170,8 @@ struct Imgui
void endArea()
{
+ m_areaId.pop();
nvgResetScissor(m_nvg);
- nvgEndFrame(m_nvg);
}
bool button(const char* _text, bool _enabled, ImguiAlign::Enum _align, uint32_t _rgb0, int32_t _r)
@@ -1203,7 +1200,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
const bool enabled = _enabled && isEnabled(m_areaId);
@@ -1386,7 +1383,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
const bool drawLabel = (NULL != _label && _label[0] != '\0');
@@ -1525,7 +1522,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
uint8_t selected = _selected;
@@ -1745,7 +1742,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
const int32_t height = width/2;
@@ -1798,7 +1795,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
const bool adjustHeight = (_cross && _sameHeight);
@@ -2024,39 +2021,39 @@ struct Imgui
xx = -borderSize;
yy = -1;
width = 2*borderSize+1;
- height = m_viewHeight+1;
+ height = m_surfaceHeight+1;
triX = 0;
- triY = (m_viewHeight-triSize)/2;
+ triY = (m_surfaceHeight-triSize)/2;
orientation = _checked ? TriangleOrientation::Left : TriangleOrientation::Right;
}
else if (ImguiBorder::Right == _border)
{
- xx = m_viewWidth - borderSize;
+ xx = m_surfaceWidth - borderSize;
yy = -1;
width = 2*borderSize+1;
- height = m_viewHeight+1;
- triX = m_viewWidth - triSize - 2;
- triY = (m_viewHeight-width)/2;
+ height = m_surfaceHeight+1;
+ triX = m_surfaceWidth - triSize - 2;
+ triY = (m_surfaceHeight-width)/2;
orientation = _checked ? TriangleOrientation::Right : TriangleOrientation::Left;
}
else if (ImguiBorder::Top == _border)
{
xx = 0;
yy = -borderSize;
- width = m_viewWidth;
+ width = m_surfaceWidth;
height = 2*borderSize;
- triX = (m_viewWidth-triSize)/2;
+ triX = (m_surfaceWidth-triSize)/2;
triY = 0;
orientation = _checked ? TriangleOrientation::Up : TriangleOrientation::Down;
}
else //if (ImguiBorder::Bottom == _border).
{
xx = 0;
- yy = m_viewHeight - borderSize;
- width = m_viewWidth;
+ yy = m_surfaceHeight - borderSize;
+ width = m_surfaceWidth;
height = 2*borderSize;
- triX = (m_viewWidth-triSize)/2;
- triY = m_viewHeight-triSize;
+ triX = (m_surfaceWidth-triSize)/2;
+ triY = m_surfaceHeight-triSize;
orientation = _checked ? TriangleOrientation::Down : TriangleOrientation::Up;
}
@@ -2147,7 +2144,7 @@ struct Imgui
//|| ImguiAlign::CenterIndented == _align).
{
xx = area.m_widgetX;
- width = area.m_widgetW - (area.m_widgetX-area.m_scissorX);
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX);
}
drawRoundedRect( (float)xx, (float)yy, (float)width, (float)height, 4.0f, imguiRGBA(0, 0, 0, 128) );
@@ -2265,19 +2262,40 @@ struct Imgui
area.m_widgetY += _height;
}
- void separatorLine(uint16_t _height)
+ void separatorLine(uint16_t _height, ImguiAlign::Enum _align)
{
Area& area = getCurrentArea();
- const int32_t rectWidth = area.m_widgetW;
- const int32_t rectHeight = 1;
- const int32_t xx = area.m_widgetX;
- const int32_t yy = area.m_widgetY + _height/2 - rectHeight;
+ //const int32_t width = area.m_widgetW;
+ const int32_t height = 1;
+ //const int32_t xx = area.m_widgetX;
+ const int32_t yy = area.m_widgetY + _height/2 - height;
+
+ int32_t xx;
+ int32_t width;
+ if (ImguiAlign::Left == _align)
+ {
+ xx = area.m_contentX + SCROLL_AREA_PADDING;
+ width = area.m_widgetW;
+ }
+ else if (ImguiAlign::LeftIndented == _align
+ || ImguiAlign::Right == _align)
+ {
+ xx = area.m_widgetX;
+ width = area.m_widgetW;
+ }
+ else //if (ImguiAlign::Center == _align
+ //|| ImguiAlign::CenterIndented == _align).
+ {
+ xx = area.m_widgetX;
+ width = area.m_widgetW - (area.m_widgetX-area.m_contentX) + 1;
+ }
+
area.m_widgetY += _height;
drawRect( (float)xx
, (float)yy
- , (float)rectWidth
- , (float)rectHeight
+ , (float)width
+ , (float)height
, imguiRGBA(255, 255, 255, 32)
);
}
@@ -3048,10 +3066,16 @@ struct Imgui
const Area& area = getCurrentArea();
if (area.m_scissorEnabled)
{
- bgfx::setScissor(uint16_t(IMGUI_MAX(0, area.m_scissorX) )
- , uint16_t(IMGUI_MAX(0, area.m_scissorY-1) )
- , area.m_scissorWidth
- , area.m_scissorHeight+1
+ const float xscale = float(m_viewWidth) /float(m_surfaceWidth);
+ const float yscale = float(m_viewHeight)/float(m_surfaceHeight);
+ const int16_t scissorX = int16_t(float(area.m_scissorX)*xscale);
+ const int16_t scissorY = int16_t(float(area.m_scissorY)*yscale);
+ const int16_t scissorWidth = int16_t(float(area.m_scissorWidth)*xscale);
+ const int16_t scissorHeight = int16_t(float(area.m_scissorHeight)*yscale);
+ bgfx::setScissor(uint16_t(IMGUI_MAX(0, scissorX) )
+ , uint16_t(IMGUI_MAX(0, scissorY-1) )
+ , scissorWidth
+ , scissorHeight+1
);
}
else
@@ -3060,6 +3084,23 @@ struct Imgui
}
}
+ inline void nvgScissor(NVGcontext* _ctx, const Area& _area)
+ {
+ if (_area.m_scissorEnabled)
+ {
+ ::nvgScissor(_ctx
+ , float(IMGUI_MAX(0, _area.m_scissorX) )
+ , float(IMGUI_MAX(0, _area.m_scissorY-1) )
+ , float(_area.m_scissorWidth)
+ , float(_area.m_scissorHeight+1)
+ );
+ }
+ else
+ {
+ nvgResetScissor(_ctx);
+ }
+ }
+
template <typename Ty, uint16_t Max=64>
struct IdStack
{
@@ -3149,6 +3190,8 @@ struct Imgui
uint8_t m_view;
uint16_t m_viewWidth;
uint16_t m_viewHeight;
+ uint16_t m_surfaceWidth;
+ uint16_t m_surfaceHeight;
#if !USE_NANOVG_FONT
struct Font
@@ -3203,9 +3246,14 @@ ImguiFontHandle imguiGetCurrentFont()
return handle;
}
+void imguiBeginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, uint16_t _surfaceWidth, uint16_t _surfaceHeight, char _inputChar, uint8_t _view)
+{
+ s_imgui.beginFrame(_mx, _my, _button, _scroll, _width, _height, _surfaceWidth, _surfaceHeight, _inputChar, _view);
+}
+
void imguiBeginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar, uint8_t _view)
{
- s_imgui.beginFrame(_mx, _my, _button, _scroll, _width, _height, _inputChar, _view);
+ s_imgui.beginFrame(_mx, _my, _button, _scroll, _width, _height, _width, _height, _inputChar, _view);
}
void imguiEndFrame()
@@ -3288,9 +3336,9 @@ void imguiSeparator(uint16_t _height)
s_imgui.separator(_height);
}
-void imguiSeparatorLine(uint16_t _height)
+void imguiSeparatorLine(uint16_t _height, ImguiAlign::Enum _align)
{
- s_imgui.separatorLine(_height);
+ s_imgui.separatorLine(_height, _align);
}
int32_t imguiGetWidgetX()
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.h b/3rdparty/bgfx/examples/common/imgui/imgui.h
index ba99291a7f7..0ab69038d3f 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.h
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.h
@@ -137,6 +137,7 @@ ImguiFontHandle imguiCreate(const void* _data = NULL, uint32_t _size = 0, float
void imguiDestroy();
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);
+void imguiBeginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, uint16_t _surfaceWidth, uint16_t _surfaceHeight, char _inputChar = 0, uint8_t _view = 255);
void imguiEndFrame();
void imguiDrawText(int _x, int _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _argb);
@@ -158,7 +159,7 @@ void imguiEndScrollArea(int32_t _r = IMGUI_SCROLL_BAR_R);
void imguiIndent(uint16_t _width = IMGUI_INDENT_VALUE);
void imguiUnindent(uint16_t _width = IMGUI_INDENT_VALUE);
void imguiSeparator(uint16_t _height = IMGUI_SEPARATOR_VALUE);
-void imguiSeparatorLine(uint16_t _height = IMGUI_SEPARATOR_VALUE);
+void imguiSeparatorLine(uint16_t _height = IMGUI_SEPARATOR_VALUE, ImguiAlign::Enum = ImguiAlign::LeftIndented);
int32_t imguiGetWidgetX();
int32_t imguiGetWidgetY();
diff --git a/3rdparty/bgfx/examples/common/nanovg/nanovg.cpp b/3rdparty/bgfx/examples/common/nanovg/nanovg.cpp
index 1cbb58b5794..bb0e6bb3571 100644
--- a/3rdparty/bgfx/examples/common/nanovg/nanovg.cpp
+++ b/3rdparty/bgfx/examples/common/nanovg/nanovg.cpp
@@ -296,7 +296,7 @@ void nvgDeleteInternal(NVGcontext* ctx)
free(ctx);
}
-void nvgBeginFrame(NVGcontext* ctx, int windowWidth, int windowHeight, float devicePixelRatio)
+void nvgBeginFrameScaled(NVGcontext* ctx, int windowWidth, int windowHeight, int surfaceWidth, int surfaceHeight, float devicePixelRatio)
{
/* printf("Tris: draws:%d fill:%d stroke:%d text:%d TOT:%d\n",
ctx->drawCallCount, ctx->fillTriCount, ctx->strokeTriCount, ctx->textTriCount,
@@ -307,8 +307,8 @@ void nvgBeginFrame(NVGcontext* ctx, int windowWidth, int windowHeight, float dev
nvgReset(ctx);
nvg__setDevicePixelRatio(ctx, devicePixelRatio);
-
- ctx->params.renderViewport(ctx->params.userPtr, windowWidth, windowHeight);
+
+ ctx->params.renderViewport(ctx->params.userPtr, windowWidth, windowHeight, surfaceWidth, surfaceHeight);
ctx->drawCallCount = 0;
ctx->fillTriCount = 0;
@@ -316,6 +316,11 @@ void nvgBeginFrame(NVGcontext* ctx, int windowWidth, int windowHeight, float dev
ctx->textTriCount = 0;
}
+void nvgBeginFrame(NVGcontext* ctx, int windowWidth, int windowHeight, float devicePixelRatio)
+{
+ nvgBeginFrameScaled(ctx, windowWidth, windowHeight, windowWidth, windowHeight, devicePixelRatio);
+}
+
void nvgCancelFrame(NVGcontext* ctx)
{
ctx->params.renderCancel(ctx->params.userPtr);
diff --git a/3rdparty/bgfx/examples/common/nanovg/nanovg.h b/3rdparty/bgfx/examples/common/nanovg/nanovg.h
index 8709db210d2..f43f90f4651 100644
--- a/3rdparty/bgfx/examples/common/nanovg/nanovg.h
+++ b/3rdparty/bgfx/examples/common/nanovg/nanovg.h
@@ -116,6 +116,7 @@ enum NVGimageFlags {
// frame buffer size. In that case you would set windowWidth/Height to the window size
// devicePixelRatio to: frameBufferWidth / windowWidth.
void nvgBeginFrame(NVGcontext* ctx, int windowWidth, int windowHeight, float devicePixelRatio);
+void nvgBeginFrameScaled(NVGcontext* ctx, int windowWidth, int windowHeight, int surfaceWidth, int surfaceHeight, float devicePixelRatio);
// Cancels drawing the current frame.
void nvgCancelFrame(NVGcontext* ctx);
@@ -588,7 +589,7 @@ struct NVGparams {
int (*renderDeleteTexture)(void* uptr, int image);
int (*renderUpdateTexture)(void* uptr, int image, int x, int y, int w, int h, const unsigned char* data);
int (*renderGetTextureSize)(void* uptr, int image, int* w, int* h);
- void (*renderViewport)(void* uptr, int width, int height);
+ void (*renderViewport)(void* uptr, int width, int height, int surfaceWidth, int surfaceHeight);
void (*renderCancel)(void* uptr);
void (*renderFlush)(void* uptr);
void (*renderFill)(void* uptr, NVGpaint* paint, NVGscissor* scissor, float fringe, const float* bounds, const NVGpath* paths, int npaths);
diff --git a/3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp b/3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp
index 6be7bbf9052..39402237031 100644
--- a/3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp
+++ b/3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp
@@ -132,6 +132,7 @@ namespace
struct GLNVGtexture* textures;
float view[2];
+ float surface[2];
int ntextures;
int ctextures;
int textureId;
@@ -516,11 +517,13 @@ namespace
gl->th = handle;
}
- static void nvgRenderViewport(void* _userPtr, int width, int height)
+ static void nvgRenderViewport(void* _userPtr, int width, int height, int surfaceWidth, int surfaceHeight)
{
struct GLNVGcontext* gl = (struct GLNVGcontext*)_userPtr;
gl->view[0] = (float)width;
gl->view[1] = (float)height;
+ gl->surface[0] = (float)surfaceWidth;
+ gl->surface[1] = (float)surfaceHeight;
bgfx::setViewRect(gl->viewid, 0, 0, width, height);
}
@@ -720,7 +723,7 @@ namespace
);
}
- bgfx::setUniform(gl->u_viewSize, gl->view);
+ bgfx::setUniform(gl->u_viewSize, gl->surface);
for (uint32_t ii = 0, num = gl->ncalls; ii < num; ++ii)
{
diff --git a/3rdparty/bgfx/examples/runtime/shaders/dx11/fs_update_3d.bin b/3rdparty/bgfx/examples/runtime/shaders/dx11/fs_update_3d.bin
new file mode 100644
index 00000000000..e73f85355ef
--- /dev/null
+++ b/3rdparty/bgfx/examples/runtime/shaders/dx11/fs_update_3d.bin
Binary files differ
diff --git a/3rdparty/bgfx/examples/runtime/shaders/dx9/fs_update_3d.bin b/3rdparty/bgfx/examples/runtime/shaders/dx9/fs_update_3d.bin
new file mode 100644
index 00000000000..08c745a4e7f
--- /dev/null
+++ b/3rdparty/bgfx/examples/runtime/shaders/dx9/fs_update_3d.bin
Binary files differ
diff --git a/3rdparty/bgfx/examples/runtime/shaders/gles/fs_update_3d.bin b/3rdparty/bgfx/examples/runtime/shaders/gles/fs_update_3d.bin
new file mode 100644
index 00000000000..636d67fcb21
--- /dev/null
+++ b/3rdparty/bgfx/examples/runtime/shaders/gles/fs_update_3d.bin
Binary files differ
diff --git a/3rdparty/bgfx/examples/runtime/shaders/glsl/fs_update_3d.bin b/3rdparty/bgfx/examples/runtime/shaders/glsl/fs_update_3d.bin
new file mode 100644
index 00000000000..0dd12aaa48e
--- /dev/null
+++ b/3rdparty/bgfx/examples/runtime/shaders/glsl/fs_update_3d.bin
Binary files differ
diff --git a/3rdparty/bgfx/scripts/bgfx.lua b/3rdparty/bgfx/scripts/bgfx.lua
index 30646cfd1ac..644f9c4e96d 100644
--- a/3rdparty/bgfx/scripts/bgfx.lua
+++ b/3rdparty/bgfx/scripts/bgfx.lua
@@ -25,6 +25,11 @@ function bgfxProject(_name, _kind, _defines)
"-shared",
}
+ configuration { "linux-*" }
+ buildoptions {
+ "-fPIC",
+ }
+
configuration {}
end
diff --git a/3rdparty/bgfx/src/renderer_d3d11.cpp b/3rdparty/bgfx/src/renderer_d3d11.cpp
index b9893331939..93806ea9431 100644
--- a/3rdparty/bgfx/src/renderer_d3d11.cpp
+++ b/3rdparty/bgfx/src/renderer_d3d11.cpp
@@ -201,8 +201,7 @@ namespace bgfx
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // PTC22
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // PTC24
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // Unknown
- { DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // R1
-// { DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_UNKNOWN }, // R1
+ { DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_UNKNOWN }, // R1
{ DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_UNKNOWN }, // R8
{ DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_UNKNOWN }, // R16
{ DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_UNKNOWN }, // R16F
@@ -735,24 +734,31 @@ namespace bgfx
{
D3D11_FEATURE_DATA_FORMAT_SUPPORT data; // D3D11_FEATURE_DATA_FORMAT_SUPPORT2
data.InFormat = s_textureFormat[ii].m_fmt;
- DX_CHECK(m_device->CheckFeatureSupport(D3D11_FEATURE_FORMAT_SUPPORT, &data, sizeof(data) ) );
- support |= 0 != (data.OutFormatSupport & (0
- | D3D11_FORMAT_SUPPORT_TEXTURE2D
- | D3D11_FORMAT_SUPPORT_TEXTURE3D
- | D3D11_FORMAT_SUPPORT_TEXTURECUBE
- ) )
- ? BGFX_CAPS_FORMAT_TEXTURE_COLOR
- : BGFX_CAPS_FORMAT_TEXTURE_NONE
- ;
-
- support |= 0 != (data.OutFormatSupport & (0
- | D3D11_FORMAT_SUPPORT_BUFFER
- | D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER
- | D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER
- ) )
- ? BGFX_CAPS_FORMAT_TEXTURE_VERTEX
- : BGFX_CAPS_FORMAT_TEXTURE_NONE
- ;
+ HRESULT hr = m_device->CheckFeatureSupport(D3D11_FEATURE_FORMAT_SUPPORT, &data, sizeof(data) );
+ if (SUCCEEDED(hr) )
+ {
+ support |= 0 != (data.OutFormatSupport & (0
+ | D3D11_FORMAT_SUPPORT_TEXTURE2D
+ | D3D11_FORMAT_SUPPORT_TEXTURE3D
+ | D3D11_FORMAT_SUPPORT_TEXTURECUBE
+ ) )
+ ? BGFX_CAPS_FORMAT_TEXTURE_COLOR
+ : BGFX_CAPS_FORMAT_TEXTURE_NONE
+ ;
+
+ support |= 0 != (data.OutFormatSupport & (0
+ | D3D11_FORMAT_SUPPORT_BUFFER
+ | D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER
+ | D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER
+ ) )
+ ? BGFX_CAPS_FORMAT_TEXTURE_VERTEX
+ : BGFX_CAPS_FORMAT_TEXTURE_NONE
+ ;
+ }
+ else
+ {
+ BX_TRACE("CheckFeatureSupport failed with %x for format %s.", hr, getName(TextureFormat::Enum(ii) ) );
+ }
}
g_caps.formats[ii] = support;
diff --git a/3rdparty/bgfx/src/renderer_d3d9.h b/3rdparty/bgfx/src/renderer_d3d9.h
index 586a41f81b8..e32a91a18d8 100644
--- a/3rdparty/bgfx/src/renderer_d3d9.h
+++ b/3rdparty/bgfx/src/renderer_d3d9.h
@@ -10,7 +10,7 @@
#if BX_PLATFORM_WINDOWS
# if !BGFX_CONFIG_RENDERER_DIRECT3D9EX
-# define D3D_DISABLE_9EX
+//# define D3D_DISABLE_9EX
# endif // !BGFX_CONFIG_RENDERER_DIRECT3D9EX
# include <d3d9.h>
diff --git a/3rdparty/bgfx/src/renderer_gl.cpp b/3rdparty/bgfx/src/renderer_gl.cpp
index 03503be7d88..ff59a739214 100644
--- a/3rdparty/bgfx/src/renderer_gl.cpp
+++ b/3rdparty/bgfx/src/renderer_gl.cpp
@@ -713,6 +713,16 @@ namespace bgfx
NULL
};
+ static const char* s_uisamplers[] =
+ {
+ "isampler2D",
+ "usampler2D",
+ "isampler3D",
+ "usampler3D",
+ "isamplerCube",
+ "usamplerCube",
+ };
+
static void GL_APIENTRY stubVertexAttribDivisor(GLuint /*_index*/, GLuint /*_divisor*/)
{
}
@@ -2603,25 +2613,35 @@ namespace bgfx
GLSL_TYPE(GL_FLOAT_MAT2);
GLSL_TYPE(GL_FLOAT_MAT3);
GLSL_TYPE(GL_FLOAT_MAT4);
-// GLSL_TYPE(GL_FLOAT_MAT2x3);
-// GLSL_TYPE(GL_FLOAT_MAT2x4);
-// GLSL_TYPE(GL_FLOAT_MAT3x2);
-// GLSL_TYPE(GL_FLOAT_MAT3x4);
-// GLSL_TYPE(GL_FLOAT_MAT4x2);
-// GLSL_TYPE(GL_FLOAT_MAT4x3);
-// GLSL_TYPE(GL_SAMPLER_1D);
- GLSL_TYPE(GL_SAMPLER_2D);
+
+ GLSL_TYPE(GL_SAMPLER_2D);
+ GLSL_TYPE(GL_INT_SAMPLER_2D);
+ GLSL_TYPE(GL_UNSIGNED_INT_SAMPLER_2D);
+
GLSL_TYPE(GL_SAMPLER_3D);
+ GLSL_TYPE(GL_INT_SAMPLER_3D);
+ GLSL_TYPE(GL_UNSIGNED_INT_SAMPLER_3D);
+
GLSL_TYPE(GL_SAMPLER_CUBE);
-// GLSL_TYPE(GL_SAMPLER_1D_SHADOW);
+ GLSL_TYPE(GL_INT_SAMPLER_CUBE);
+ GLSL_TYPE(GL_UNSIGNED_INT_SAMPLER_CUBE);
+
GLSL_TYPE(GL_SAMPLER_2D_SHADOW);
+
GLSL_TYPE(GL_IMAGE_1D);
- GLSL_TYPE(GL_IMAGE_2D);
- GLSL_TYPE(GL_IMAGE_3D);
- GLSL_TYPE(GL_IMAGE_CUBE);
+ GLSL_TYPE(GL_INT_IMAGE_1D);
GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_1D);
+
+ GLSL_TYPE(GL_IMAGE_2D);
+ GLSL_TYPE(GL_INT_IMAGE_2D);
GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_2D);
+
+ GLSL_TYPE(GL_IMAGE_3D);
+ GLSL_TYPE(GL_INT_IMAGE_3D);
GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_3D);
+
+ GLSL_TYPE(GL_IMAGE_CUBE);
+ GLSL_TYPE(GL_INT_IMAGE_CUBE);
GLSL_TYPE(GL_UNSIGNED_INT_IMAGE_CUBE);
}
@@ -2687,27 +2707,34 @@ namespace bgfx
case GL_FLOAT_MAT4:
return UniformType::Uniform4x4fv;
-// case GL_FLOAT_MAT2x3:
-// case GL_FLOAT_MAT2x4:
-// case GL_FLOAT_MAT3x2:
-// case GL_FLOAT_MAT3x4:
-// case GL_FLOAT_MAT4x2:
-// case GL_FLOAT_MAT4x3:
-// break;
-
-// case GL_SAMPLER_1D:
case GL_SAMPLER_2D:
+ case GL_INT_SAMPLER_2D:
+ case GL_UNSIGNED_INT_SAMPLER_2D:
+
case GL_SAMPLER_3D:
+ case GL_INT_SAMPLER_3D:
+ case GL_UNSIGNED_INT_SAMPLER_3D:
+
case GL_SAMPLER_CUBE:
-// case GL_SAMPLER_1D_SHADOW:
- case GL_SAMPLER_2D_SHADOW:
+ case GL_INT_SAMPLER_CUBE:
+ case GL_UNSIGNED_INT_SAMPLER_CUBE:
+
+ case GL_SAMPLER_2D_SHADOW:
+
case GL_IMAGE_1D:
- case GL_IMAGE_2D:
- case GL_IMAGE_3D:
- case GL_IMAGE_CUBE:
+ case GL_INT_IMAGE_1D:
case GL_UNSIGNED_INT_IMAGE_1D:
+
+ case GL_IMAGE_2D:
+ case GL_INT_IMAGE_2D:
case GL_UNSIGNED_INT_IMAGE_2D:
+
+ case GL_IMAGE_3D:
+ case GL_INT_IMAGE_3D:
case GL_UNSIGNED_INT_IMAGE_3D:
+
+ case GL_IMAGE_CUBE:
+ case GL_INT_IMAGE_CUBE:
case GL_UNSIGNED_INT_IMAGE_CUBE:
return UniformType::Uniform1iv;
};
@@ -2899,16 +2926,33 @@ namespace bgfx
switch (gltype)
{
case GL_SAMPLER_2D:
+ case GL_INT_SAMPLER_2D:
+ case GL_UNSIGNED_INT_SAMPLER_2D:
+
case GL_SAMPLER_3D:
+ case GL_INT_SAMPLER_3D:
+ case GL_UNSIGNED_INT_SAMPLER_3D:
+
case GL_SAMPLER_CUBE:
+ case GL_INT_SAMPLER_CUBE:
+ case GL_UNSIGNED_INT_SAMPLER_CUBE:
+
case GL_SAMPLER_2D_SHADOW:
+
case GL_IMAGE_1D:
- case GL_IMAGE_2D:
- case GL_IMAGE_3D:
- case GL_IMAGE_CUBE:
+ case GL_INT_IMAGE_1D:
case GL_UNSIGNED_INT_IMAGE_1D:
+
+ case GL_IMAGE_2D:
+ case GL_INT_IMAGE_2D:
case GL_UNSIGNED_INT_IMAGE_2D:
+
+ case GL_IMAGE_3D:
+ case GL_INT_IMAGE_3D:
case GL_UNSIGNED_INT_IMAGE_3D:
+
+ case GL_IMAGE_CUBE:
+ case GL_INT_IMAGE_CUBE:
case GL_UNSIGNED_INT_IMAGE_CUBE:
BX_TRACE("Sampler #%d at location %d.", m_numSamplers, loc);
m_sampler[m_numSamplers] = loc;
@@ -3285,13 +3329,14 @@ namespace bgfx
blockHeight = blockInfo.blockHeight;
}
- BX_TRACE("Texture %3d: %s (requested: %s), %dx%d%s%s."
+ BX_TRACE("Texture%-4s %3d: %s (requested: %s), %dx%dx%d%s."
+ , imageContainer.m_cubeMap ? "Cube" : (1 < imageContainer.m_depth ? "3D" : "2D")
, this - s_renderGL->m_textures
, getName( (TextureFormat::Enum)m_textureFormat)
, getName( (TextureFormat::Enum)m_requestedFormat)
, textureWidth
, textureHeight
- , imageContainer.m_cubeMap ? "x6" : ""
+ , imageContainer.m_cubeMap ? 6 : (1 < imageContainer.m_depth ? imageContainer.m_depth : 0)
, 0 != (m_flags&BGFX_TEXTURE_RT_MASK) ? " (render target)" : ""
);
@@ -3871,14 +3916,22 @@ namespace bgfx
else if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL)
&& BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL <= 21) )
{
- bool usesTextureLod = s_extension[Extension::ARB_shader_texture_lod].m_supported
+ bool usesTextureLod = true
+ && s_extension[Extension::ARB_shader_texture_lod].m_supported
&& bx::findIdentifierMatch(code, s_ARB_shader_texture_lod)
;
- if (usesTextureLod)
+ bool usesIUsamplers = bx::findIdentifierMatch(code, s_uisamplers);
+
+ uint32_t version = usesIUsamplers ? 130 : (usesTextureLod ? 120 : 0);
+
+ if (0 != version)
{
- writeString(&writer, "#version 120\n");
+ writeStringf(&writer, "#version %d\n", version);
+ }
+ if (usesTextureLod)
+ {
if (m_type == GL_FRAGMENT_SHADER)
{
writeString(&writer, "#extension GL_ARB_shader_texture_lod : enable\n");
diff --git a/3rdparty/bgfx/src/renderer_gl.h b/3rdparty/bgfx/src/renderer_gl.h
index b65a8499670..9160fbfe44f 100644
--- a/3rdparty/bgfx/src/renderer_gl.h
+++ b/3rdparty/bgfx/src/renderer_gl.h
@@ -424,6 +424,30 @@ typedef uint64_t GLuint64;
# define GL_COMPARE_REF_TO_TEXTURE 0x884E
#endif // GL_COMPARE_REF_TO_TEXTURE
+#ifndef GL_INT_SAMPLER_2D
+# define GL_INT_SAMPLER_2D 0x8DCA
+#endif // GL_INT_SAMPLER_2D
+
+#ifndef GL_UNSIGNED_INT_SAMPLER_2D
+# define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
+#endif // GL_UNSIGNED_INT_SAMPLER_2D
+
+#ifndef GL_INT_SAMPLER_3D
+# define GL_INT_SAMPLER_3D 0x8DCB
+#endif // GL_INT_SAMPLER_3D
+
+#ifndef GL_UNSIGNED_INT_SAMPLER_3D
+# define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
+#endif // GL_UNSIGNED_INT_SAMPLER_3D
+
+#ifndef GL_INT_SAMPLER_CUBE
+# define GL_INT_SAMPLER_CUBE 0x8DCC
+#endif // GL_INT_SAMPLER_CUBEER_3D
+
+#ifndef GL_UNSIGNED_INT_SAMPLER_CUBE
+# define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
+#endif // GL_UNSIGNED_INT_SAMPLER_CUBE
+
#ifndef GL_SAMPLER_2D_SHADOW
# define GL_SAMPLER_2D_SHADOW 0x8B62
#endif // GL_SAMPLER_2D_SHADOW
@@ -484,6 +508,22 @@ typedef uint64_t GLuint64;
# define GL_IMAGE_CUBE 0x9050
#endif // GL_IMAGE_CUBE
+#ifndef GL_INT_IMAGE_1D
+# define GL_INT_IMAGE_1D 0x9057
+#endif // GL_INT_IMAGE_1D
+
+#ifndef GL_INT_IMAGE_2D
+# define GL_INT_IMAGE_2D 0x9058
+#endif // GL_INT_IMAGE_2D
+
+#ifndef GL_INT_IMAGE_3D
+# define GL_INT_IMAGE_3D 0x9059
+#endif // GL_INT_IMAGE_3D
+
+#ifndef GL_INT_IMAGE_CUBE
+# define GL_INT_IMAGE_CUBE 0x905B
+#endif // GL_INT_IMAGE_CUBE
+
#ifndef GL_UNSIGNED_INT_IMAGE_1D
# define GL_UNSIGNED_INT_IMAGE_1D 0x9062
#endif // GL_UNSIGNED_INT_IMAGE_1D
diff --git a/3rdparty/bx/include/bx/platform.h b/3rdparty/bx/include/bx/platform.h
index 373c991769a..c3eda5f4123 100644
--- a/3rdparty/bx/include/bx/platform.h
+++ b/3rdparty/bx/include/bx/platform.h
@@ -19,11 +19,13 @@
#define BX_PLATFORM_LINUX 0
#define BX_PLATFORM_NACL 0
#define BX_PLATFORM_OSX 0
+#define BX_PLATFORM_PS4 0
#define BX_PLATFORM_QNX 0
#define BX_PLATFORM_RPI 0
#define BX_PLATFORM_WINDOWS 0
#define BX_PLATFORM_WINRT 0
#define BX_PLATFORM_XBOX360 0
+#define BX_PLATFORM_XBOXONE 0
#define BX_CPU_ARM 0
#define BX_CPU_JIT 0
@@ -120,6 +122,9 @@
#if defined(_XBOX_VER)
# undef BX_PLATFORM_XBOX360
# define BX_PLATFORM_XBOX360 1
+#elif defined (_DURANGO)
+# undef BX_PLATFORM_XBOXONE
+# define BX_PLATFORM_XBOXONE 1
#elif defined(_WIN32) || defined(_WIN64)
// http://msdn.microsoft.com/en-us/library/6sehtctf.aspx
# ifndef NOMINMAX
@@ -173,6 +178,9 @@
#elif defined(EMSCRIPTEN)
# undef BX_PLATFORM_EMSCRIPTEN
# define BX_PLATFORM_EMSCRIPTEN 1
+#elif defined(__ORBIS__)
+# undef BX_PLATFORM_PS4
+# define BX_PLATFORM_PS4 1
#elif defined(__QNX__)
# undef BX_PLATFORM_QNX
# define BX_PLATFORM_QNX 1
@@ -242,6 +250,8 @@
BX_STRINGIZE(BX_PLATFORM_NACL)
#elif BX_PLATFORM_OSX
# define BX_PLATFORM_NAME "OSX"
+#elif BX_PLATFORM_PS4
+# define BX_PLATFORM_NAME "PlayStation 4"
#elif BX_PLATFORM_QNX
# define BX_PLATFORM_NAME "QNX"
#elif BX_PLATFORM_RPI
@@ -250,6 +260,10 @@
# define BX_PLATFORM_NAME "Windows"
#elif BX_PLATFORM_WINRT
# define BX_PLATFORM_NAME "WinRT"
+#elif BX_PLATFORM_XBOX360
+# define BX_PLATFORM_NAME "Xbox 360"
+#elif BX_PLATFORM_XBOXONE
+# define BX_PLATFORM_NAME "Xbox One"
#endif // BX_PLATFORM_
#if BX_CPU_ARM
diff --git a/3rdparty/bx/tools/bin/darwin/genie b/3rdparty/bx/tools/bin/darwin/genie
index 461635ee772..f9778fdef49 100644
--- a/3rdparty/bx/tools/bin/darwin/genie
+++ b/3rdparty/bx/tools/bin/darwin/genie
Binary files differ
diff --git a/3rdparty/bx/tools/bin/linux/genie b/3rdparty/bx/tools/bin/linux/genie
index de23a2d3a51..2c997da3db5 100644
--- a/3rdparty/bx/tools/bin/linux/genie
+++ b/3rdparty/bx/tools/bin/linux/genie
Binary files differ
diff --git a/3rdparty/bx/tools/bin/windows/genie.exe b/3rdparty/bx/tools/bin/windows/genie.exe
index e2392ff839f..bec1f682f61 100644
--- a/3rdparty/bx/tools/bin/windows/genie.exe
+++ b/3rdparty/bx/tools/bin/windows/genie.exe
Binary files differ
diff --git a/3rdparty/genie/README.md b/3rdparty/genie/README.md
index 4abe8049d68..c4df9cf633a 100644
--- a/3rdparty/genie/README.md
+++ b/3rdparty/genie/README.md
@@ -14,7 +14,7 @@ Supported project generators:
Download (stable)
-----------------
- version 215 (commit 76a21acb8d4c45fbcfd0e2e68feb912934094201)
+ version 219 (commit dfb6f5911fb55526a1dc9c7ae1139b2adbaff69a)
Linux:
https://github.com/bkaradzic/bx/raw/master/tools/bin/linux/genie
diff --git a/3rdparty/genie/build/gmake.darwin/genie.make b/3rdparty/genie/build/gmake.darwin/genie.make
index fb575d44efd..e21a886a482 100644
--- a/3rdparty/genie/build/gmake.darwin/genie.make
+++ b/3rdparty/genie/build/gmake.darwin/genie.make
@@ -3,8 +3,6 @@ ifndef config
config=release
endif
-override undefine TARGET
-
ifndef verbose
SILENT = @
endif
@@ -53,56 +51,56 @@ ifeq ($(config),release)
LIBS += $(LDDEPS) -framework CoreServices
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -129,56 +127,56 @@ ifeq ($(config),debug)
LIBS += $(LDDEPS) -framework CoreServices
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -205,56 +203,56 @@ ifeq ($(config),releaseuniv32)
LIBS += $(LDDEPS) -framework CoreServices
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -281,56 +279,56 @@ ifeq ($(config),debuguniv32)
LIBS += $(LDDEPS) -framework CoreServices
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -343,8 +341,8 @@ endif
OBJDIRS := \
$(OBJDIR) \
- $(OBJDIR)/src/host \
$(OBJDIR)/src/host/lua-5.2.3/src \
+ $(OBJDIR)/src/host \
RESOURCES := \
@@ -365,8 +363,8 @@ $(TARGETDIR):
$(OBJDIRS):
@echo Creating $(OBJDIR)
-$(call MKDIR,$(OBJDIR))
- -$(call MKDIR,$(OBJDIR)/src/host)
-$(call MKDIR,$(OBJDIR)/src/host/lua-5.2.3/src)
+ -$(call MKDIR,$(OBJDIR)/src/host)
clean:
@echo Cleaning genie
@@ -390,7 +388,7 @@ $(GCH): $(PCH)
$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
endif
-$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
+$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -398,51 +396,51 @@ $(OBJDIR)/src/host/os_stat.o: ../../src/host/os_stat.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
+$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
+$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
+$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
+$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
+$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
+$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
+$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
+$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
+$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
+$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
+$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
+$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -454,19 +452,19 @@ $(OBJDIR)/src/host/os_isdir.o: ../../src/host/os_isdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
+$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
+$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
+$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -474,15 +472,15 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lvm.o: ../../src/host/lua-5.2.3/src/lvm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
+$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -490,27 +488,27 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o: ../../src/host/lua-5.2.3/src/lcode.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -518,75 +516,75 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o: ../../src/host/lua-5.2.3/src/lfunc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
+$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
diff --git a/3rdparty/genie/build/gmake.linux/genie.make b/3rdparty/genie/build/gmake.linux/genie.make
index 7dbdb0534c3..56611f15140 100644
--- a/3rdparty/genie/build/gmake.linux/genie.make
+++ b/3rdparty/genie/build/gmake.linux/genie.make
@@ -3,8 +3,6 @@ ifndef config
config=release
endif
-override undefine TARGET
-
ifndef verbose
SILENT = @
endif
@@ -53,56 +51,56 @@ ifeq ($(config),release)
LIBS += $(LDDEPS) -ldl -lm
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -129,56 +127,56 @@ ifeq ($(config),debug)
LIBS += $(LDDEPS) -ldl -lm
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -238,7 +236,7 @@ $(GCH): $(PCH)
$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
endif
-$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
+$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -246,51 +244,51 @@ $(OBJDIR)/src/host/os_stat.o: ../../src/host/os_stat.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
+$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
+$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
+$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
+$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
+$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
+$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
+$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
+$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
+$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
+$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
+$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
+$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -302,19 +300,19 @@ $(OBJDIR)/src/host/os_isdir.o: ../../src/host/os_isdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
+$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
+$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
+$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -322,15 +320,15 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lvm.o: ../../src/host/lua-5.2.3/src/lvm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
+$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -338,27 +336,27 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o: ../../src/host/lua-5.2.3/src/lcode.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -366,75 +364,75 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o: ../../src/host/lua-5.2.3/src/lfunc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
+$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
diff --git a/3rdparty/genie/build/gmake.windows/genie.make b/3rdparty/genie/build/gmake.windows/genie.make
index 3b63871b978..bf5f8b0dff0 100644
--- a/3rdparty/genie/build/gmake.windows/genie.make
+++ b/3rdparty/genie/build/gmake.windows/genie.make
@@ -3,8 +3,6 @@ ifndef config
config=release
endif
-override undefine TARGET
-
ifndef verbose
SILENT = @
endif
@@ -53,56 +51,56 @@ ifeq ($(config),release)
LIBS += $(LDDEPS) -lole32
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -129,56 +127,56 @@ ifeq ($(config),debug)
LIBS += $(LDDEPS) -lole32
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
OBJECTS := \
- $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_getcwd.o \
$(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/string_hash.o \
$(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
+ $(OBJDIR)/src/host/premake_main.o \
+ $(OBJDIR)/src/host/os_uuid.o \
+ $(OBJDIR)/src/host/os_isfile.o \
+ $(OBJDIR)/src/host/os_copyfile.o \
$(OBJDIR)/src/host/scripts.o \
$(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_mkdir.o \
$(OBJDIR)/src/host/os_getversion.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/string_hash.o \
+ $(OBJDIR)/src/host/os_pathsearch.o \
+ $(OBJDIR)/src/host/os_rmdir.o \
+ $(OBJDIR)/src/host/os_match.o \
$(OBJDIR)/src/host/premake.o \
$(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/os_mkdir.o \
+ $(OBJDIR)/src/host/path_isabsolute.o \
+ $(OBJDIR)/src/host/os_is64bit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldump.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/liolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lgc.o \
$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/linit.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltm.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lapi.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lctype.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lstate.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/llex.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/ldo.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lundump.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/loslib.o \
+ $(OBJDIR)/src/host/lua-5.2.3/src/lobject.o \
$(OBJDIR)/src/host/lua-5.2.3/src/ldebug.o \
define PREBUILDCMDS
@@ -191,8 +189,8 @@ endif
OBJDIRS := \
$(OBJDIR) \
- $(OBJDIR)/src/host/lua-5.2.3/src \
$(OBJDIR)/src/host \
+ $(OBJDIR)/src/host/lua-5.2.3/src \
RESOURCES := \
@@ -213,8 +211,8 @@ $(TARGETDIR):
$(OBJDIRS):
@echo Creating $(OBJDIR)
-$(call MKDIR,$(OBJDIR))
- -$(call MKDIR,$(OBJDIR)/src/host/lua-5.2.3/src)
-$(call MKDIR,$(OBJDIR)/src/host)
+ -$(call MKDIR,$(OBJDIR)/src/host/lua-5.2.3/src)
clean:
@echo Cleaning genie
@@ -238,7 +236,7 @@ $(GCH): $(PCH)
$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
endif
-$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
+$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -246,51 +244,51 @@ $(OBJDIR)/src/host/os_stat.o: ../../src/host/os_stat.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
+$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
+$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
+$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
+$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
+$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
+$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
+$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
+$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
+$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getversion.o: ../../src/host/os_getversion.c
+$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
+$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
+$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -302,19 +300,19 @@ $(OBJDIR)/src/host/os_isdir.o: ../../src/host/os_isdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
+$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
+$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
+$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -322,15 +320,15 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lvm.o: ../../src/host/lua-5.2.3/src/lvm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
+$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -338,27 +336,27 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lcode.o: ../../src/host/lua-5.2.3/src/lcode.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/liolib.o: ../../src/host/lua-5.2.3/src/liolib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltable.o: ../../src/host/lua-5.2.3/src/ltable.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loadlib.o: ../../src/host/lua-5.2.3/src/loadlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
@@ -366,75 +364,75 @@ $(OBJDIR)/src/host/lua-5.2.3/src/lfunc.o: ../../src/host/lua-5.2.3/src/lfunc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldump.o: ../../src/host/lua-5.2.3/src/ldump.c
+$(OBJDIR)/src/host/lua-5.2.3/src/linit.o: ../../src/host/lua-5.2.3/src/linit.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstrlib.o: ../../src/host/lua-5.2.3/src/lstrlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmathlib.o: ../../src/host/lua-5.2.3/src/lmathlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lstate.o: ../../src/host/lua-5.2.3/src/lstate.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lparser.o: ../../src/host/lua-5.2.3/src/lparser.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lbaselib.o: ../../src/host/lua-5.2.3/src/lbaselib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lapi.o: ../../src/host/lua-5.2.3/src/lapi.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ltablib.o: ../../src/host/lua-5.2.3/src/ltablib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ldblib.o: ../../src/host/lua-5.2.3/src/ldblib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lauxlib.o: ../../src/host/lua-5.2.3/src/lauxlib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lbitlib.o: ../../src/host/lua-5.2.3/src/lbitlib.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lcorolib.o: ../../src/host/lua-5.2.3/src/lcorolib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lgc.o: ../../src/host/lua-5.2.3/src/lgc.c
+$(OBJDIR)/src/host/lua-5.2.3/src/llex.o: ../../src/host/lua-5.2.3/src/llex.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/ltm.o: ../../src/host/lua-5.2.3/src/ltm.c
+$(OBJDIR)/src/host/lua-5.2.3/src/ldo.o: ../../src/host/lua-5.2.3/src/ldo.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lzio.o: ../../src/host/lua-5.2.3/src/lzio.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lundump.o: ../../src/host/lua-5.2.3/src/lundump.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lmem.o: ../../src/host/lua-5.2.3/src/lmem.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lopcodes.o: ../../src/host/lua-5.2.3/src/lopcodes.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lctype.o: ../../src/host/lua-5.2.3/src/lctype.c
+$(OBJDIR)/src/host/lua-5.2.3/src/loslib.o: ../../src/host/lua-5.2.3/src/loslib.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-$(OBJDIR)/src/host/lua-5.2.3/src/lstring.o: ../../src/host/lua-5.2.3/src/lstring.c
+$(OBJDIR)/src/host/lua-5.2.3/src/lobject.o: ../../src/host/lua-5.2.3/src/lobject.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
diff --git a/3rdparty/genie/makefile b/3rdparty/genie/makefile
index 8908d3fa3fc..e1219351156 100644
--- a/3rdparty/genie/makefile
+++ b/3rdparty/genie/makefile
@@ -45,3 +45,8 @@ release-linux: $(GENIE)
$(SILENT) git checkout src/host/version.h
release: release-$(OS)
+
+dist: release
+ cp bin/linux/genie ../bx/tools/bin/linux/
+ cp bin/windows/genie.exe ../bx/tools/bin/windows/
+ cp bin/darwin/genie ../bx/tools/bin/darwin/
diff --git a/3rdparty/genie/src/actions/make/make_cpp.lua b/3rdparty/genie/src/actions/make/make_cpp.lua
index 4492ac2bbd2..869727c236d 100644
--- a/3rdparty/genie/src/actions/make/make_cpp.lua
+++ b/3rdparty/genie/src/actions/make/make_cpp.lua
@@ -90,7 +90,8 @@
_p('\t$(SILENT) $(LINKCMD) $(OBJECTS)')
else
_p('\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))')
- end
+ _p('\t$(SILENT) $(LINKCMD_NDX)')
+ end
else
if prj.msglinking then
_p('\t@echo ' .. prj.msglinking)
@@ -238,7 +239,7 @@
cpp.flags(cfg, cc)
-- write out libraries, linker flags, and the link command
- cpp.linker(cfg, cc)
+ cpp.linker(prj, cfg, cc)
-- add objects for compilation, and remove any that are excluded per config.
_p(' OBJECTS := \\')
@@ -340,7 +341,7 @@
-- and the linker command.
--
- function cpp.linker(cfg, cc)
+ function cpp.linker(prj, cfg, cc)
-- Patch #3401184 changed the order
_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))
@@ -351,10 +352,20 @@
if cfg.platform:startswith("Universal") then
_p(' LINKCMD = libtool -o $(TARGET)')
else
- if cc.llvm then
- _p(' LINKCMD = $(AR) rcs $(TARGET)')
+ if (not prj.options.ArchiveSplit) then
+ if cc.llvm then
+ _p(' LINKCMD = $(AR) rcs $(TARGET)')
+ else
+ _p(' LINKCMD = $(AR) -rcs $(TARGET)')
+ end
else
- _p(' LINKCMD = $(AR) -rcs $(TARGET)')
+ if cc.llvm then
+ _p(' LINKCMD = $(AR) qc $(TARGET)')
+ _p(' LINKCMD_NDX= $(AR) cs $(TARGET)')
+ else
+ _p(' LINKCMD = $(AR) -qc $(TARGET)')
+ _p(' LINKCMD_NDX= $(AR) -cs $(TARGET)')
+ end
end
end
else
diff --git a/3rdparty/genie/src/actions/vstudio/_vstudio.lua b/3rdparty/genie/src/actions/vstudio/_vstudio.lua
index ab82613c3d9..22fdb9f99f8 100644
--- a/3rdparty/genie/src/actions/vstudio/_vstudio.lua
+++ b/3rdparty/genie/src/actions/vstudio/_vstudio.lua
@@ -11,7 +11,7 @@
--
local toolsets = {
- vs2010 = "v90",
+ vs2010 = "v100",
vs2012 = "v110",
vs2013 = "v120",
vs2015 = "v140"
diff --git a/3rdparty/genie/src/host/scripts.c b/3rdparty/genie/src/host/scripts.c
index bc7542d5c03..562e5264b4b 100644
--- a/3rdparty/genie/src/host/scripts.c
+++ b/3rdparty/genie/src/host/scripts.c
@@ -180,16 +180,16 @@ const char* builtin_scripts[] = {
/* actions/make/make_cpp.lua */
"premake.make.cpp = { }\npremake.make.override = { }\nlocal cpp = premake.make.cpp\nlocal make = premake.make\nfunction premake.make_cpp(prj)\nlocal cc = premake.gettool(prj)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\npremake.gmake_cpp_header(prj, cc, platforms)\nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\nlocal objdirs = {}\nfor _, file in ipairs(prj.files) do\nif path.iscppfile(file) then\nobjdirs[_MAKE.esc(path.getdirectory(path.trimdots(file)))] = 1\nend\nend\n_p('OBJDIRS := \\\\')\n_p('\\t$(OBJDIR) \\\\')\nfor dir, _ in pairs(objdirs) do\n_p('\\t$(OBJDIR)/%s \\\\', dir)\nend\n_p('')\n_p('RESOURCES := \\\\')\nfor _, file in ipairs(prj.files) do\nif path.isresourcefile(file) then\n_p('\\t$(OBJDIR)/%s.res \\\\', _MAKE.esc(path.getbasename(file)))\nend\nend\n_p('')\n_p('.PHONY: clean prebuild prelink')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('al"
- "l: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist')\nelse\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET)')\nend\n_p('\\t@:')\n_p('')\nif (prj.kind == \"StaticLib\" and prj.options.ArchiveSplit) then\n_p('define max_args')\n_p('\\t$(eval _args:=)')\n_p('\\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))')\n_p('\\t$(if $(_args),$1$(_args))')\n_p('endef')\n_p('')\n_p('define EOL')\n_p('')\n_p('')\n_p('endef')\n_p('')\nend\n_p('$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchiving then\n_p('\\t@echo ' .. prj.msgarchiving)\nelse\n_p('\\t@echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then \nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)')\nelse\n_p('\\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))')\nend\nelse\nif prj.msglinking the"
- "n\n_p('\\t@echo ' .. prj.msglinking)\nelse\n_p('\\t@echo Linking %s', prj.name)\nend\n_p('\\t$(SILENT) $(LINKCMD)')\nend\n_p('\\t$(POSTBUILDCMDS)')\n_p('')\n_p('$(TARGETDIR):')\npremake.make_mkdirrule(\"$(TARGETDIR)\")\n_p('$(OBJDIRS):')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCreatingMessage\")) then\n_p('\\t@echo Creating $(OBJDIR)')\nend\n_p('\\t-$(call MKDIR,$(OBJDIR))')\nfor dir, _ in pairs(objdirs) do\n_p('\\t-$(call MKDIR,$(OBJDIR)/%s)', dir)\nend\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('$(dir $(TARGETDIR))PkgInfo:')\n_p('$(dir $(TARGETDIR))Info.plist:')\n_p('')\nend\n_p('clean:')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCleaningMessage\")) then\n_p('\\t@echo Cleaning %s', prj.name)\nend\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f $(TARGET)')\n_p('\\t$(SILENT) rm -rf $(OBJDIR)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,"
- "\\\\\\\\,$(TARGET))')\n_p('\\t$(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 = $(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(' ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") .. 'OBJDIR = %s', _MAKE.esc(cfg.objectsdir))\n_p(' ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' ' .. (table.contains(premake.make.override,\"TARGET\") and \"override \" or \"\") .. "
- " '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 _, file 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(' de"
- "fine 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 platform = 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_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\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 = path.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 (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.o=%%.d) -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\n_p('')\nelseif (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\nfu"
- "nction 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",
+ "l: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist')\nelse\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET)')\nend\n_p('\\t@:')\n_p('')\nif (prj.kind == \"StaticLib\" and prj.options.ArchiveSplit) then\n_p('define max_args')\n_p('\\t$(eval _args:=)')\n_p('\\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))')\n_p('\\t$(if $(_args),$1$(_args))')\n_p('endef')\n_p('')\n_p('define EOL')\n_p('')\n_p('')\n_p('endef')\n_p('')\nend\n_p('$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchiving then\n_p('\\t@echo ' .. prj.msgarchiving)\nelse\n_p('\\t@echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then \nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)')\nelse\n_p('\\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))')\n_p('\\t$(SILENT) $(LINKCMD_NDX)'"
+ ")\nend\nelse\nif prj.msglinking then\n_p('\\t@echo ' .. prj.msglinking)\nelse\n_p('\\t@echo Linking %s', prj.name)\nend\n_p('\\t$(SILENT) $(LINKCMD)')\nend\n_p('\\t$(POSTBUILDCMDS)')\n_p('')\n_p('$(TARGETDIR):')\npremake.make_mkdirrule(\"$(TARGETDIR)\")\n_p('$(OBJDIRS):')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCreatingMessage\")) then\n_p('\\t@echo Creating $(OBJDIR)')\nend\n_p('\\t-$(call MKDIR,$(OBJDIR))')\nfor dir, _ in pairs(objdirs) do\n_p('\\t-$(call MKDIR,$(OBJDIR)/%s)', dir)\nend\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('$(dir $(TARGETDIR))PkgInfo:')\n_p('$(dir $(TARGETDIR))Info.plist:')\n_p('')\nend\n_p('clean:')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCleaningMessage\")) then\n_p('\\t@echo Cleaning %s', prj.name)\nend\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f $(TARGET)')\n_p('\\t$(SILENT) rm -rf $(OBJDIR)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,"
+ "\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('\\t$(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 = $(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(' ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") .. 'OBJDIR = %s', _MAKE.esc(cfg.objectsdir))\n_p(' ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' ' .. (table.contains(premake.make.override,\"TARGET"
+ "\") and \"override \" or \"\") .. '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(prj, cfg, cc)\n_p(' OBJECTS := \\\\')\nfor _, file 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 platform = 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_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, 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 (not prj.options.ArchiveSplit) then\nif cc.llvm then\n_p(' LINKCMD = $(AR) rcs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET)')\nend\nelse\nif cc.llvm then\n_p(' LINKCMD = $(AR) qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) cs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) -cs $(TARGET)')\nend\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))\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 (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.o=%%.d) -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\n_p('')\nelseif (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",
/* actions/make/make_csharp.lua */
"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"
@@ -202,12 +202,12 @@ const char* builtin_scripts[] = {
"ild commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p('endif')\n_p('')\nend\n",
/* actions/vstudio/_vstudio.lua */
- "premake.vstudio = { }\nlocal toolsets = {\nvs2010 = \"v90\",\nvs2012 = \"v110\",\nvs2013 = \"v120\",\nvs2015 = \"v140\"\n}\npremake.vstudio.toolset = toolsets[_ACTION] or \"unknown?\"\nlocal vstudio = premake.vstudio\nvstudio.platforms = {\nany = \"Any CPU\",\nmixed = \"Mixed Platforms\",\nNative = \"Win32\",\nx86 = \"x86\",\nx32 = \"Win32\",\nx64 = \"x64\",\nPS3 = \"PS3\",\nXbox360 = \"Xbox 360\",\nARM = \"ARM\"\n}\nfunction vstudio.arch(prj)\nif (prj.language == \"C#\") then\nreturn \"Any CPU\"\nelse\nreturn \"Win32\"\nend\nend\nfunction vstudio.buildconfigs(sln)\nlocal cfgs = { }\nlocal platforms = premake.filterplatforms(sln, vstudio.platforms, \"Native\")\nlocal hascpp = premake.hascppproject(sln)\nlocal hasdotnet = premake.hasdotnetproject(sln)\nif hasdotnet and (_ACTION > \"vs2008\" or hascpp) then\ntable.insert(platforms, 1, \"mixed\")\nend\nif hasdotnet and (_ACTION < \"vs2010\" or not hascpp) then\ntable.insert(platforms, 1, \"any\")\nend\nif _ACTION > \"vs2008\" then\nl"
- "ocal platforms2010 = { }\nfor _, platform in ipairs(platforms) do\nif vstudio.platforms[platform] == \"Win32\" then\nif hascpp then\ntable.insert(platforms2010, platform)\nend\nif hasdotnet then\ntable.insert(platforms2010, \"x86\")\nend\nelse\ntable.insert(platforms2010, platform)\nend\nend\nplatforms = platforms2010\nend\nfor _, buildcfg in ipairs(sln.configurations) do\nfor _, platform in ipairs(platforms) do\nlocal entry = { }\nentry.src_buildcfg = buildcfg\nentry.src_platform = platform\nif platform ~= \"PS3\" or _ACTION > \"vs2008\" then\nentry.buildcfg = buildcfg\nentry.platform = vstudio.platforms[platform]\nelse\nentry.buildcfg = platform .. \" \" .. buildcfg\nentry.platform = \"Win32\"\nend\nentry.name = entry.buildcfg .. \"|\" .. entry.platform\nentry.isreal = (platform ~= \"any\" and platform ~= \"mixed\")\ntable.insert(cfgs, entry)\nend\nend\nreturn cfgs\nend\nfunction vstudio.cleansolution(sln)\npremake.clean.file(sln, \"%%.sln\")\npremake.clean.file(sln, \"%%.suo\")\npremake.clean.file(sln, \"%%"
- ".ncb\")\npremake.clean.file(sln, \"%%.userprefs\")\npremake.clean.file(sln, \"%%.usertasks\")\nend\nfunction vstudio.cleanproject(prj)\nlocal fname = premake.project.getfilename(prj, \"%%\")\nos.remove(fname .. \".vcproj\")\nos.remove(fname .. \".vcproj.user\")\nos.remove(fname .. \".vcxproj\")\nos.remove(fname .. \".vcxproj.user\")\nos.remove(fname .. \".vcxproj.filters\")\nos.remove(fname .. \".csproj\")\nos.remove(fname .. \".csproj.user\")\nos.remove(fname .. \".pidb\")\nos.remove(fname .. \".sdf\")\nend\nfunction vstudio.cleantarget(name)\nos.remove(name .. \".pdb\")\nos.remove(name .. \".idb\")\nos.remove(name .. \".ilk\")\nos.remove(name .. \".vshost.exe\")\nos.remove(name .. \".exe.manifest\")\nend\nfunction vstudio.projectfile(prj)\nlocal pattern\nif prj.language == \"C#\" then\npattern = \"%%.csproj\"\nelse\npattern = iif(_ACTION > \"vs2008\", \"%%.vcxproj\", \"%%.vcproj\")\nend\nlocal fname = premake.project.getbasename(prj.name, pattern)\nfname = path.join(prj.location, fname)\nreturn fname\nend\nf"
- "unction vstudio.tool(prj)\nif (prj.language == \"C#\") then\nreturn \"FAE04EC0-301F-11D3-BF4B-00C04F79EFBC\"\nelse\nreturn \"8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942\"\nend\nend\nnewaction {\ntrigger = \"vs2008\",\nshortname = \"Visual Studio 2008\",\ndescription = \"Generate Microsoft Visual Studio 2008 project files\",\nos = \"windows\",\nvalid_kinds = { \"ConsoleApp\", \"WindowedApp\", \"StaticLib\", \"SharedLib\" },\nvalid_languages = { \"C\", \"C++\", \"C#\" },\nvalid_tools = {\ncc = { \"msc\" },\ndotnet = { \"msnet\" },\n},\nonsolution = function(sln)\npremake.generate(sln, \"%%.sln\", vstudio.sln2005.generate)\nend,\nonproject = function(prj)\nif premake.isdotnetproject(prj) then\npremake.generate(prj, \"%%.csproj\", vstudio.cs2005.generate)\npremake.generate(prj, \"%%.csproj.user\", vstudio.cs2005.generate_user)\nelse\npremake.generate(prj, \"%%.vcproj\", vstudio.vc200x.generate)\npremake.generate(prj, \"%%.vcproj.user\", vstudio.vc200x.generate_user)\nend\nend,"
- "\noncleansolution = vstudio.cleansolution,\noncleanproject = vstudio.cleanproject,\noncleantarget = vstudio.cleantarget,\nvstudio = {\nproductVersion = \"9.0.21022\",\nsolutionVersion = \"10\",\ntoolsVersion = \"3.5\",\n}\n}\nnewaction\n{\ntrigger = \"vs2010\",\nshortname = \"Visual Studio 2010\",\ndescription = \"Generate Microsoft Visual Studio 2010 project files\",\nos = \"windows\",\nvalid_kinds = { \"ConsoleApp\", \"WindowedApp\", \"StaticLib\", \"SharedLib\" },\nvalid_languages = { \"C\", \"C++\", \"C#\"},\nvalid_tools = {\ncc = { \"msc\" },\ndotnet = { \"msnet\" },\n},\nonsolution = function(sln)\npremake.generate(sln, \"%%.sln\", vstudio.sln2005.generate)\nend,\nonproject = function(prj)\nif premake.isdotnetproject(prj) then\npremake.generate(prj, \"%%.csproj\", vstudio.cs2005.generate)\npremake.generate(prj, \"%%.csproj.user\", vstudio.cs2005.generate_user)\nelse\npremake.generate(prj, \"%%.vcxproj\", premake.vs2010_vcxproj)\npremake.generate(prj, \""
- "%%.vcxproj.user\", premake.vs2010_vcxproj_user)\npremake.generate(prj, \"%%.vcxproj.filters\", vstudio.vc2010.generate_filters)\nend\nend,\noncleansolution = premake.vstudio.cleansolution,\noncleanproject = premake.vstudio.cleanproject,\noncleantarget = premake.vstudio.cleantarget,\nvstudio = {\nproductVersion = \"8.0.30703\",\nsolutionVersion = \"11\",\ntargetFramework = \"4.0\",\ntoolsVersion = \"4.0\",\n}\n}\n",
+ "premake.vstudio = { }\nlocal toolsets = {\nvs2010 = \"v100\",\nvs2012 = \"v110\",\nvs2013 = \"v120\",\nvs2015 = \"v140\"\n}\npremake.vstudio.toolset = toolsets[_ACTION] or \"unknown?\"\nlocal vstudio = premake.vstudio\nvstudio.platforms = {\nany = \"Any CPU\",\nmixed = \"Mixed Platforms\",\nNative = \"Win32\",\nx86 = \"x86\",\nx32 = \"Win32\",\nx64 = \"x64\",\nPS3 = \"PS3\",\nXbox360 = \"Xbox 360\",\nARM = \"ARM\"\n}\nfunction vstudio.arch(prj)\nif (prj.language == \"C#\") then\nreturn \"Any CPU\"\nelse\nreturn \"Win32\"\nend\nend\nfunction vstudio.buildconfigs(sln)\nlocal cfgs = { }\nlocal platforms = premake.filterplatforms(sln, vstudio.platforms, \"Native\")\nlocal hascpp = premake.hascppproject(sln)\nlocal hasdotnet = premake.hasdotnetproject(sln)\nif hasdotnet and (_ACTION > \"vs2008\" or hascpp) then\ntable.insert(platforms, 1, \"mixed\")\nend\nif hasdotnet and (_ACTION < \"vs2010\" or not hascpp) then\ntable.insert(platforms, 1, \"any\")\nend\nif _ACTION > \"vs2008\" then\n"
+ "local platforms2010 = { }\nfor _, platform in ipairs(platforms) do\nif vstudio.platforms[platform] == \"Win32\" then\nif hascpp then\ntable.insert(platforms2010, platform)\nend\nif hasdotnet then\ntable.insert(platforms2010, \"x86\")\nend\nelse\ntable.insert(platforms2010, platform)\nend\nend\nplatforms = platforms2010\nend\nfor _, buildcfg in ipairs(sln.configurations) do\nfor _, platform in ipairs(platforms) do\nlocal entry = { }\nentry.src_buildcfg = buildcfg\nentry.src_platform = platform\nif platform ~= \"PS3\" or _ACTION > \"vs2008\" then\nentry.buildcfg = buildcfg\nentry.platform = vstudio.platforms[platform]\nelse\nentry.buildcfg = platform .. \" \" .. buildcfg\nentry.platform = \"Win32\"\nend\nentry.name = entry.buildcfg .. \"|\" .. entry.platform\nentry.isreal = (platform ~= \"any\" and platform ~= \"mixed\")\ntable.insert(cfgs, entry)\nend\nend\nreturn cfgs\nend\nfunction vstudio.cleansolution(sln)\npremake.clean.file(sln, \"%%.sln\")\npremake.clean.file(sln, \"%%.suo\")\npremake.clean.file(sln, \"%"
+ "%.ncb\")\npremake.clean.file(sln, \"%%.userprefs\")\npremake.clean.file(sln, \"%%.usertasks\")\nend\nfunction vstudio.cleanproject(prj)\nlocal fname = premake.project.getfilename(prj, \"%%\")\nos.remove(fname .. \".vcproj\")\nos.remove(fname .. \".vcproj.user\")\nos.remove(fname .. \".vcxproj\")\nos.remove(fname .. \".vcxproj.user\")\nos.remove(fname .. \".vcxproj.filters\")\nos.remove(fname .. \".csproj\")\nos.remove(fname .. \".csproj.user\")\nos.remove(fname .. \".pidb\")\nos.remove(fname .. \".sdf\")\nend\nfunction vstudio.cleantarget(name)\nos.remove(name .. \".pdb\")\nos.remove(name .. \".idb\")\nos.remove(name .. \".ilk\")\nos.remove(name .. \".vshost.exe\")\nos.remove(name .. \".exe.manifest\")\nend\nfunction vstudio.projectfile(prj)\nlocal pattern\nif prj.language == \"C#\" then\npattern = \"%%.csproj\"\nelse\npattern = iif(_ACTION > \"vs2008\", \"%%.vcxproj\", \"%%.vcproj\")\nend\nlocal fname = premake.project.getbasename(prj.name, pattern)\nfname = path.join(prj.location, fname)\nreturn fname\nend\n"
+ "function vstudio.tool(prj)\nif (prj.language == \"C#\") then\nreturn \"FAE04EC0-301F-11D3-BF4B-00C04F79EFBC\"\nelse\nreturn \"8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942\"\nend\nend\nnewaction {\ntrigger = \"vs2008\",\nshortname = \"Visual Studio 2008\",\ndescription = \"Generate Microsoft Visual Studio 2008 project files\",\nos = \"windows\",\nvalid_kinds = { \"ConsoleApp\", \"WindowedApp\", \"StaticLib\", \"SharedLib\" },\nvalid_languages = { \"C\", \"C++\", \"C#\" },\nvalid_tools = {\ncc = { \"msc\" },\ndotnet = { \"msnet\" },\n},\nonsolution = function(sln)\npremake.generate(sln, \"%%.sln\", vstudio.sln2005.generate)\nend,\nonproject = function(prj)\nif premake.isdotnetproject(prj) then\npremake.generate(prj, \"%%.csproj\", vstudio.cs2005.generate)\npremake.generate(prj, \"%%.csproj.user\", vstudio.cs2005.generate_user)\nelse\npremake.generate(prj, \"%%.vcproj\", vstudio.vc200x.generate)\npremake.generate(prj, \"%%.vcproj.user\", vstudio.vc200x.generate_user)\nend\nend"
+ ",\noncleansolution = vstudio.cleansolution,\noncleanproject = vstudio.cleanproject,\noncleantarget = vstudio.cleantarget,\nvstudio = {\nproductVersion = \"9.0.21022\",\nsolutionVersion = \"10\",\ntoolsVersion = \"3.5\",\n}\n}\nnewaction\n{\ntrigger = \"vs2010\",\nshortname = \"Visual Studio 2010\",\ndescription = \"Generate Microsoft Visual Studio 2010 project files\",\nos = \"windows\",\nvalid_kinds = { \"ConsoleApp\", \"WindowedApp\", \"StaticLib\", \"SharedLib\" },\nvalid_languages = { \"C\", \"C++\", \"C#\"},\nvalid_tools = {\ncc = { \"msc\" },\ndotnet = { \"msnet\" },\n},\nonsolution = function(sln)\npremake.generate(sln, \"%%.sln\", vstudio.sln2005.generate)\nend,\nonproject = function(prj)\nif premake.isdotnetproject(prj) then\npremake.generate(prj, \"%%.csproj\", vstudio.cs2005.generate)\npremake.generate(prj, \"%%.csproj.user\", vstudio.cs2005.generate_user)\nelse\npremake.generate(prj, \"%%.vcxproj\", premake.vs2010_vcxproj)\npremake.generate(prj, "
+ "\"%%.vcxproj.user\", premake.vs2010_vcxproj_user)\npremake.generate(prj, \"%%.vcxproj.filters\", vstudio.vc2010.generate_filters)\nend\nend,\noncleansolution = premake.vstudio.cleansolution,\noncleanproject = premake.vstudio.cleanproject,\noncleantarget = premake.vstudio.cleantarget,\nvstudio = {\nproductVersion = \"8.0.30703\",\nsolutionVersion = \"11\",\ntargetFramework = \"4.0\",\ntoolsVersion = \"4.0\",\n}\n}\n",
/* actions/vstudio/vs200x_vcproj.lua */
"premake.vstudio.vc200x = { }\nlocal vc200x = premake.vstudio.vc200x\nlocal tree = premake.tree\nlocal function bool(value)\nreturn iif(value, \"true\", \"false\")\nend\nfunction vc200x.optimization(cfg)\nlocal result = 0\nfor _, value in ipairs(cfg.flags) do\nif (value == \"Optimize\") then\nresult = 3\nelseif (value == \"OptimizeSize\") then\nresult = 1\nelseif (value == \"OptimizeSpeed\") then\nresult = 2\nend\nend\nreturn result\nend\nfunction vc200x.header(element)\nio.eol = \"\\r\\n\"\n_p('<?xml version=\"1.0\" encoding=\"Windows-1252\"?>')\n_p('<%s', element)\n_p(1,'ProjectType=\"Visual C++\"')\n_p(1,'Version=\"9.00\"')\nend\nfunction vc200x.Configuration(name, cfg)\n_p(2,'<Configuration')\n_p(3,'Name=\"%s\"', premake.esc(name))\n_p(3,'OutputDirectory=\"%s\"', premake.esc(cfg.buildtarget.directory))\n_p(3,'IntermediateDirectory=\"%s\"', premake.esc(cfg.objectsdir))\nlocal cfgtype\nif (cfg.kind == \"SharedLib\") then\ncfgtype = 2\nelseif (cfg.kind == \"StaticLib\") then\ncfgtype = 4\nelse\ncfgtype = 1\nen"