diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-06-13 15:03:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 15:03:01 -0400 |
| commit | 84c42000cbe92e7a4d1fcc3740ef6c41cdc5ee0b (patch) | |
| tree | 4fcb0bb6de6122e92de95042b90cfe7d5e3956f4 /source/core/windows | |
| parent | 503721047731e8f6566bc51d6eadc7d24161c129 (diff) | |
Runtime C++ compiling and testing on Unix-like targets (#981)
* Work in progress to be able to invoke VS from within code.
* First pass at windows version of refactor of OSProcessSpawner
* Closer to getting VS path lookup working.
* Make OSString assignable/ctor able
* Work out program files directory directly, so don't have to expand %%.
* WIP: Improve handling of process spawning.
* Add support for splitting input by line.
* * Correctly locates visual studio install
* Added functionality to invoke vs via cmd
* Add option to execute the command line.
* Handle in ProcessUtil for windows -> WinHandle.
* Rename files slang-win-visual-studio-util.cpp/.h and slang-process-util.h
* First pass at unix/linux version of ProcessUtil.
* Fix reading Visual Studio path from the registry.
* Get compiling on linux with.
* Fix vcvarsall.bat name
* Use ProcessUtil to execute external code.
* Remove OSProcessSpawner.
* Remove includes for "os.h" where no longer needed.
* Fix tabbing issue in premake5.lua
Remove test code from slang-test-main.cpp
* Fix premake4.lua tabbing issue.
* Small fixes to slang-process-util.h
Init ExecuteResult on Win execute.
* Improve comments.
* Fix bug in StringUtil::calcLines - with oddly terminated source input being able to read past end.
Make slang-generate use StringUtil over it's own impl.
* Fix off by one bug in working out Visual Studio version.
* Fix bug in calculating Visual Studio Version
* Fix compilation on linux with string parameter being passed to messageFormat.
* Remove erroneous use of kOSError codes - use Result.
* First effort to generate standard compiler options.
* Initial efforts in compiling source code in test framework for VisualStudio.
* Testing compiling c code on VisualStudio on Windows.
* Fix warning on linux.
* Fix clang on linux warning (and therefore failing) returning a StringBuilder as String.
* Disable return-std-move on clang.
* CommandLine arguments are now tagged if they are escaped or not. That it is the clients responsibility to escape command lines that cannot be automatically escaped.
* Add checks on unix/linux that command line args are all unescaped.
* WIP getting runtime GCC to work.
* First pass compiler working on unix-like targets.
* Enable c-compile.c test on 'smoke'.
Diffstat (limited to 'source/core/windows')
| -rw-r--r-- | source/core/windows/slang-win-visual-studio-util.h | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/source/core/windows/slang-win-visual-studio-util.h b/source/core/windows/slang-win-visual-studio-util.h index fefb9ad0f..e8afbf418 100644 --- a/source/core/windows/slang-win-visual-studio-util.h +++ b/source/core/windows/slang-win-visual-studio-util.h @@ -6,48 +6,9 @@ #include "../slang-process-util.h" -namespace Slang { - -struct CPPCompileOptions -{ - enum class OptimizationLevel - { - Normal, ///< Normal optimization - Debug, ///< General has no optimizations - }; - - enum DebugInfoType - { - None, ///< Binary has no debug information - Maximum, ///< Has maximum debug information - Normal, ///< Has normal debug information - }; - enum TargetType - { - Executable, ///< Produce an executable - SharedLibrary, ///< Produce a shared library object/dll - Object, ///< Produce an object file - }; +#include "../slang-cpp-compiler.h" - struct Define - { - String nameWithSig; ///< If macro takes parameters include in brackets - String value; - }; - - OptimizationLevel optimizationLevel = OptimizationLevel::Debug; - DebugInfoType debugInfoType = DebugInfoType::Normal; - TargetType targetType = TargetType::Executable; - - String modulePath; ///< The path/name of the output module. Should not have the extension, as that will be added for each of the target types - - List<Define> defines; - - List<String> sourceFiles; - - List<String> includePaths; - List<String> libraryPaths; -}; +namespace Slang { struct WinVisualStudioUtil { |
