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). --- source/core/core.vcxproj | 193 ++++++++++++++++++++------------------- source/core/core.vcxproj.filters | 119 ++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 96 deletions(-) create mode 100644 source/core/core.vcxproj.filters (limited to 'source/core') diff --git a/source/core/core.vcxproj b/source/core/core.vcxproj index 803c1ab12..ecd8ee07b 100644 --- a/source/core/core.vcxproj +++ b/source/core/core.vcxproj @@ -18,196 +18,197 @@ x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Win32Proj - CoreLib {F9BE7957-8399-899E-0C49-E714FDDD4B65} - 8.1 + true + Win32Proj + core StaticLibrary true - v140 Unicode + v140 StaticLibrary true - v140 Unicode + v140 StaticLibrary false - v140 - true Unicode + v140 StaticLibrary false - v140 - true Unicode + v140 - - + - - - + - - + + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\core\ + core + .lib + + + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\core\ + core + .lib + + + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\core\ + core + .lib + + + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\core\ + core + .lib + - - + NotUsing Level4 + true + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue Disabled - WIN32;_DEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC MultiThreadedDebug - false - Default - true Windows true - Shlwapi.lib + true - - + NotUsing Level4 + true + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue Disabled - WIN32;_DEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC MultiThreadedDebug - true - false - Default - true Windows true - Shlwapi.lib + true - - true - + NotUsing Level4 - - - MaxSpeed + true + NDEBUG;%(PreprocessorDefinitions) + Full true true - WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC + false + true MultiThreaded - false - true Windows - true true true - Shlwapi.lib + true + NotUsing Level4 - - - MaxSpeed + true + NDEBUG;%(PreprocessorDefinitions) + Full true true - WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC + false + true MultiThreaded - false - true Windows - true true true - Shlwapi.lib + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/core/core.vcxproj.filters b/source/core/core.vcxproj.filters new file mode 100644 index 000000000..39a164770 --- /dev/null +++ b/source/core/core.vcxproj.filters @@ -0,0 +1,119 @@ + + + + + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + \ No newline at end of file -- cgit v1.2.3