diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-05-11 16:34:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 16:34:19 -0700 |
| commit | e2c2c220c642cc5f1c622f909d0ddfd22e6c04d4 (patch) | |
| tree | 2f8b2faa3ff61d07e106d4f049aa600b14ad8cf8 | |
| parent | 34ecdb71c04232fba4b097f04fc358c57e704e26 (diff) | |
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).
30 files changed, 1986 insertions, 1211 deletions
@@ -103,7 +103,7 @@ SLANGC_SOURCES += $(CORE_SOURCES) SLANG_GLSLANG_SOURCES := source/slang-glslang/*.cpp SLANG_GLSLANG_HEADERS := source/slang-glslang/*.h -SLANG_EVAL_TEST_SOURCES := tools/eval-test/*.cpp +SLANG_EVAL_TEST_SOURCES := tools/slang-eval-test/*.cpp SLANG_EVAL_TEST_HEADERS := SLANG_REFLECTION_TEST_SOURCES := tools/slang-reflection-test/*.cpp diff --git a/build/slang-build.props b/build/slang-build.props deleted file mode 100644 index 265f54d14..000000000 --- a/build/slang-build.props +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <OutDir>$(SolutionDir)bin\windows-$(PlatformShortName)\$(Configuration.ToLower())\</OutDir> - <IntDir>$(SolutionDir)intermediate\windows-$(PlatformShortName)\$(Configuration.ToLower())\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup /> - <ItemGroup /> -</Project>
\ No newline at end of file diff --git a/docs/api-users-guide.md b/docs/api-users-guide.md index 6ad04c3a6..c9bbb40f9 100644 --- a/docs/api-users-guide.md +++ b/docs/api-users-guide.md @@ -12,13 +12,6 @@ We recommend using a pre-built binary package, available through GitHub [release Just add the downloaded package to your include path, and make sure to add (or copy) the `slang.dll` and `slang-glslang.dll` libraries into the path of your executable. -When using a binary release, you'll need to define the `SLANG_DYNAMIC` macro to indicate that you want to dynamically link against the API functions: - -```c++ -#define SLANG_DYNAMIC -#include <slang.h> -``` - Getting Started with the API ---------------------------- 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 <slang.h> // 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 <slang.h> 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 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,83 +20,88 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{E6385042-1649-4803-9EBD-168F8B7EF131}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> <RootNamespace>hello</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\hello\</IntDir> + <TargetName>hello</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\hello\</IntDir> + <TargetName>hello</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\hello\</IntDir> + <TargetName>hello</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\hello\</IntDir> + <TargetName>hello</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -105,12 +110,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -119,38 +125,40 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -159,6 +167,11 @@ <ItemGroup> <None Include="hello.slang" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\source\slang\slang.vcxproj"> + <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> 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 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="hello.cpp" /> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> - <None Include="hello.slang" /> + <ClCompile Include="hello.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <None Include="hello.slang"> + <Filter>Source Files</Filter> + </None> </ItemGroup> </Project>
\ No newline at end of file diff --git a/premake5.lua b/premake5.lua new file mode 100644 index 000000000..390d67a92 --- /dev/null +++ b/premake5.lua @@ -0,0 +1,539 @@ +-- premake5.lua + +-- This file describes the build configuration for Slang so +-- that premake can generate platform-specific build files +-- using Premake 5 (https://premake.github.io/). +-- +-- To update the build files that are checked in to the Slang repository, +-- run a `premake5` binary and specify the appropriate action, e.g.: +-- +-- premake5.exe --os=windows vs2015 +-- +-- If you are trying to build Slang on another platform, then you +-- can try invoking `premake5` for your desired OS and build format +-- and see what happens. +-- +-- If you are going to modify this file to change/customize the Slang +-- buidl, then you may need to read up on Premake's approach and +-- how it uses/abuses Lua syntax. A few important things to note: +-- +-- * Everything that *looks* like a declarative (e.g., `kind "SharedLib"`) +-- is actually a Lua function call (e.g., `kind("SharedLib")`) that +-- modifies the behind-the-scenes state that describes the build. +-- +-- * Many of these function calls are "sticky" and affect subsequent +-- calls, so ordering matters a *lot*. This file uses indentation to +-- represent some of the flow of state, but it is important to recognize +-- that the indentation is not semantically significant. +-- +-- * Because the configuration logic is just executable Lua code, we +-- can capture and re-use bits of configuration logic in ordinary +-- Lua subroutines. +-- +-- Now let's move on to the actual build: + +-- The "workspace" represents the overall build (the "solution" in +-- Visual Studio terms). It sets up basic build settings that will +-- apply across all projects. +-- +workspace "slang" + -- We will support debug/release configuration and x86/x64 builds. + configurations { "Debug", "Release" } + platforms { "x86", "x64" } + + -- The output binary directory will be derived from the OS + -- and configuration options, e.g. `bin/windows-x64/debug/` + targetdir "bin/%{cfg.system}-%{cfg.platform:lower()}/%{cfg.buildcfg:lower()}" + + -- The intermediate ("object") directory will use a similar + -- naming scheme to the output directory, but will also use + -- the project name to avoid cases where multiple projects + -- have source files with the same name. + objdir "intermediate/%{cfg.system}-%{cfg.platform:lower()}/%{cfg.buildcfg:lower()}/%{prj.name}" + + -- Statically link to the C/C++ runtime rather than create a DLL dependency. + flags { "StaticRuntime" } + + -- Once we've set up the common settings, we will make some tweaks + -- that only apply in a subset of cases. Each call to `filter()` + -- changes the "active" filter for subsequent commands. In + -- effect, those commands iwll be ignored when the conditions of + -- the filter aren't satisfied. + + -- Our `x64` platform should (obviously) target the x64 + -- architecture and similarly for x86. + filter { "platforms:x64" } + architecture "x64" + filter { "platforms:x86" } + architecture "x86" + + -- When compiling the debug configuration, we want to turn + -- optimization off, make sure debug symbols are output, + -- and add the same preprocessor definition that VS + -- would add by default. + filter { "configurations:debug" } + optimize "Off" + symbols "On" + defines { "_DEBUG" } + + -- For the release configuration we will turn optimizations on + -- (we do not yet micro-manage the optimization settings) + -- and set the preprocessor definition that VS would add by default. + filter { "configurations:release" } + optimize "On" + defines { "NDEBUG" } + +-- +-- We are now going to start defining the projects, where +-- each project builds some binary artifact (an executable, +-- library, etc.). +-- +-- All of our projects follow a common structure, so rather +-- than reiterate a bunch of build settings, we define +-- some subroutines that make the configuration as concise +-- as possible. +-- +-- First, we will define a helper routine for adding all +-- the relevant files from a given directory path: +-- +function addSourceDir(path) + files + { + path .. "/*.cpp", -- C++ source files + path .. "/*.slang", -- Slang files (for our stdlib) + path .. "/*.h", -- Header files + path .. "/*.hpp", -- C++ style headers (for glslang) + path .. "/*.natvis", -- Visual Studio debugger visualization files + } +end +-- +-- Next we will define a helper routine that all of our +-- projects will bottleneck through. Here `name` is +-- the name for the project (and the base name for +-- whatever output file it produces), while `baseDir` +-- is the parent directory of the project's directory. +-- +-- E.g., for the `slangc` project, the source code +-- is nested in `source/`, so we'd (indirectly) call: +-- +-- baseSlangProject("slangc", "source") +-- +function baseSlangProject(name, baseDir) + + -- The project directory will be nested inside + -- the base directory using the project's name. + -- + local projectDir = baseDir .. "/" .. name + + -- Start a new project in premake. This switches + -- the "current" project over to the newly created + -- one, so that subsequent commands affect this project. + -- + project(name) + + -- Set the location where the project file will be placed. + -- We set the project files to reside in their source + -- directory, because in Visual Studio the default + -- working directory when launching a project in the + -- debugger is its project directory. This ensures that + -- examples will work as expected for VS users. + -- + -- TODO: consider only setting this for examples, since + -- it is less relevant to other projects. + -- + location(projectDir) + + -- All of our projects are written in C++. + -- + language "C++" + + -- Since we know the project directory, we can go ahead + -- and add any source files locate there. + -- + -- Note that we do *not* recurse into subdirectories, + -- so projects that spread their source over multiple + -- directories will need to take more steps. + -- + addSourceDir(projectDir) + + -- By default, Premake generates VS project files that + -- reflect the directory structure of the source code. + -- While this is nice in principle, it creates messy + -- results in practice for our projects. + -- + -- Instead, we will use the `vpaths` feature to imitate + -- the default VS behavior of grouping files into + -- virtual subdirectories (VS calls them "filters") for + -- header and source files respectively. + -- + -- Note: We are setting `vpaths` using a list of key/value + -- tables instead of just a key/value table, since this + -- appears to be an (undocumented) way to fix the order + -- in which the filters are tested. Otherwise we have + -- issues where premake will nondeterministically decide + -- the check something against the `**.cpp` filter first, + -- and decide that a `foo.cpp.h` file should go into + -- the `"Source Files"` vpath. That behavior seems buggy, + -- but at least we appear to have a workaround. + -- + vpaths { + { ["Header Files"] = { "**.h", "**.hpp"} }, + { ["Source Files"] = { "**.cpp", "**.slang", "**.natvis" } }, + } +end + +-- We can now use the `baseSlangProject()` subroutine to +-- define helpers for the different categories of project +-- in our source tree. +-- +-- For example, the Slang project has several tools that +-- are used during building/testing, but don't need to +-- be distributed. These always have their source code in +-- `tools/<project-name>/`. +-- +function tool(name) + -- We use the `group` command here to specify that the + -- next project we create shold be placed into a group + -- named "tools" in a generated IDE solution/workspace. + -- + -- This is used in the generated Visual Studio solution + -- to group all the tools projects together in a logical + -- sub-directory of the solution. + -- + group "tools" + + -- Now we invoke our shared project configuration logic, + -- specifying that the project lives under the `tools/` path. + -- + baseSlangProject(name, "tools") + + -- Finally, we set the project "kind" to produce a console + -- application. This is a reasonable default for tools, + -- and it can be overriden because Premake is stateful, + -- and a subsequent call to `kind()` would overwrite this + -- default. + -- + kind "ConsoleApp" +end + +-- "Standard" projects will be those that go to make the binary +-- packages for slang: the shared libraries and executables. +-- +function standardProject(name) + -- Because Premake is stateful, any `group()` call by another + -- project would still be in effect when we create a project + -- here (e.g., if somebody had called `tool()` before + -- `standardProject()`), so we are careful here to set the + -- group to an emptry string, which Premake treats as "no group." + -- + group "" + + -- A standard project has its code under `source/` + -- + baseSlangProject(name, "source") +end + +-- Finally we have the example programs that show how to use Slang. +-- +function example(name) + -- Example programs go into an "example" group + group "examples" + + -- They have their source code under `examples/<project-name>/` + baseSlangProject(name, "examples") + + -- By default, all of our examples are GUI applications. One some + -- platforms there is no meaningful distinction between GUI and + -- command-line applications, but it is significant on Windows and MacOS + -- + kind "WindowedApp" + + -- Every example needs to be able to include the `slang.h` header + -- if it is going to use Slang, so we might as well set up a suitable + -- include path here rather than make each example do it. + -- + includedirs { "." } + + -- The examples also need to link against the slang library, + -- so we specify that here rather than in each example. + links { "slang" } +end + +-- +-- With all of these helper routines defined, we can now define the +-- actual projects quite simply. For example, here is the entire +-- declaration of the "Hello, World" example project: +-- +example "hello" + uuid "E6385042-1649-4803-9EBD-168F8B7EF131" +-- +-- Note how we are calling our custom `example()` subroutine with +-- the same syntax sugar that Premake usually advocates for their +-- `project()` function. This allows us to treat `example` as +-- a kind of specialized "subclass" of `project` +-- +-- The call to `uuid()` in the definition of `hello` establishes +-- the UUID/GUID that will be used for the project in generated +-- formats that use these as unique identifiers (e.g., Visual +-- Studio solutions). Without this call, Premake will generate +-- a fresh UUID for a project each time its generation logic +-- runs, which can create spurious diffs. +-- + +-- Most of the other projects have more interesting configuration going +-- on, so let's walk through them in order of increasing complexity. +-- +-- The `core` project is a static library that has all the basic types +-- and routines that get shared across both the Slang compiler/runtime +-- and the various tool projects. It's build is pretty simple: +-- + +standardProject "core" + uuid "F9BE7957-8399-899E-0C49-E714FDDD4B65" + kind "StaticLib" + + -- For our core implementation, we want to use the most + -- aggressive warning level supported by the target, and + -- to treat every warning as an error to make sure we + -- keep our code free of warnings. + -- + warnings "Extra" + flags { "FatalWarnings" } + + +-- +-- `slang-generate` is a tool we use for source code generation on +-- the compiler. It depends on the `core` library, so we need to +-- declare that: +-- + +tool "slang-generate" + uuid "66174227-8541-41FC-A6DF-4764FC66F78E" + links { "core" } + + +-- +-- The `slang-test` test driver also uses the `core` library, and it +-- currently relies on include paths being set up so that it can find +-- the core headers: +-- + +tool "slang-test" + uuid "0C768A18-1D25-4000-9F37-DA5FE99E3B64" + includedirs { "." } + links { "core" } + +-- +-- The reflection test harness `slang-reflection-test` is pretty +-- simple, in that it only needs to link against the slang library +-- to do its job: +-- + +tool "slang-reflection-test" + uuid "22C45F4F-FB6B-4535-BED1-D3F5D0C71047" + includedirs { "." } + links { "slang" } + +-- +-- `slang-eval-test` is similarly easy to build: +-- +-- Note: `slang-eval-test` will probably be deprecated and its functionality +-- folded into `render-test`, but we aren't ready for that just yet. +-- + +tool "slang-eval-test" + uuid "205FCAB9-A13F-4980-86FA-F6221A7095EE" + includedirs { "." } + links { "core", "slang" } + +-- +-- The most complex testing tool we have is `render-test`, but from +-- a build perspective the most interesting thing about it is that for +-- our Windows build it requires a Windows 10 SDK. +-- +-- TODO: Try to make the build not require a fixed version of the Windows SDK. +-- Ideally we should just specify a *minimum* version. +-- +-- This test also requires Vulkan headers which we've placed in the +-- `external/` directory, and it also includes files from the `core` +-- library in ways that require us to set up `source/` as an include path. +-- +-- TODO: Fix that requirement. +-- + +tool "render-test" + uuid "96610759-07B9-4EEB-A974-5C634A2E742B" + includedirs { ".", "external", "source" } + links { "core", "slang" } + filter { "system:windows" } + systemversion "10.0.14393.0" + +-- +-- The `slangc` command-line application is just a very thin wrapper +-- around the Slang dynamic library, so its build is extermely simple. +-- One windows `slangc` uses the the `core` library for some UTF-16 +-- to UTF-8 string conversion before calling into `slang.dll`, so +-- it also depends on `core`: +-- + +standardProject "slangc" + uuid "D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7" + kind "ConsoleApp" + links { "core", "slang" } + +-- +-- TODO: Slang's current `Makefile` build does some careful incantations +-- to make sure that the binaries it generates use a "relative `RPATH`" +-- for loading shared libraries, so that Slang is not dependent on +-- being installed to a fixed path on end-user machines. Before we +-- can use Premake for the Linux build (or evenatually MacOS) we would +-- need to figure out how to replicate this incantation in premake. +-- + +-- +-- Now that we've gotten all the simple projects out of the way, it is time +-- to get into the more serious build steps. +-- +-- First up is the `slang` dynamic library project: +-- + +standardProject "slang" + uuid "DB00DA62-0533-4AFD-B59F-A67D5B3A0808" + kind "SharedLib" + links { "core" } + warnings "Extra" + flags { "FatalWarnings" } + + -- The way that we currently configure things through `slang.h`, + -- we need to set a preprocessor definitions to ensure that + -- we declare the Slang API functions for *export* and not *import*. + -- + defines { "SLANG_DYNAMIC_EXPORT" } + + -- The `standardProject` operation already added all the code in + -- `source/slang/*`, but we also want to incldue the umbrella + -- `slang.h` header in this prject, so we do that manually here. + files { "slang.h" } + + -- The most challenging part of building `slang` is that we need + -- to invoke the `slang-generate` tool to generate the version + -- of the Slang standard library that we embed into the compiler. + -- + -- First, we need to ensure that `slang-generate` gets built + -- before `slang`, so we declare a non-linking dependency between + -- the projects here: + -- + dependson { "slang-generate" } + + -- Next, we want to add a custom build rule for each of the + -- files that makes up the standard library. Those are + -- always named `*.meta.slang`, so we can select for them + -- using a `filter` and then use Premake's support for + -- defining custom build commands: + -- + filter "files:**.meta.slang" + -- Specify the "friendly" message that should print to the build log for the action + buildmessage "slang-generate %{file.relpath}" + + -- Specify the actual command to run for this action. + -- + -- Note that we use a single-quoted Lua string and wrap the path + -- to the `slang-generate` command in double quotes to avoid + -- confusing the Windows shell. It seems that Premake outputs that + -- path with forward slashes, which confused the shell if we don't + -- quote the executable path. + -- + buildcommands { '"%{cfg.targetdir}/slang-generate" %{file.relpath}' } + + -- Given `foo.meta.slang` we woutput `foo.meta.slang.h`. + -- This needs to be specified because the custom action will only + -- run when this file needs to be generated. + -- + buildoutputs { "%{file.relpath}.h" } + + -- We will specify an additional build input dependency on the `slang-generate` + -- tool itself, so that changes to the code for the tool cause the generation + -- step to be re-run. + -- + -- In order to get the file name right, we need to know the executable suffix + -- that the target platform will use. Premake might have a built-in way to + -- query this, but I couldn't find it, so I am just winging it for now: + -- + local executableSuffix = ""; + if(os.target() == "windows") then + executableSuffix = ".exe"; + end + -- + buildinputs { "%{cfg.targetdir}/slang-generate" .. executableSuffix } + +-- +-- The single most complicated part of our build is our custom version of glslang. +-- Is not really set up to produce a shared library with a usable API, so we have +-- our own custom shim API around it to invoke GLSL->SPIRV compilation. +-- +-- Glslang normally relies on a CMake-based build process, and its code is spread +-- across multiple directories with implicit dependencies on certain command-line +-- definitions. +-- +-- The following is a tailored build of glslang that pulls in the pieces we care +-- about whle trying to leave out the rest: +-- +standardProject "slang-glslang" + uuid "C495878A-832C-485B-B347-0998A90CC936" + kind "SharedLib" + includedirs { "external/glslang" } + + defines + { + -- `ENABLE_OPT` must be defined (to either zero or one) for glslang to compile at all + "ENABLE_OPT=0", + + -- We want to build a version of glslang that supports every feature possible, + -- so we will enable all of the supported vendor-specific extensions so + -- that they can be used in Slang-generated GLSL code when required. + -- + "AMD_EXTENSIONS", + "NV_EXTENSIONS", + } + + -- We will add source code from every directory that is required to get a + -- minimal GLSL->SPIR-V compilation path working. + addSourceDir("external/glslang/glslang/GenericCodeGen") + addSourceDir("external/glslang/glslang/MachineIndependent") + addSourceDir("external/glslang/glslang/MachineIndependent/preprocessor") + addSourceDir("external/glslang/glslang/OSDependent") + addSourceDir("external/glslang/OGLCompilersDLL") + addSourceDir("external/glslang/SPIRV") + addSourceDir("external/glslang/StandAlone") + + -- Unfortunately, blindly adding files like that also pulled in a declaration + -- of a main entry point that we do *not* want, so we will specifically + -- exclude that file from our build. + removefiles { "external/glslang/StandAlone/StandAlone.cpp" } + + -- Glslang includes some platform-specific code around DLL setup/teardown + -- and handling of thread-local storage for its multi-threaded mode. We + -- don't really care about *any* of that, but we can't remove it from the + -- build so we need to include the appropriate platform-specific sources. + + filter { "system:windows" } + -- On Windows we need to add the platform-specific sources and then + -- remove the `main.cpp` file since it tries to define a `DllMain` + -- and we don't want the default glslang one. + addSourceDir( "external/glslang/glslang/OSDependent/Windows" ) + removefiles { "external/glslang/glslang/OSDependent/Windows/main.cpp" } + + filter { "system:linux" } + addSourceDir("external/glslang/glslang/OSDependent/Unix") + +-- +-- With glslang's build out of the way, we've now covered everything we have +-- to build to get Slang and its tools/examples built. +-- +-- What is not included in this file yet is support for any custom `make` +-- targets for: +-- +-- * Invoking the test runner +-- * Packaging up binaries +-- * "Installing" Slang on a user's machine +--
\ No newline at end of file @@ -1,10 +1,8 @@ #ifndef SLANG_H #define SLANG_H -#if defined(SLANG_DYNAMIC_EXPORT) - #if !defined(SLANG_DYNAMIC) - #define SLANG_DYNAMIC - #endif +#if !defined(SLANG_STATIC) && !defined(SLANG_STATIC) + #define SLANG_DYNAMIC #endif #if defined(SLANG_DYNAMIC) @@ -1259,46 +1257,4 @@ namespace slang #endif -#ifdef SLANG_INCLUDE_IMPLEMENTATION - -#include "source/core/platform.cpp" -#include "source/core/slang-io.cpp" -#include "source/core/slang-string.cpp" -#include "source/core/stream.cpp" -#include "source/core/text-io.cpp" -#include "source/slang/bytecode.cpp" -#include "source/slang/diagnostics.cpp" -#include "source/slang/dxc-support.cpp" -#include "source/slang/emit.cpp" -#include "source/slang/ir.cpp" -#include "source/slang/ir-constexpr.cpp" -#include "source/slang/ir-dominators.cpp" -#include "source/slang/ir-legalize-types.cpp" -#include "source/slang/ir-ssa.cpp" -#include "source/slang/ir-validate.cpp" -#include "source/slang/legalize-types.cpp" -#include "source/slang/lexer.cpp" -#include "source/slang/mangle.cpp" -#include "source/slang/memory_pool.cpp" -#include "source/slang/name.cpp" -#include "source/slang/options.cpp" -#include "source/slang/parameter-binding.cpp" -#include "source/slang/parser.cpp" -#include "source/slang/preprocessor.cpp" -#include "source/slang/profile.cpp" -#include "source/slang/lookup.cpp" -#include "source/slang/lower-to-ir.cpp" -#include "source/slang/check.cpp" -#include "source/slang/compiler.cpp" -#include "source/slang/slang-stdlib.cpp" -#include "source/slang/source-loc.cpp" -#include "source/slang/syntax.cpp" -#include "source/slang/token.cpp" -#include "source/slang/type-layout.cpp" -#include "source/slang/reflection.cpp" -#include "source/slang/slang.cpp" -#include "source/slang/vm.cpp" -#include "source/slang/type-system-shared.cpp" -#endif - #endif @@ -1,36 +1,32 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{B625E3E2-3B0B-4A01-9D10-957F84092E10}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello", "examples\hello\hello.vcxproj", "{E6385042-1649-4803-9EBD-168F8B7EF131}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "source\core\core.vcxproj", "{F9BE7957-8399-899E-0C49-E714FDDD4B65}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{74C5F0DC-93BB-4BF3-AC65-8C65491570F7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FD47AE19-69FD-260F-F2F1-20E65EA61D13}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "source\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}" - ProjectSection(ProjectDependencies) = postProject - {66174227-8541-41FC-A6DF-4764FC66F78E} = {66174227-8541-41FC-A6DF-4764FC66F78E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "source\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}" - ProjectSection(ProjectDependencies) = postProject - {C495878A-832C-485B-B347-0998A90CC936} = {C495878A-832C-485B-B347-0998A90CC936} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-generate", "tools\slang-generate\slang-generate.vcxproj", "{66174227-8541-41FC-A6DF-4764FC66F78E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-test", "tools\slang-test\slang-test.vcxproj", "{0C768A18-1D25-4000-9F37-DA5FE99E3B64}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test", "tools\render-test\render-test.vcxproj", "{96610759-07B9-4EEB-A974-5C634A2E742B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test", "tools\slang-reflection-test\slang-reflection-test.vcxproj", "{22C45F4F-FB6B-4535-BED1-D3F5D0C71047}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-glslang", "source\slang-glslang\slang-glslang.vcxproj", "{C495878A-832C-485B-B347-0998A90CC936}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-eval-test", "tools\slang-eval-test\slang-eval-test.vcxproj", "{205FCAB9-A13F-4980-86FA-F6221A7095EE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-generate", "tools\slang-generate\slang-generate.vcxproj", "{66174227-8541-41FC-A6DF-4764FC66F78E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test", "tools\render-test\render-test.vcxproj", "{96610759-07B9-4EEB-A974-5C634A2E742B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-eval-test", "tools\eval-test\eval-test.vcxproj", "{205FCAB9-A13F-4980-86FA-F6221A7095EE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "source\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test", "tools\slang-reflection-test\slang-reflection-test.vcxproj", "{22C45F4F-FB6B-4535-BED1-D3F5D0C71047}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "source\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}" + ProjectSection(ProjectDependencies) = postProject + {66174227-8541-41FC-A6DF-4764FC66F78E} = {66174227-8541-41FC-A6DF-4764FC66F78E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-glslang", "source\slang-glslang\slang-glslang.vcxproj", "{C495878A-832C-485B-B347-0998A90CC936}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -56,22 +52,14 @@ Global {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|Win32.Build.0 = Release|Win32 {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|x64.ActiveCfg = Release|x64 {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|x64.Build.0 = Release|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.ActiveCfg = Debug|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.Build.0 = Debug|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.ActiveCfg = Debug|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.Build.0 = Debug|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.ActiveCfg = Release|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.Build.0 = Release|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.ActiveCfg = Release|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.Build.0 = Release|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.ActiveCfg = Debug|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.Build.0 = Debug|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.ActiveCfg = Debug|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.Build.0 = Debug|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.ActiveCfg = Release|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.Build.0 = Release|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.ActiveCfg = Release|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.Build.0 = Release|x64 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.ActiveCfg = Debug|Win32 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.Build.0 = Debug|Win32 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.ActiveCfg = Debug|x64 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.Build.0 = Debug|x64 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.ActiveCfg = Release|Win32 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.Build.0 = Release|Win32 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.ActiveCfg = Release|x64 + {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.Build.0 = Release|x64 {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|Win32.ActiveCfg = Debug|Win32 {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|Win32.Build.0 = Debug|Win32 {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|x64.ActiveCfg = Debug|x64 @@ -80,6 +68,22 @@ Global {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|Win32.Build.0 = Release|Win32 {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|x64.ActiveCfg = Release|x64 {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|x64.Build.0 = Release|x64 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|Win32.ActiveCfg = Debug|Win32 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|Win32.Build.0 = Debug|Win32 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|x64.ActiveCfg = Debug|x64 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|x64.Build.0 = Debug|x64 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|Win32.ActiveCfg = Release|Win32 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|Win32.Build.0 = Release|Win32 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|x64.ActiveCfg = Release|x64 + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|x64.Build.0 = Release|x64 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|Win32.ActiveCfg = Debug|Win32 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|Win32.Build.0 = Debug|Win32 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|x64.ActiveCfg = Debug|x64 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|x64.Build.0 = Debug|x64 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|Win32.ActiveCfg = Release|Win32 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|Win32.Build.0 = Release|Win32 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|x64.ActiveCfg = Release|x64 + {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|x64.Build.0 = Release|x64 {96610759-07B9-4EEB-A974-5C634A2E742B}.Debug|Win32.ActiveCfg = Debug|Win32 {96610759-07B9-4EEB-A974-5C634A2E742B}.Debug|Win32.Build.0 = Debug|Win32 {96610759-07B9-4EEB-A974-5C634A2E742B}.Debug|x64.ActiveCfg = Debug|x64 @@ -88,6 +92,22 @@ Global {96610759-07B9-4EEB-A974-5C634A2E742B}.Release|Win32.Build.0 = Release|Win32 {96610759-07B9-4EEB-A974-5C634A2E742B}.Release|x64.ActiveCfg = Release|x64 {96610759-07B9-4EEB-A974-5C634A2E742B}.Release|x64.Build.0 = Release|x64 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.ActiveCfg = Debug|Win32 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.Build.0 = Debug|Win32 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.ActiveCfg = Debug|x64 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.Build.0 = Debug|x64 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.ActiveCfg = Release|Win32 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.Build.0 = Release|Win32 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.ActiveCfg = Release|x64 + {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.Build.0 = Release|x64 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.ActiveCfg = Debug|Win32 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.Build.0 = Debug|Win32 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.ActiveCfg = Debug|x64 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.Build.0 = Debug|x64 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.ActiveCfg = Release|Win32 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.Build.0 = Release|Win32 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.ActiveCfg = Release|x64 + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.Build.0 = Release|x64 {C495878A-832C-485B-B347-0998A90CC936}.Debug|Win32.ActiveCfg = Debug|Win32 {C495878A-832C-485B-B347-0998A90CC936}.Debug|Win32.Build.0 = Debug|Win32 {C495878A-832C-485B-B347-0998A90CC936}.Debug|x64.ActiveCfg = Debug|x64 @@ -96,40 +116,16 @@ Global {C495878A-832C-485B-B347-0998A90CC936}.Release|Win32.Build.0 = Release|Win32 {C495878A-832C-485B-B347-0998A90CC936}.Release|x64.ActiveCfg = Release|x64 {C495878A-832C-485B-B347-0998A90CC936}.Release|x64.Build.0 = Release|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.ActiveCfg = Debug|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.Build.0 = Debug|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.ActiveCfg = Debug|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.Build.0 = Debug|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.ActiveCfg = Release|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.Build.0 = Release|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.ActiveCfg = Release|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.Build.0 = Release|x64 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|Win32.ActiveCfg = Debug|Win32 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|Win32.Build.0 = Debug|Win32 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|x64.ActiveCfg = Debug|x64 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Debug|x64.Build.0 = Debug|x64 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|Win32.ActiveCfg = Release|Win32 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|Win32.Build.0 = Release|Win32 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|x64.ActiveCfg = Release|x64 - {205FCAB9-A13F-4980-86FA-F6221A7095EE}.Release|x64.Build.0 = Release|x64 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|Win32.ActiveCfg = Debug|Win32 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|Win32.Build.0 = Debug|Win32 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|x64.ActiveCfg = Debug|x64 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Debug|x64.Build.0 = Debug|x64 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|Win32.ActiveCfg = Release|Win32 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|Win32.Build.0 = Release|Win32 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|x64.ActiveCfg = Release|x64 - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E6385042-1649-4803-9EBD-168F8B7EF131} = {B625E3E2-3B0B-4A01-9D10-957F84092E10} - {0C768A18-1D25-4000-9F37-DA5FE99E3B64} = {74C5F0DC-93BB-4BF3-AC65-8C65491570F7} - {96610759-07B9-4EEB-A974-5C634A2E742B} = {74C5F0DC-93BB-4BF3-AC65-8C65491570F7} - {66174227-8541-41FC-A6DF-4764FC66F78E} = {74C5F0DC-93BB-4BF3-AC65-8C65491570F7} - {205FCAB9-A13F-4980-86FA-F6221A7095EE} = {74C5F0DC-93BB-4BF3-AC65-8C65491570F7} - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047} = {74C5F0DC-93BB-4BF3-AC65-8C65491570F7} + {E6385042-1649-4803-9EBD-168F8B7EF131} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} + {66174227-8541-41FC-A6DF-4764FC66F78E} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} + {0C768A18-1D25-4000-9F37-DA5FE99E3B64} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} + {22C45F4F-FB6B-4535-BED1-D3F5D0C71047} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} + {205FCAB9-A13F-4980-86FA-F6221A7095EE} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} + {96610759-07B9-4EEB-A974-5C634A2E742B} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} EndGlobalSection EndGlobal 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 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> - <ItemGroup> - <ClInclude Include="allocator.h" /> - <ClInclude Include="array-view.h" /> - <ClInclude Include="array.h" /> - <ClInclude Include="basic.h" /> - <ClInclude Include="common.h" /> - <ClInclude Include="dictionary.h" /> - <ClInclude Include="exception.h" /> - <ClInclude Include="hash.h" /> - <ClInclude Include="int-set.h" /> - <ClInclude Include="list.h" /> - <ClInclude Include="secure-crt.h" /> - <ClInclude Include="slang-com-ptr.h" /> - <ClInclude Include="slang-defines.h" /> - <ClInclude Include="slang-free-list.h" /> - <ClInclude Include="slang-io.h" /> - <ClInclude Include="slang-math.h" /> - <ClInclude Include="slang-result.h" /> - <ClInclude Include="slang-string-util.h" /> - <ClInclude Include="slang-string.h" /> - <ClInclude Include="smart-pointer.h" /> - <ClInclude Include="stream.h" /> - <ClInclude Include="text-io.h" /> - <ClInclude Include="token-reader.h" /> - <ClInclude Include="type-traits.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="platform.cpp" /> - <ClCompile Include="slang-free-list.cpp" /> - <ClCompile Include="slang-io.cpp" /> - <ClCompile Include="slang-string-util.cpp" /> - <ClCompile Include="slang-string.cpp" /> - <ClCompile Include="stream.cpp" /> - <ClCompile Include="text-io.cpp" /> - <ClCompile Include="token-reader.cpp" /> - </ItemGroup> - <ItemGroup> - <Natvis Include="core.natvis" /> - </ItemGroup> - <PropertyGroup Label="Globals" /> - <PropertyGroup Label="Globals"> - </PropertyGroup> <PropertyGroup Label="Globals"> - </PropertyGroup> - <PropertyGroup Label="Globals"> - </PropertyGroup> - <PropertyGroup Label="Globals"> - <Keyword>Win32Proj</Keyword> - <RootNamespace>CoreLib</RootNamespace> <ProjectGuid>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</ProjectGuid> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> + <Keyword>Win32Proj</Keyword> + <RootNamespace>core</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\core\</IntDir> + <TargetName>core</TargetName> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\core\</IntDir> + <TargetName>core</TargetName> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\core\</IntDir> + <TargetName>core</TargetName> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\core\</IntDir> + <TargetName>core</TargetName> + <TargetExt>.lib</TargetExt> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <Lib> - <AdditionalDependencies>Shlwapi.lib</AdditionalDependencies> + <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <BrowseInformation>true</BrowseInformation> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <Lib> - <AdditionalDependencies>Shlwapi.lib</AdditionalDependencies> + <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> </Lib> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> <Lib> - <AdditionalDependencies>Shlwapi.lib</AdditionalDependencies> + <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> <Lib> - <AdditionalDependencies>Shlwapi.lib</AdditionalDependencies> + <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> </Lib> </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="allocator.h" /> + <ClInclude Include="array-view.h" /> + <ClInclude Include="array.h" /> + <ClInclude Include="basic.h" /> + <ClInclude Include="common.h" /> + <ClInclude Include="dictionary.h" /> + <ClInclude Include="exception.h" /> + <ClInclude Include="hash.h" /> + <ClInclude Include="int-set.h" /> + <ClInclude Include="list.h" /> + <ClInclude Include="platform.h" /> + <ClInclude Include="secure-crt.h" /> + <ClInclude Include="slang-com-ptr.h" /> + <ClInclude Include="slang-defines.h" /> + <ClInclude Include="slang-free-list.h" /> + <ClInclude Include="slang-io.h" /> + <ClInclude Include="slang-math.h" /> + <ClInclude Include="slang-result.h" /> + <ClInclude Include="slang-string-util.h" /> + <ClInclude Include="slang-string.h" /> + <ClInclude Include="smart-pointer.h" /> + <ClInclude Include="stream.h" /> + <ClInclude Include="text-io.h" /> + <ClInclude Include="token-reader.h" /> + <ClInclude Include="type-traits.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="platform.cpp" /> + <ClCompile Include="slang-free-list.cpp" /> + <ClCompile Include="slang-io.cpp" /> + <ClCompile Include="slang-string-util.cpp" /> + <ClCompile Include="slang-string.cpp" /> + <ClCompile Include="stream.cpp" /> + <ClCompile Include="text-io.cpp" /> + <ClCompile Include="token-reader.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="core.natvis" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Header Files"> + <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="allocator.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="array-view.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="array.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="basic.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="common.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="dictionary.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="exception.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="hash.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="int-set.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="list.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="platform.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="secure-crt.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-com-ptr.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-defines.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-free-list.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-io.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-math.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-result.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-string-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-string.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="smart-pointer.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="stream.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="text-io.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="token-reader.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="type-traits.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="platform.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-free-list.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-io.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-string-util.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-string.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="stream.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="text-io.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="token-reader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <None Include="core.natvis"> + <Filter>Source Files</Filter> + </None> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/source/slang-glslang/slang-glslang.vcxproj b/source/slang-glslang/slang-glslang.vcxproj index b9662efcf..d1975cba5 100644 --- a/source/slang-glslang/slang-glslang.vcxproj +++ b/source/slang-glslang/slang-glslang.vcxproj @@ -5,14 +5,14 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,158 +20,225 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{C495878A-832C-485B-B347-0998A90CC936}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>slang_glslang</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - <ProjectName>slang-glslang</ProjectName> + <RootNamespace>slang-glslang</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang-glslang\</IntDir> + <TargetName>slang-glslang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang-glslang\</IntDir> + <TargetName>slang-glslang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang-glslang\</IntDir> + <TargetName>slang-glslang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang-glslang\</IntDir> + <TargetName>slang-glslang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;ENABLE_OPT=0;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>NV_EXTENSIONS;AMD_EXTENSIONS;ENABLE_OPT=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4819;4267</DisableSpecificWarnings> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x86\debug\slang-glslang.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;ENABLE_OPT=0;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>NV_EXTENSIONS;AMD_EXTENSIONS;ENABLE_OPT=0;_DEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4819;4267</DisableSpecificWarnings> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x64\debug\slang-glslang.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;ENABLE_OPT=0;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NV_EXTENSIONS;AMD_EXTENSIONS;ENABLE_OPT=0;WIN32;NDEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4819;4267</DisableSpecificWarnings> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x86\release\slang-glslang.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;ENABLE_OPT=0;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NV_EXTENSIONS;AMD_EXTENSIONS;ENABLE_OPT=0;NDEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4819;4267</DisableSpecificWarnings> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x64\release\slang-glslang.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemGroup> + <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.EXT.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\doc.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h" /> + <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp" /> + <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h" /> + <ClInclude Include="..\..\external\glslang\StandAlone\DirStackFileIncluder.h" /> + <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h" /> + <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\attribute.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h" /> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h" /> + <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h" /> + <ClInclude Include="slang-glslang.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp" /> + <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp" /> + <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp" /> + <ClCompile Include="..\..\external\glslang\StandAlone\spirv-remap.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp" /> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" /> @@ -179,63 +246,9 @@ <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp" /> <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp" /> - <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp" /> - <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp" /> - <ClCompile Include="..\..\external\glslang\StandAlone\StandAlone.cpp" /> <ClCompile Include="slang-glslang.cpp" /> </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\attribute.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h" /> - <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h" /> - <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\doc.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp" /> - <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h" /> - <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h" /> - <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h" /> - <ClInclude Include="slang-glslang.h" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/source/slang-glslang/slang-glslang.vcxproj.filters b/source/slang-glslang/slang-glslang.vcxproj.filters index 2adddaca4..0d3841020 100644 --- a/source/slang-glslang/slang-glslang.vcxproj.filters +++ b/source/slang-glslang/slang-glslang.vcxproj.filters @@ -1,253 +1,255 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> + <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier> </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp"> + <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.EXT.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\doc.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\StandAlone\DirStackFileIncluder.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\attribute.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-glslang.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp"> + <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp"> + <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp"> + <ClCompile Include="..\..\external\glslang\StandAlone\spirv-remap.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\StandAlone\StandAlone.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-glslang.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp"> + <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-glslang.cpp"> <Filter>Source Files</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\doc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="slang-glslang.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\attribute.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index fa75d7378..f32355e83 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -20,163 +20,167 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> <RootNamespace>slang</RootNamespace> - <ProjectName>slang</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang\</IntDir> + <TargetName>slang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang\</IntDir> + <TargetName>slang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang\</IntDir> + <TargetName>slang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang\</IntDir> + <TargetName>slang</TargetName> + <TargetExt>.dll</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>SLANG_DYNAMIC;SLANG_DYNAMIC_EXPORT;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> - <SubSystem>Console</SubSystem> + <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x86\debug\slang.lib</ImportLibrary> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>SLANG_DYNAMIC;SLANG_DYNAMIC_EXPORT;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <BrowseInformation>true</BrowseInformation> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> - <SubSystem>Console</SubSystem> + <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <ImportLibrary>..\..\bin\windows-x64\debug\slang.lib</ImportLibrary> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>SLANG_DYNAMIC;SLANG_DYNAMIC_EXPORT;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <ImportLibrary>..\..\bin\windows-x86\release\slang.lib</ImportLibrary> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>SLANG_DYNAMIC;SLANG_DYNAMIC_EXPORT;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <ImportLibrary>..\..\bin\windows-x64\release\slang.lib</ImportLibrary> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> </ItemDefinitionGroup> <ItemGroup> - <Natvis Include="..\core\core.natvis" /> - <Natvis Include="slang.natvis" /> - </ItemGroup> - <ItemGroup> <ClInclude Include="..\..\slang.h" /> <ClInclude Include="bytecode.h" /> <ClInclude Include="compiler.h" /> + <ClInclude Include="core.meta.slang.h" /> <ClInclude Include="decl-defs.h" /> <ClInclude Include="diagnostic-defs.h" /> <ClInclude Include="diagnostics.h" /> <ClInclude Include="emit.h" /> <ClInclude Include="expr-defs.h" /> + <ClInclude Include="glsl.meta.slang.h" /> + <ClInclude Include="hlsl.meta.slang.h" /> <ClInclude Include="ir-constexpr.h" /> <ClInclude Include="ir-dominators.h" /> <ClInclude Include="ir-inst-defs.h" /> @@ -251,50 +255,41 @@ <ClCompile Include="vm.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\core\core.vcxproj"> - <Project>{f9be7957-8399-899e-0c49-e714fddd4b65}</Project> - </ProjectReference> + <None Include="slang.natvis" /> </ItemGroup> <ItemGroup> <CustomBuild Include="core.meta.slang"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">slang-generate %(Identity)</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Identity).cpp</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)slang-generate.exe</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">slang-generate %(Identity)</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Identity).cpp</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)slang-generate.exe</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">slang-generate %(Identity)</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Identity).cpp</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)slang-generate.exe</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">slang-generate %(Identity)</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Identity).cpp</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)slang-generate.exe</AdditionalInputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command> + <Outputs>%(Identity).h</Outputs> + <Message>slang-generate %(Identity)</Message> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs> </CustomBuild> <CustomBuild Include="hlsl.meta.slang"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)slang-generate.exe %(Identity)</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">slang-generate %(Identity)</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">slang-generate %(Identity)</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">slang-generate %(Identity)</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">slang-generate %(Identity)</Message> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Identity).cpp</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Identity).cpp</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Identity).cpp</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Identity).cpp</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)slang-generate.exe</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)slang-generate.exe</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)slang-generate.exe</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)slang-generate.exe</AdditionalInputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command> + <Outputs>%(Identity).h</Outputs> + <Message>slang-generate %(Identity)</Message> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs> </CustomBuild> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\core\core.vcxproj"> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index 90b542551..991fe9c44 100644 --- a/source/slang/slang.vcxproj.filters +++ b/source/slang/slang.vcxproj.filters @@ -1,93 +1,271 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Natvis Include="slang.natvis" /> - <Natvis Include="..\core\core.natvis" /> + <Filter Include="Header Files"> + <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="compiler.h" /> - <ClInclude Include="diagnostic-defs.h" /> - <ClInclude Include="diagnostics.h" /> - <ClInclude Include="emit.h" /> - <ClInclude Include="lexer.h" /> - <ClInclude Include="lookup.h" /> - <ClInclude Include="parameter-binding.h" /> - <ClInclude Include="parser.h" /> - <ClInclude Include="preprocessor.h" /> - <ClInclude Include="profile.h" /> - <ClInclude Include="profile-defs.h" /> - <ClInclude Include="reflection.h" /> - <ClInclude Include="source-loc.h" /> - <ClInclude Include="syntax.h" /> - <ClInclude Include="syntax-visitors.h" /> - <ClInclude Include="token.h" /> - <ClInclude Include="token-defs.h" /> - <ClInclude Include="type-layout.h" /> - <ClInclude Include="..\..\slang.h" /> - <ClInclude Include="syntax-defs.h" /> - <ClInclude Include="decl-defs.h" /> - <ClInclude Include="expr-defs.h" /> - <ClInclude Include="modifier-defs.h" /> - <ClInclude Include="stmt-defs.h" /> - <ClInclude Include="object-meta-begin.h" /> - <ClInclude Include="object-meta-end.h" /> - <ClInclude Include="syntax-base-defs.h" /> - <ClInclude Include="type-defs.h" /> - <ClInclude Include="val-defs.h" /> - <ClInclude Include="visitor.h" /> - <ClInclude Include="name.h" /> - <ClInclude Include="ir.h" /> - <ClInclude Include="lower-to-ir.h" /> - <ClInclude Include="ir-inst-defs.h" /> - <ClInclude Include="ir-insts.h" /> - <ClInclude Include="bytecode.h" /> - <ClInclude Include="vm.h" /> - <ClInclude Include="mangle.h" /> - <ClInclude Include="legalize-types.h" /> - <ClInclude Include="ir-ssa.h" /> - <ClInclude Include="memory_pool.h" /> - <ClInclude Include="ir-constexpr.h" /> - <ClInclude Include="type-system-shared.h" /> - <ClInclude Include="ir-validate.h" /> - <ClInclude Include="ir-dominators.h" /> + <ClInclude Include="..\..\slang.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="bytecode.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="compiler.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="core.meta.slang.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="decl-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="diagnostic-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="diagnostics.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="emit.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="expr-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="glsl.meta.slang.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="hlsl.meta.slang.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-constexpr.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-dominators.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-inst-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-insts.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-ssa.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir-validate.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="ir.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="legalize-types.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="lexer.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="lookup.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="lower-to-ir.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="mangle.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="memory_pool.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="modifier-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="name.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="object-meta-begin.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="object-meta-end.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="parameter-binding.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="parser.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="preprocessor.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="profile-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="profile.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="reflection.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="source-loc.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="stmt-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="syntax-base-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="syntax-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="syntax-visitors.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="syntax.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="token-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="token.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="type-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="type-layout.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="type-system-shared.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="val-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="visitor.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vm.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="check.cpp" /> - <ClCompile Include="compiler.cpp" /> - <ClCompile Include="diagnostics.cpp" /> - <ClCompile Include="emit.cpp" /> - <ClCompile Include="lexer.cpp" /> - <ClCompile Include="lookup.cpp" /> - <ClCompile Include="parameter-binding.cpp" /> - <ClCompile Include="parser.cpp" /> - <ClCompile Include="preprocessor.cpp" /> - <ClCompile Include="profile.cpp" /> - <ClCompile Include="reflection.cpp" /> - <ClCompile Include="slang.cpp" /> - <ClCompile Include="slang-stdlib.cpp" /> - <ClCompile Include="syntax.cpp" /> - <ClCompile Include="token.cpp" /> - <ClCompile Include="type-layout.cpp" /> - <ClCompile Include="options.cpp" /> - <ClCompile Include="source-loc.cpp" /> - <ClCompile Include="name.cpp" /> - <ClCompile Include="ir.cpp" /> - <ClCompile Include="lower-to-ir.cpp" /> - <ClCompile Include="bytecode.cpp" /> - <ClCompile Include="vm.cpp" /> - <ClCompile Include="mangle.cpp" /> - <ClCompile Include="dxc-support.cpp" /> - <ClCompile Include="ir-legalize-types.cpp" /> - <ClCompile Include="legalize-types.cpp" /> - <ClCompile Include="ir-ssa.cpp" /> - <ClCompile Include="memory_pool.cpp" /> - <ClCompile Include="ir-constexpr.cpp" /> - <ClCompile Include="type-system-shared.cpp" /> - <ClCompile Include="ir-validate.cpp" /> - <ClCompile Include="ir-dominators.cpp" /> + <ClCompile Include="bytecode.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="check.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="compiler.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="diagnostics.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="dxc-support.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="emit.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir-constexpr.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir-dominators.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir-legalize-types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir-ssa.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir-validate.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="ir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="legalize-types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="lexer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="lookup.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="lower-to-ir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="mangle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="memory_pool.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="name.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="options.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="parameter-binding.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="parser.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="preprocessor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="profile.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="reflection.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-stdlib.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="source-loc.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="syntax.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="token.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="type-layout.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="type-system-shared.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="vm.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="core.meta.slang" /> - <CustomBuild Include="hlsl.meta.slang" /> + <None Include="slang.natvis"> + <Filter>Source Files</Filter> + </None> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="core.meta.slang"> + <Filter>Source Files</Filter> + </CustomBuild> + <CustomBuild Include="hlsl.meta.slang"> + <Filter>Source Files</Filter> + </CustomBuild> </ItemGroup> </Project>
\ No newline at end of file diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp index 391642c3e..376b75212 100644 --- a/source/slangc/main.cpp +++ b/source/slangc/main.cpp @@ -1,6 +1,5 @@ // main.cpp -#define SLANG_DYNAMIC #include "../../slang.h" SLANG_API void spSetCommandLineCompilerMode(SlangCompileRequest* request); diff --git a/source/slangc/slangc.vcxproj b/source/slangc/slangc.vcxproj index 4855b7373..77a7dcea5 100644 --- a/source/slangc/slangc.vcxproj +++ b/source/slangc/slangc.vcxproj @@ -20,81 +20,87 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> <RootNamespace>slangc</RootNamespace> - <ProjectName>slangc</ProjectName> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slangc\</IntDir> + <TargetName>slangc</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slangc\</IntDir> + <TargetName>slangc</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slangc\</IntDir> + <TargetName>slangc</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slangc\</IntDir> + <TargetName>slangc</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -103,15 +109,12 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -120,57 +123,51 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> - <MultiProcessorCompilation>false</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\core\core.vcxproj"> - <Project>{f9be7957-8399-899e-0c49-e714fddd4b65}</Project> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> </ProjectReference> <ProjectReference Include="..\slang\slang.vcxproj"> - <Project>{db00da62-0533-4afd-b59f-a67d5b3a0808}</Project> + <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project> </ProjectReference> </ItemGroup> - <ItemGroup> - <ClCompile Include="main.cpp" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/source/slangc/slangc.vcxproj.filters b/source/slangc/slangc.vcxproj.filters index 0d8d9e457..e9ae1c092 100644 --- a/source/slangc/slangc.vcxproj.filters +++ b/source/slangc/slangc.vcxproj.filters @@ -1,17 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/tools/eval-test/eval-test.vcxproj.filters b/tools/eval-test/eval-test.vcxproj.filters deleted file mode 100644 index 0d8d9e457..000000000 --- a/tools/eval-test/eval-test.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="main.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/tools/render-test/render-test.vcxproj b/tools/render-test/render-test.vcxproj index 9889ba979..eabb11615 100644 --- a/tools/render-test/render-test.vcxproj +++ b/tools/render-test/render-test.vcxproj @@ -5,14 +5,14 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,89 +20,89 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{96610759-07B9-4EEB-A974-5C634A2E742B}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>rendertest</RootNamespace> + <RootNamespace>render-test</RootNamespace> <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\;$(SolutionDir);$(IncludePath)</IncludePath> - <LibraryPath>$(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath)</LibraryPath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\render-test\</IntDir> + <TargetName>render-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\;$(SolutionDir);$(IncludePath)</IncludePath> - <LibraryPath>$(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath)</LibraryPath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\render-test\</IntDir> + <TargetName>render-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\;$(SolutionDir);$(IncludePath)</IncludePath> - <LibraryPath>$(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath)</LibraryPath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\render-test\</IntDir> + <TargetName>render-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\;$(SolutionDir);$(IncludePath)</IncludePath> - <LibraryPath>$(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath)</LibraryPath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\render-test\</IntDir> + <TargetName>render-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -111,14 +111,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -127,68 +126,43 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="circular-resource-heap-d3d12.cpp" /> - <ClCompile Include="d3d-util.cpp" /> - <ClCompile Include="descriptor-heap-d3d12.cpp" /> - <ClCompile Include="main.cpp" /> - <ClCompile Include="options.cpp" /> - <ClCompile Include="png-serialize-util.cpp" /> - <ClCompile Include="render-d3d11.cpp" /> - <ClCompile Include="render-d3d12.cpp" /> - <ClCompile Include="render-gl.cpp" /> - <ClCompile Include="render-vk.cpp" /> - <ClCompile Include="render.cpp" /> - <ClCompile Include="resource-d3d12.cpp" /> - <ClCompile Include="shader-input-layout.cpp" /> - <ClCompile Include="shader-renderer-util.cpp" /> - <ClCompile Include="slang-support.cpp" /> - <ClCompile Include="surface.cpp" /> - <ClCompile Include="vk-api.cpp" /> - <ClCompile Include="vk-device-queue.cpp" /> - <ClCompile Include="vk-module.cpp" /> - <ClCompile Include="vk-swap-chain.cpp" /> - <ClCompile Include="vk-util.cpp" /> - </ItemGroup> - <ItemGroup> <ClInclude Include="circular-resource-heap-d3d12.h" /> <ClInclude Include="d3d-util.h" /> <ClInclude Include="descriptor-heap-d3d12.h" /> @@ -212,11 +186,34 @@ <ClInclude Include="window.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="circular-resource-heap-d3d12.cpp" /> + <ClCompile Include="d3d-util.cpp" /> + <ClCompile Include="descriptor-heap-d3d12.cpp" /> + <ClCompile Include="main.cpp" /> + <ClCompile Include="options.cpp" /> + <ClCompile Include="png-serialize-util.cpp" /> + <ClCompile Include="render-d3d11.cpp" /> + <ClCompile Include="render-d3d12.cpp" /> + <ClCompile Include="render-gl.cpp" /> + <ClCompile Include="render-vk.cpp" /> + <ClCompile Include="render.cpp" /> + <ClCompile Include="resource-d3d12.cpp" /> + <ClCompile Include="shader-input-layout.cpp" /> + <ClCompile Include="shader-renderer-util.cpp" /> + <ClCompile Include="slang-support.cpp" /> + <ClCompile Include="surface.cpp" /> + <ClCompile Include="vk-api.cpp" /> + <ClCompile Include="vk-device-queue.cpp" /> + <ClCompile Include="vk-module.cpp" /> + <ClCompile Include="vk-swap-chain.cpp" /> + <ClCompile Include="vk-util.cpp" /> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\source\core\core.vcxproj"> - <Project>{f9be7957-8399-899e-0c49-e714fddd4b65}</Project> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> </ProjectReference> <ProjectReference Include="..\..\source\slang\slang.vcxproj"> - <Project>{db00da62-0533-4afd-b59f-a67d5b3a0808}</Project> + <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/tools/render-test/render-test.vcxproj.filters b/tools/render-test/render-test.vcxproj.filters index a8453035b..b2f48a397 100644 --- a/tools/render-test/render-test.vcxproj.filters +++ b/tools/render-test/render-test.vcxproj.filters @@ -1,147 +1,141 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> + <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier> </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="main.cpp"> + <ClInclude Include="circular-resource-heap-d3d12.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="d3d-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="descriptor-heap-d3d12.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="options.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="png-serialize-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render-d3d11.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render-d3d12.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render-gl.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render-vk.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="resource-d3d12.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="shader-input-layout.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="shader-renderer-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="slang-support.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="surface.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vk-api.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vk-device-queue.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vk-module.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vk-swap-chain.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="vk-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="window.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="circular-resource-heap-d3d12.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="render-d3d11.cpp"> + <ClCompile Include="d3d-util.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="options.cpp"> + <ClCompile Include="descriptor-heap-d3d12.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="render-gl.cpp"> + <ClCompile Include="main.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-support.cpp"> + <ClCompile Include="options.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="shader-input-layout.cpp"> + <ClCompile Include="png-serialize-util.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="render-vk.cpp"> + <ClCompile Include="render-d3d11.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="render-d3d12.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="d3d-util.cpp"> + <ClCompile Include="render-gl.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="resource-d3d12.cpp"> + <ClCompile Include="render-vk.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="circular-resource-heap-d3d12.cpp"> + <ClCompile Include="render.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="descriptor-heap-d3d12.cpp"> + <ClCompile Include="resource-d3d12.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="render.cpp"> + <ClCompile Include="shader-input-layout.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="shader-renderer-util.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="vk-api.cpp"> + <ClCompile Include="slang-support.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="vk-module.cpp"> + <ClCompile Include="surface.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="vk-swap-chain.cpp"> + <ClCompile Include="vk-api.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="vk-device-queue.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="vk-util.cpp"> + <ClCompile Include="vk-module.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="surface.cpp"> + <ClCompile Include="vk-swap-chain.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="png-serialize-util.cpp"> + <ClCompile Include="vk-util.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> - <ItemGroup> - <ClInclude Include="options.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render-d3d11.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render-gl.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="window.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="slang-support.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="shader-input-layout.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render-vk.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render-d3d12.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="d3d-util.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="resource-d3d12.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="circular-resource-heap-d3d12.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="descriptor-heap-d3d12.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="shader-renderer-util.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="vk-api.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="vk-module.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="vk-swap-chain.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="vk-device-queue.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="vk-util.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="surface.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="png-serialize-util.h"> - <Filter>Source Files</Filter> - </ClInclude> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/tools/eval-test/main.cpp b/tools/slang-eval-test/main.cpp index e01d4441b..e01d4441b 100644 --- a/tools/eval-test/main.cpp +++ b/tools/slang-eval-test/main.cpp diff --git a/tools/eval-test/eval-test.vcxproj b/tools/slang-eval-test/slang-eval-test.vcxproj index 83f25b1df..c7b214d4a 100644 --- a/tools/eval-test/eval-test.vcxproj +++ b/tools/slang-eval-test/slang-eval-test.vcxproj @@ -5,14 +5,14 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,83 +20,88 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{205FCAB9-A13F-4980-86FA-F6221A7095EE}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>evaltest</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - <ProjectName>slang-eval-test</ProjectName> + <RootNamespace>slang-eval-test</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang-eval-test\</IntDir> + <TargetName>slang-eval-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang-eval-test\</IntDir> + <TargetName>slang-eval-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang-eval-test\</IntDir> + <TargetName>slang-eval-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang-eval-test\</IntDir> + <TargetName>slang-eval-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -105,11 +110,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -118,44 +125,51 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="main.cpp" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\..\source\core\core.vcxproj"> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> + </ProjectReference> <ProjectReference Include="..\..\source\slang\slang.vcxproj"> - <Project>{db00da62-0533-4afd-b59f-a67d5b3a0808}</Project> + <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/tools/slang-eval-test/slang-eval-test.vcxproj.filters b/tools/slang-eval-test/slang-eval-test.vcxproj.filters new file mode 100644 index 000000000..e9ae1c092 --- /dev/null +++ b/tools/slang-eval-test/slang-eval-test.vcxproj.filters @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/tools/slang-generate/slang-generate.vcxproj b/tools/slang-generate/slang-generate.vcxproj index 2293fc65b..39bcef167 100644 --- a/tools/slang-generate/slang-generate.vcxproj +++ b/tools/slang-generate/slang-generate.vcxproj @@ -5,14 +5,14 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,78 +20,86 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{66174227-8541-41FC-A6DF-4764FC66F78E}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>slanggenerate</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <RootNamespace>slang-generate</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang-generate\</IntDir> + <TargetName>slang-generate</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang-generate\</IntDir> + <TargetName>slang-generate</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang-generate\</IntDir> + <TargetName>slang-generate</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang-generate\</IntDir> + <TargetName>slang-generate</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> @@ -101,11 +109,11 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> @@ -115,38 +123,38 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -154,7 +162,7 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\source\core\core.vcxproj"> - <Project>{f9be7957-8399-899e-0c49-e714fddd4b65}</Project> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/tools/slang-generate/slang-generate.vcxproj.filters b/tools/slang-generate/slang-generate.vcxproj.filters index 0d8d9e457..e9ae1c092 100644 --- a/tools/slang-generate/slang-generate.vcxproj.filters +++ b/tools/slang-generate/slang-generate.vcxproj.filters @@ -1,17 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/tools/slang-reflection-test/slang-reflection-test.vcxproj b/tools/slang-reflection-test/slang-reflection-test.vcxproj index 5ac386d57..78e562401 100644 --- a/tools/slang-reflection-test/slang-reflection-test.vcxproj +++ b/tools/slang-reflection-test/slang-reflection-test.vcxproj @@ -5,14 +5,14 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,82 +20,88 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{22C45F4F-FB6B-4535-BED1-D3F5D0C71047}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>slangreflectiontest</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <RootNamespace>slang-reflection-test</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang-reflection-test\</IntDir> + <TargetName>slang-reflection-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang-reflection-test\</IntDir> + <TargetName>slang-reflection-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang-reflection-test\</IntDir> + <TargetName>slang-reflection-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang-reflection-test\</IntDir> + <TargetName>slang-reflection-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -104,11 +110,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -117,36 +125,40 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -154,7 +166,7 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\source\slang\slang.vcxproj"> - <Project>{db00da62-0533-4afd-b59f-a67d5b3a0808}</Project> + <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters index 0d8d9e457..e9ae1c092 100644 --- a/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters +++ b/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters @@ -1,17 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> 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 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> <Platform>x64</Platform> @@ -20,84 +20,88 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{0C768A18-1D25-4000-9F37-DA5FE99E3B64}</ProjectGuid> + <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename> <Keyword>Win32Proj</Keyword> - <RootNamespace>slang_test</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <RootNamespace>slang-test</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x86\debug\slang-test\</IntDir> + <TargetName>slang-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\debug\</OutDir> + <IntDir>..\..\intermediate\windows-x64\debug\slang-test\</IntDir> + <TargetName>slang-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x86\release\</OutDir> + <IntDir>..\..\intermediate\windows-x86\release\slang-test\</IntDir> + <TargetName>slang-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir);$(IncludePath)</IncludePath> + <OutDir>..\..\bin\windows-x64\release\</OutDir> + <IntDir>..\..\intermediate\windows-x64\release\slang-test\</IntDir> + <TargetName>slang-test</TargetName> + <TargetExt>.exe</TargetExt> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -106,13 +110,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -121,54 +125,54 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> <ItemGroup> + <ClInclude Include="os.h" /> + <ClInclude Include="render-api-util.h" /> + </ItemGroup> + <ItemGroup> <ClCompile Include="main.cpp" /> <ClCompile Include="os.cpp" /> <ClCompile Include="render-api-util.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="os.h" /> - <ClInclude Include="render-api-util.h" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\..\source\core\core.vcxproj"> - <Project>{f9be7957-8399-899e-0c49-e714fddd4b65}</Project> + <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 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,20 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> + <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier> </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Filter Include="Source Files"> + <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include="os.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="render-api-util.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="main.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -25,12 +27,4 @@ <Filter>Source Files</Filter> </ClCompile> </ItemGroup> - <ItemGroup> - <ClInclude Include="os.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="render-api-util.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> </Project>
\ No newline at end of file |