From e2c2c220c642cc5f1c622f909d0ddfd22e6c04d4 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Fri, 11 May 2018 16:34:19 -0700 Subject: Generate Visual Studio projects using Premake (#557) * Generate Visual Studio projects using Premake This change adds a `premake5.lua` file that allows us to generate our Visual Studio solution using Premake 5 (https://premake.github.io/). The existing Visual Studio solution/projects are now replaced with the Premake-generated ones, and project contributors will be expected to update these by running premake after adding/removing files. I have *not* changed the Linux `Makefile` build at all, because that file is also used for things like running our tests, so that clobbering it with a premake-generated `Makefile` would break our continuous testing. Hopefully future changes can switch to a generated `Makefile` and perhaps even add an XCode project as well. Notes: * The `build/slang-build.props` file is no longer needed/used, so it has been removed. * The `slang-eval-test` test fixture wasn't following our naming conventions for its directory path, so it was updated to streamline the Premake build configuration work. This required changes to the `Makefile` as well * Some seemingly unncessary preprocessor definitions that were specified for `core` and `slang-glslang` have been dropped. We will see if anything breaks from that. * Possible fixup for Premake vpath issue Premake's `vpath` feature seems to be nondeterministic about the order it applies filters (because Lua isn't deterministic about the order of entries in a key/value table), and as a result we can end up in a weird case where it decides that a `foo.cpp.h` file matches the `**.cpp` filter (I'm not sure why) before it tests against the `**.h` filter. This change uses an (undocumented) Premake facility to set `vpath` using a list of singleton tables, which seems to fix the order in which things get tested. * Remove support for "single-file" build of Slang The `hello` example was the only bit of code that uses the "single-file" way of building Slang, and this had already run up against limitations of the Visual Studio compilers in its Debug|x64 build. Rather than mess with Premake to make it pass through the `/bigobj` linker flag that is needed to work around the issue, it makes more sense just to stop using/supporting the feature since we wouldn't want users to depend on it anyway (our documentation no longer refers to it). While I was at it I went ahead and made sure that the `SLANG_DYNAMIC` flag doesn't need to be set manually, so that instead there is a non-default `SLANG_STATIC` option (not that we have a static-library build of Slang at the moment). --- examples/hello/hello.cpp | 11 ---- examples/hello/hello.vcxproj | 105 ++++++++++++++++++++--------------- examples/hello/hello.vcxproj.filters | 15 ++++- 3 files changed, 71 insertions(+), 60 deletions(-) (limited to 'examples') diff --git a/examples/hello/hello.cpp b/examples/hello/hello.cpp index 2d7bb81b5..aef6b90d1 100644 --- a/examples/hello/hello.cpp +++ b/examples/hello/hello.cpp @@ -2,7 +2,6 @@ // In order to use the Slang API, we need to include its header -#define SLANG_INCLUDE_IMPLEMENTATION #include // We will be rendering with Direct3D 11, so we need to include @@ -577,13 +576,3 @@ int WINAPI WinMain( return 0; } - - -// -// In order to actually use Slang in our application, we need to link in its -// implementation. The easiest way to accomplish this is by directly inlcuding -// the (concatenated) Slang source code into our app. -// - -#define SLANG_INCLUDE_IMPLEMENTATION -#include diff --git a/examples/hello/hello.vcxproj b/examples/hello/hello.vcxproj index 419d80a80..72bedbd72 100644 --- a/examples/hello/hello.vcxproj +++ b/examples/hello/hello.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,83 +20,88 @@ {E6385042-1649-4803-9EBD-168F8B7EF131} + true Win32Proj hello - 8.1 Application true - v140 Unicode - - - Application - false v140 - true - Unicode Application true + Unicode v140 + + + Application + false Unicode + v140 Application false - v140 - true Unicode + v140 - - - - + - - + - - true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\hello\ + hello + .exe true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\hello\ + hello + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\hello\ + hello + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\hello\ + hello + .exe - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - /bigobj %(AdditionalOptions) + MultiThreadedDebug Windows @@ -105,12 +110,13 @@ - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - /bigobj %(AdditionalOptions) + MultiThreadedDebug Windows @@ -119,38 +125,40 @@ + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - /bigobj %(AdditionalOptions) + false + true + MultiThreaded Windows true true - true + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - /bigobj %(AdditionalOptions) + false + true + MultiThreaded Windows true true - true @@ -159,6 +167,11 @@ + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + diff --git a/examples/hello/hello.vcxproj.filters b/examples/hello/hello.vcxproj.filters index cedbc9831..6855e69cc 100644 --- a/examples/hello/hello.vcxproj.filters +++ b/examples/hello/hello.vcxproj.filters @@ -1,9 +1,18 @@ - + - + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + - + + Source Files + + + + + Source Files + \ No newline at end of file -- cgit v1.2.3