From e2c2c220c642cc5f1c622f909d0ddfd22e6c04d4 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Fri, 11 May 2018 16:34:19 -0700 Subject: Generate Visual Studio projects using Premake (#557) * Generate Visual Studio projects using Premake This change adds a `premake5.lua` file that allows us to generate our Visual Studio solution using Premake 5 (https://premake.github.io/). The existing Visual Studio solution/projects are now replaced with the Premake-generated ones, and project contributors will be expected to update these by running premake after adding/removing files. I have *not* changed the Linux `Makefile` build at all, because that file is also used for things like running our tests, so that clobbering it with a premake-generated `Makefile` would break our continuous testing. Hopefully future changes can switch to a generated `Makefile` and perhaps even add an XCode project as well. Notes: * The `build/slang-build.props` file is no longer needed/used, so it has been removed. * The `slang-eval-test` test fixture wasn't following our naming conventions for its directory path, so it was updated to streamline the Premake build configuration work. This required changes to the `Makefile` as well * Some seemingly unncessary preprocessor definitions that were specified for `core` and `slang-glslang` have been dropped. We will see if anything breaks from that. * Possible fixup for Premake vpath issue Premake's `vpath` feature seems to be nondeterministic about the order it applies filters (because Lua isn't deterministic about the order of entries in a key/value table), and as a result we can end up in a weird case where it decides that a `foo.cpp.h` file matches the `**.cpp` filter (I'm not sure why) before it tests against the `**.h` filter. This change uses an (undocumented) Premake facility to set `vpath` using a list of singleton tables, which seems to fix the order in which things get tested. * Remove support for "single-file" build of Slang The `hello` example was the only bit of code that uses the "single-file" way of building Slang, and this had already run up against limitations of the Visual Studio compilers in its Debug|x64 build. Rather than mess with Premake to make it pass through the `/bigobj` linker flag that is needed to work around the issue, it makes more sense just to stop using/supporting the feature since we wouldn't want users to depend on it anyway (our documentation no longer refers to it). While I was at it I went ahead and made sure that the `SLANG_DYNAMIC` flag doesn't need to be set manually, so that instead there is a non-default `SLANG_STATIC` option (not that we have a static-library build of Slang at the moment). --- tools/eval-test/eval-test.vcxproj | 164 ------------------- tools/eval-test/eval-test.vcxproj.filters | 22 --- tools/eval-test/main.cpp | 133 --------------- tools/render-test/render-test.vcxproj | 155 +++++++++--------- tools/render-test/render-test.vcxproj.filters | 180 ++++++++++----------- tools/slang-eval-test/main.cpp | 133 +++++++++++++++ tools/slang-eval-test/slang-eval-test.vcxproj | 178 ++++++++++++++++++++ .../slang-eval-test.vcxproj.filters | 13 ++ tools/slang-generate/slang-generate.vcxproj | 88 +++++----- .../slang-generate/slang-generate.vcxproj.filters | 13 +- .../slang-reflection-test.vcxproj | 100 +++++++----- .../slang-reflection-test.vcxproj.filters | 13 +- tools/slang-test/slang-test.vcxproj | 116 ++++++------- tools/slang-test/slang-test.vcxproj.filters | 30 ++-- 14 files changed, 667 insertions(+), 671 deletions(-) delete mode 100644 tools/eval-test/eval-test.vcxproj delete mode 100644 tools/eval-test/eval-test.vcxproj.filters delete mode 100644 tools/eval-test/main.cpp create mode 100644 tools/slang-eval-test/main.cpp create mode 100644 tools/slang-eval-test/slang-eval-test.vcxproj create mode 100644 tools/slang-eval-test/slang-eval-test.vcxproj.filters (limited to 'tools') diff --git a/tools/eval-test/eval-test.vcxproj b/tools/eval-test/eval-test.vcxproj deleted file mode 100644 index 83f25b1df..000000000 --- a/tools/eval-test/eval-test.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {205FCAB9-A13F-4980-86FA-F6221A7095EE} - Win32Proj - evaltest - 8.1 - slang-eval-test - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir);$(IncludePath) - - - true - $(SolutionDir);$(IncludePath) - - - false - $(SolutionDir);$(IncludePath) - - - false - $(SolutionDir);$(IncludePath) - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - {db00da62-0533-4afd-b59f-a67d5b3a0808} - - - - - - \ No newline at end of file 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 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/eval-test/main.cpp b/tools/eval-test/main.cpp deleted file mode 100644 index e01d4441b..000000000 --- a/tools/eval-test/main.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// main.cpp - -#include -#include -#include -#include "../../source/core/secure-crt.h" -#include - -int main( - int argc, - char** argv) -{ - // TODO: parse arguments - - assert(argc >= 2); - char const* inputPath = argv[1]; - - // Slurp in the input file, so that we can compile and run it - FILE* inputFile; - fopen_s(&inputFile, inputPath, "rb"); - assert(inputFile); - - fseek(inputFile, 0, SEEK_END); - size_t inputSize = ftell(inputFile); - fseek(inputFile, 0, SEEK_SET); - - char* inputText = (char*) malloc(inputSize + 1); - fread(inputText, inputSize, 1, inputFile); - inputText[inputSize] = 0; - fclose(inputFile); - - // TODO: scan through the text to find comments, - // that instruct us how to generate input and - // consume output when running the test. - - // - - SlangSession* session = spCreateSession(nullptr); - SlangCompileRequest* request = spCreateCompileRequest(session); - - spSetOutputContainerFormat( - request, - SLANG_CONTAINER_FORMAT_SLANG_MODULE); - - int translationUnitIndex = spAddTranslationUnit( - request, - SLANG_SOURCE_LANGUAGE_SLANG, - nullptr); - - spAddTranslationUnitSourceString( - request, - translationUnitIndex, - inputPath, - inputText); - - int entryPointIndex = spAddEntryPoint( - request, - translationUnitIndex, - "main", - spFindProfile(session, "cs_5_0")); - - if( spCompile(request) != 0 ) - { - char const* output = spGetDiagnosticOutput(request); - fputs(output, stderr); - exit(1); - } - - // Things compiled, so now we need to run them... - - // Extract the bytecode - size_t bytecodeSize = 0; - void const* bytecode = spGetCompileRequestCode(request, &bytecodeSize); - - // Now we need to create an execution context to go and run the bytecode we got - - SlangVM* vm = SlangVM_create(); - - SlangVMModule* vmModule = SlangVMModule_load( - vm, - bytecode, - bytecodeSize); - - SlangVMFunc* vmFunc = (SlangVMFunc*)SlangVMModule_findGlobalSymbolPtr( - vmModule, - "main"); - - int32_t*& inputArg = *(int32_t**)SlangVMModule_findGlobalSymbolPtr( - vmModule, - "input"); - - int32_t*& outputArg = *(int32_t**)SlangVMModule_findGlobalSymbolPtr( - vmModule, - "output"); - - SlangVMThread* vmThread = SlangVMThread_create( - vm); - - int32_t inputData[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; - int32_t outputData[8] = { 0 }; - - inputArg = inputData; - outputArg = outputData; - - // TODO: set arguments based on specification from the user... - for (uint32_t threadID = 0; threadID < 8; ++threadID) - { -#if 0 - fprintf(stderr, "\n\nthreadID = %u\n\n", threadID); - fflush(stderr); -#endif - - SlangVMThread_beginCall(vmThread, vmFunc); - - SlangVMThread_setArg( - vmThread, - 0, - &threadID, - sizeof(threadID)); - - SlangVMThread_resume(vmThread); - } - - for (uint32_t ii = 0; ii < 8; ++ii) - { - fprintf(stdout, "outputData[%u] = %d\n", ii, outputData[ii]); - } - - spDestroyCompileRequest(request); - spDestroySession(session); - - return 0; -} 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 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,89 +20,89 @@ {96610759-07B9-4EEB-A974-5C634A2E742B} + true Win32Proj - rendertest + render-test 10.0.14393.0 Application true - v140 Unicode - - - Application - false v140 - true - Unicode Application true + Unicode v140 + + + Application + false Unicode + v140 Application false - v140 - true Unicode + v140 - - - - + - - + - - true - $(SolutionDir)external\;$(SolutionDir);$(IncludePath) - $(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath) + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\render-test\ + render-test + .exe true - $(SolutionDir)external\;$(SolutionDir);$(IncludePath) - $(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath) + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\render-test\ + render-test + .exe false - $(SolutionDir)external\;$(SolutionDir);$(IncludePath) - $(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath) + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\render-test\ + render-test + .exe false - $(SolutionDir)external\;$(SolutionDir);$(IncludePath) - $(SolutionDir)external\vulkan\lib\windows-$(PlatformShortName)\;$(LibraryPath) + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\render-test\ + render-test + .exe - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ../../source/ MultiThreadedDebug - true Console @@ -111,14 +111,13 @@ - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ../../source/ MultiThreadedDebug - true Console @@ -127,67 +126,42 @@ + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories) + Full true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ../../source/ + false + true MultiThreaded - true Console true true - true + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;%(AdditionalIncludeDirectories) + Full true true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ../../source/ + false + true MultiThreaded - true Console true true - true - - - - - - - - - - - - - - - - - - - - - - - @@ -211,12 +185,35 @@ + + + + + + + + + + + + + + + + + + + + + + + - {f9be7957-8399-899e-0c49-e714fddd4b65} + {F9BE7957-8399-899E-0C49-E714FDDD4B65} - {db00da62-0533-4afd-b59f-a67d5b3a0808} + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} 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 @@ - + - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files Source Files - + Source Files - + Source Files - + Source Files Source Files - + Source Files - + Source Files - + Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - \ No newline at end of file diff --git a/tools/slang-eval-test/main.cpp b/tools/slang-eval-test/main.cpp new file mode 100644 index 000000000..e01d4441b --- /dev/null +++ b/tools/slang-eval-test/main.cpp @@ -0,0 +1,133 @@ +// main.cpp + +#include +#include +#include +#include "../../source/core/secure-crt.h" +#include + +int main( + int argc, + char** argv) +{ + // TODO: parse arguments + + assert(argc >= 2); + char const* inputPath = argv[1]; + + // Slurp in the input file, so that we can compile and run it + FILE* inputFile; + fopen_s(&inputFile, inputPath, "rb"); + assert(inputFile); + + fseek(inputFile, 0, SEEK_END); + size_t inputSize = ftell(inputFile); + fseek(inputFile, 0, SEEK_SET); + + char* inputText = (char*) malloc(inputSize + 1); + fread(inputText, inputSize, 1, inputFile); + inputText[inputSize] = 0; + fclose(inputFile); + + // TODO: scan through the text to find comments, + // that instruct us how to generate input and + // consume output when running the test. + + // + + SlangSession* session = spCreateSession(nullptr); + SlangCompileRequest* request = spCreateCompileRequest(session); + + spSetOutputContainerFormat( + request, + SLANG_CONTAINER_FORMAT_SLANG_MODULE); + + int translationUnitIndex = spAddTranslationUnit( + request, + SLANG_SOURCE_LANGUAGE_SLANG, + nullptr); + + spAddTranslationUnitSourceString( + request, + translationUnitIndex, + inputPath, + inputText); + + int entryPointIndex = spAddEntryPoint( + request, + translationUnitIndex, + "main", + spFindProfile(session, "cs_5_0")); + + if( spCompile(request) != 0 ) + { + char const* output = spGetDiagnosticOutput(request); + fputs(output, stderr); + exit(1); + } + + // Things compiled, so now we need to run them... + + // Extract the bytecode + size_t bytecodeSize = 0; + void const* bytecode = spGetCompileRequestCode(request, &bytecodeSize); + + // Now we need to create an execution context to go and run the bytecode we got + + SlangVM* vm = SlangVM_create(); + + SlangVMModule* vmModule = SlangVMModule_load( + vm, + bytecode, + bytecodeSize); + + SlangVMFunc* vmFunc = (SlangVMFunc*)SlangVMModule_findGlobalSymbolPtr( + vmModule, + "main"); + + int32_t*& inputArg = *(int32_t**)SlangVMModule_findGlobalSymbolPtr( + vmModule, + "input"); + + int32_t*& outputArg = *(int32_t**)SlangVMModule_findGlobalSymbolPtr( + vmModule, + "output"); + + SlangVMThread* vmThread = SlangVMThread_create( + vm); + + int32_t inputData[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; + int32_t outputData[8] = { 0 }; + + inputArg = inputData; + outputArg = outputData; + + // TODO: set arguments based on specification from the user... + for (uint32_t threadID = 0; threadID < 8; ++threadID) + { +#if 0 + fprintf(stderr, "\n\nthreadID = %u\n\n", threadID); + fflush(stderr); +#endif + + SlangVMThread_beginCall(vmThread, vmFunc); + + SlangVMThread_setArg( + vmThread, + 0, + &threadID, + sizeof(threadID)); + + SlangVMThread_resume(vmThread); + } + + for (uint32_t ii = 0; ii < 8; ++ii) + { + fprintf(stdout, "outputData[%u] = %d\n", ii, outputData[ii]); + } + + spDestroyCompileRequest(request); + spDestroySession(session); + + return 0; +} diff --git a/tools/slang-eval-test/slang-eval-test.vcxproj b/tools/slang-eval-test/slang-eval-test.vcxproj new file mode 100644 index 000000000..c7b214d4a --- /dev/null +++ b/tools/slang-eval-test/slang-eval-test.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {205FCAB9-A13F-4980-86FA-F6221A7095EE} + true + Win32Proj + slang-eval-test + + + + Application + true + Unicode + v140 + + + Application + true + Unicode + v140 + + + Application + false + Unicode + v140 + + + Application + false + Unicode + v140 + + + + + + + + + + + + + + + + + + + true + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\slang-eval-test\ + slang-eval-test + .exe + + + true + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-eval-test\ + slang-eval-test + .exe + + + false + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-eval-test\ + slang-eval-test + .exe + + + false + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-eval-test\ + slang-eval-test + .exe + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Console + true + + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Console + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Console + true + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Console + true + true + + + + + + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + + + + + \ No newline at end of file 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 @@ + + + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Source Files + + + \ 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 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,78 +20,86 @@ {66174227-8541-41FC-A6DF-4764FC66F78E} + true Win32Proj - slanggenerate - 8.1 + slang-generate Application true - v140 Unicode - - - Application - false v140 - true - Unicode Application true + Unicode v140 + + + Application + false Unicode + v140 Application false - v140 - true Unicode + v140 - - - - + - - + - - true + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\slang-generate\ + slang-generate + .exe true + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-generate\ + slang-generate + .exe false + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-generate\ + slang-generate + .exe false + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-generate\ + slang-generate + .exe - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug @@ -101,11 +109,11 @@ - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug @@ -115,38 +123,38 @@ + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + Full true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded Console true true - true + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + Full true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded Console true true - true @@ -154,7 +162,7 @@ - {f9be7957-8399-899e-0c49-e714fddd4b65} + {F9BE7957-8399-899E-0C49-E714FDDD4B65} 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 @@ - + - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} 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 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,82 +20,88 @@ {22C45F4F-FB6B-4535-BED1-D3F5D0C71047} + true Win32Proj - slangreflectiontest - 8.1 + slang-reflection-test Application true - v140 Unicode - - - Application - false v140 - true - Unicode Application true + Unicode v140 + + + Application + false Unicode + v140 Application false - v140 - true Unicode + v140 - - - - + - - + - - true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\slang-reflection-test\ + slang-reflection-test + .exe true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-reflection-test\ + slang-reflection-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-reflection-test\ + slang-reflection-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-reflection-test\ + slang-reflection-test + .exe - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug Console @@ -104,11 +110,13 @@ - - + NotUsing Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug Console @@ -117,36 +125,40 @@ + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true + MultiThreaded Console true true - true + NotUsing Level3 - - - MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true + MultiThreaded Console true true - true @@ -154,7 +166,7 @@ - {db00da62-0533-4afd-b59f-a67d5b3a0808} + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} 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 @@ - + - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj index 34d9bed40..9524529bb 100644 --- a/tools/slang-test/slang-test.vcxproj +++ b/tools/slang-test/slang-test.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -20,84 +20,88 @@ {0C768A18-1D25-4000-9F37-DA5FE99E3B64} + true Win32Proj - slang_test - 8.1 + slang-test Application true - v140 Unicode - - - Application - false v140 - true - Unicode Application true + Unicode v140 + + + Application + false Unicode + v140 Application false - v140 - true Unicode + v140 - - - - + - - + - - true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\slang-test\ + slang-test + .exe true - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-test\ + slang-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-test\ + slang-test + .exe false - $(SolutionDir);$(IncludePath) + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-test\ + slang-test + .exe - - - Level4 + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - true Console @@ -106,13 +110,13 @@ - - - Level4 + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebug - true Console @@ -121,54 +125,54 @@ - Level4 - - - MaxSpeed + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded - true Console true true - true - Level4 - - - MaxSpeed + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + true MultiThreaded - true Console true true - true + + + + - - - - - {f9be7957-8399-899e-0c49-e714fddd4b65} + {F9BE7957-8399-899E-0C49-E714FDDD4B65} diff --git a/tools/slang-test/slang-test.vcxproj.filters b/tools/slang-test/slang-test.vcxproj.filters index e9342cfd6..f22903aa6 100644 --- a/tools/slang-test/slang-test.vcxproj.filters +++ b/tools/slang-test/slang-test.vcxproj.filters @@ -1,19 +1,21 @@ - + - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + Header Files + + + Header Files + + Source Files @@ -25,12 +27,4 @@ Source Files - - - Header Files - - - Header Files - - \ No newline at end of file -- cgit v1.2.3