From 63871c6cadfa474bf8a6dccdaceaef82c9e2fea7 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Thu, 15 Mar 2018 01:00:15 +0100 Subject: [PATCH] Polished pushing system for Windows --- mk/windows/README.md | 21 ++++++++++++++++++++- mk/windows/vs2015-32/.gitignore | 18 ++++++++++++++++++ mk/windows/vs2015-32/Configurations.txt | 20 -------------------- mk/windows/vs2015-64/.gitignore | 18 ++++++++++++++++++ mk/windows/vs2015-64/Configurations.txt | 20 -------------------- mk/windows/vs2017-32/.gitignore | 18 ++++++++++++++++++ mk/windows/vs2017-32/Configurations.txt | 20 -------------------- mk/windows/vs2017-64/.gitignore | 18 ++++++++++++++++++ mk/windows/vs2017-64/Configurations.txt | 20 -------------------- 9 files changed, 92 insertions(+), 81 deletions(-) create mode 100644 mk/windows/vs2015-32/.gitignore delete mode 100644 mk/windows/vs2015-32/Configurations.txt create mode 100644 mk/windows/vs2015-64/.gitignore delete mode 100644 mk/windows/vs2015-64/Configurations.txt create mode 100644 mk/windows/vs2017-32/.gitignore delete mode 100644 mk/windows/vs2017-32/Configurations.txt create mode 100644 mk/windows/vs2017-64/.gitignore delete mode 100644 mk/windows/vs2017-64/Configurations.txt diff --git a/mk/windows/README.md b/mk/windows/README.md index 9d6b69bb1..2d430d064 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -9,4 +9,23 @@ To build ZetaGlest for the first time: 4. Run `build-zg.bat` in `/mk/windows`. 5. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. -Note: Before pushing changes to this folder or ZetaGlest in general, make sure that you run `delete-all-deps.bat` and `clean-all.bat` before you do so. +Configuration in Visual Studio must be left as "Release", otherwise it won't compile, +but one can still use debugging options by making the following changes in the project properties: + +Debug: + + Optimization=Disabled + Inline Function Expansion: Disabled + Enable Intrinsic Functions: No + Favor Size Or Speed: Neither + Preprocessor: DEBUG instead of NDEBUG + Code Generation->Basic Runtime Checks: Both + +Release: + + Optimization=Full + Inline Function Expansion: Any Suitable + Enable Intrinsic Functions: Yes + Favor Size Or Speed: Favor fast code + Preprocessor: NDEBUG instead of DEBUG + Code Generation->Basic Runtime Checks: Default \ No newline at end of file diff --git a/mk/windows/vs2015-32/.gitignore b/mk/windows/vs2015-32/.gitignore new file mode 100644 index 000000000..b904358e2 --- /dev/null +++ b/mk/windows/vs2015-32/.gitignore @@ -0,0 +1,18 @@ +*.lib +*.exe +*.dll +*.db +*.iobj +*.opendb +*.pdb +*.ipdb +*.map +*.ncb +*.bsc +*.log +*.tlog +*.cache +*.lastbuildstate +*.exp +*.ipch +*.pch \ No newline at end of file diff --git a/mk/windows/vs2015-32/Configurations.txt b/mk/windows/vs2015-32/Configurations.txt deleted file mode 100644 index 6760fbfc2..000000000 --- a/mk/windows/vs2015-32/Configurations.txt +++ /dev/null @@ -1,20 +0,0 @@ -Configuration in Visual Studio must be left as "Release", otherwise it won't compile, -but one can still use debugging options by making the following changes in the project properties: - -Debug: - - Optimization=Disabled - Inline Function Expansion: Disabled - Enable Intrinsic Functions: No - Favor Size Or Speed: Neither - Preprocessor: DEBUG instead of NDEBUG - Code Generation->Basic Runtime Checks: Both - -Release: - - Optimization=Full - Inline Function Expansion: Any Suitable - Enable Intrinsic Functions: Yes - Favor Size Or Speed: Favor fast code - Preprocessor: NDEBUG instead of DEBUG - Code Generation->Basic Runtime Checks: Default \ No newline at end of file diff --git a/mk/windows/vs2015-64/.gitignore b/mk/windows/vs2015-64/.gitignore new file mode 100644 index 000000000..b904358e2 --- /dev/null +++ b/mk/windows/vs2015-64/.gitignore @@ -0,0 +1,18 @@ +*.lib +*.exe +*.dll +*.db +*.iobj +*.opendb +*.pdb +*.ipdb +*.map +*.ncb +*.bsc +*.log +*.tlog +*.cache +*.lastbuildstate +*.exp +*.ipch +*.pch \ No newline at end of file diff --git a/mk/windows/vs2015-64/Configurations.txt b/mk/windows/vs2015-64/Configurations.txt deleted file mode 100644 index 6760fbfc2..000000000 --- a/mk/windows/vs2015-64/Configurations.txt +++ /dev/null @@ -1,20 +0,0 @@ -Configuration in Visual Studio must be left as "Release", otherwise it won't compile, -but one can still use debugging options by making the following changes in the project properties: - -Debug: - - Optimization=Disabled - Inline Function Expansion: Disabled - Enable Intrinsic Functions: No - Favor Size Or Speed: Neither - Preprocessor: DEBUG instead of NDEBUG - Code Generation->Basic Runtime Checks: Both - -Release: - - Optimization=Full - Inline Function Expansion: Any Suitable - Enable Intrinsic Functions: Yes - Favor Size Or Speed: Favor fast code - Preprocessor: NDEBUG instead of DEBUG - Code Generation->Basic Runtime Checks: Default \ No newline at end of file diff --git a/mk/windows/vs2017-32/.gitignore b/mk/windows/vs2017-32/.gitignore new file mode 100644 index 000000000..b904358e2 --- /dev/null +++ b/mk/windows/vs2017-32/.gitignore @@ -0,0 +1,18 @@ +*.lib +*.exe +*.dll +*.db +*.iobj +*.opendb +*.pdb +*.ipdb +*.map +*.ncb +*.bsc +*.log +*.tlog +*.cache +*.lastbuildstate +*.exp +*.ipch +*.pch \ No newline at end of file diff --git a/mk/windows/vs2017-32/Configurations.txt b/mk/windows/vs2017-32/Configurations.txt deleted file mode 100644 index 6760fbfc2..000000000 --- a/mk/windows/vs2017-32/Configurations.txt +++ /dev/null @@ -1,20 +0,0 @@ -Configuration in Visual Studio must be left as "Release", otherwise it won't compile, -but one can still use debugging options by making the following changes in the project properties: - -Debug: - - Optimization=Disabled - Inline Function Expansion: Disabled - Enable Intrinsic Functions: No - Favor Size Or Speed: Neither - Preprocessor: DEBUG instead of NDEBUG - Code Generation->Basic Runtime Checks: Both - -Release: - - Optimization=Full - Inline Function Expansion: Any Suitable - Enable Intrinsic Functions: Yes - Favor Size Or Speed: Favor fast code - Preprocessor: NDEBUG instead of DEBUG - Code Generation->Basic Runtime Checks: Default \ No newline at end of file diff --git a/mk/windows/vs2017-64/.gitignore b/mk/windows/vs2017-64/.gitignore new file mode 100644 index 000000000..b904358e2 --- /dev/null +++ b/mk/windows/vs2017-64/.gitignore @@ -0,0 +1,18 @@ +*.lib +*.exe +*.dll +*.db +*.iobj +*.opendb +*.pdb +*.ipdb +*.map +*.ncb +*.bsc +*.log +*.tlog +*.cache +*.lastbuildstate +*.exp +*.ipch +*.pch \ No newline at end of file diff --git a/mk/windows/vs2017-64/Configurations.txt b/mk/windows/vs2017-64/Configurations.txt deleted file mode 100644 index 6760fbfc2..000000000 --- a/mk/windows/vs2017-64/Configurations.txt +++ /dev/null @@ -1,20 +0,0 @@ -Configuration in Visual Studio must be left as "Release", otherwise it won't compile, -but one can still use debugging options by making the following changes in the project properties: - -Debug: - - Optimization=Disabled - Inline Function Expansion: Disabled - Enable Intrinsic Functions: No - Favor Size Or Speed: Neither - Preprocessor: DEBUG instead of NDEBUG - Code Generation->Basic Runtime Checks: Both - -Release: - - Optimization=Full - Inline Function Expansion: Any Suitable - Enable Intrinsic Functions: Yes - Favor Size Or Speed: Favor fast code - Preprocessor: NDEBUG instead of DEBUG - Code Generation->Basic Runtime Checks: Default \ No newline at end of file