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). --- tools/slang-test/slang-test.vcxproj | 116 ++++++++++++++-------------- tools/slang-test/slang-test.vcxproj.filters | 30 +++---- 2 files changed, 72 insertions(+), 74 deletions(-) (limited to 'tools/slang-test') diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj index 34d9bed40..9524529bb 100644 --- a/tools/slang-test/slang-test.vcxproj +++ b/tools/slang-test/slang-test.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,84 +20,88 @@ {0C768A18-1D25-4000-9F37-DA5FE99E3B64} + true Win32Proj - slang_test - 8.1 + slang-test 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\slang-test\ + slang-test + .exe true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-test\ + slang-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-test\ + slang-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-test\ + slang-test + .exe - - - Level4 + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - true Console @@ -106,13 +110,13 @@ - - - Level4 + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - true Console @@ -121,54 +125,54 @@ - Level4 - - - MaxSpeed + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded - true Console true true - true - Level4 - - - MaxSpeed + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded - true Console true true - true + + + + - - - - - {f9be7957-8399-899e-0c49-e714fddd4b65} + {F9BE7957-8399-899E-0C49-E714FDDD4B65} diff --git a/tools/slang-test/slang-test.vcxproj.filters b/tools/slang-test/slang-test.vcxproj.filters index e9342cfd6..f22903aa6 100644 --- a/tools/slang-test/slang-test.vcxproj.filters +++ b/tools/slang-test/slang-test.vcxproj.filters @@ -1,19 +1,21 @@ - + - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + Header Files + + + Header Files + + Source Files @@ -25,12 +27,4 @@ Source Files - - - Header Files - - - Header Files - - \ No newline at end of file -- cgit v1.2.3