diff --git a/BuildingOgre.txt b/BuildingOgre.txt deleted file mode 100644 index fe34cd1e206..00000000000 --- a/BuildingOgre.txt +++ /dev/null @@ -1,56 +0,0 @@ -GUIDE TO BUILDING OGRE -======================================================================== - -See instructions in https://ogrecave.github.io/ogre-next/api/2.3/_setting_up_ogre.html - -You will also find those instructions under Docs/src/SettingUpOgre - - -1. Building Ogre as Windows Store or Windows Phone application -------------------------------------------------------------------- - -You need Windows 8.0 or later, Windows 8.1 is recommended. - -You need Visual Studio 2012 or later, Visual Studio 2013 is recommended -as it is bundled with WinStore 8.0/8.1 and WinPhone 8.0/8.1 SDKs. - -Download and install CMake 3.15.5 or later. - -Patched dependencies must be used, compiled with appropriate WINAPI_FAMILY. -Cg is not supported, and only headers from OIS are needed. -You can use https://bitbucket.org/eugene_gff/ogre-dependencies-winrt - -has VS2012 and VS2013 projects for Win32, WinRT (can be reused for WinPhone) -Compile dependencies for all configurations that you plan to use before -running CMake. Dependencies for Win32 and for WinRT must be located in -separate folders, Win32 version can be built from OgreDependencies.VS201x.sln, - WinRT from OgreDependencies.VS201x.WinRT.sln - -Run CMake, specify source and binaries folders, than "Configure", select -"Visual Studio 12 2013" generator and "Specify options for cross-compiling" -option, specify Operating System = "WindowsStore" or "WindowsPhone", -Version = "8.0" or "8.1", than "Finish", specify WinRT dependencies folder -for OGRE_DEPENDENCIES_DIR, "Configure", should be no more errors, then press -"Generate". If you want build time to be shorter - set OGRE_UNITY_BUILD to on. - -Select SampleBrowser as the start up project and run. - -Note 1: The code and generated cmake solution should be on local NTFS drive, -and can't be on a network drive, including VMWare shared folders - or -you will get a errors when you will try to compile/link/run resulting exe. - -Note 2: Ogre uses d3dcompiler_xx.dll to compile shaders, and WinStore and -WinPhone 8.1 projects can use it without restriction as it is part of OS. -But WinStore and WinPhone 8.0 applications should load already compiled -shaders from cache, as d3dcompiler_xx.dll is available to them only during -development. Therefore to avoid necessity to deploy d3dcompiler_xx.dll -during development (additional configurations with d3dcompiler_xx.dll) -and generation of such cache - use version 8.1 of these platforms. - -Note 3: Running WinPhone emulator in OS running under VMware: -We were able to run the emulation and debug without an issue by using two -steps: (a) Under the settings of the VM > CPU, make sure you have the -option to pass-through the Intel VT-x/EPT feature, (b) Edit the config -file .vmx and add the parameter: hypervisor.cpuid.v0 = "FALSE" -All versions of Visual Studio 2012 have a window refresh issue when running -in VMware and the window is maximized, the solution is just to change the -size of the Visual Studio window to be less the the screen width and height. diff --git a/Docs/src/SettingUpOgre/SettingUpOgreWindows.md b/Docs/src/SettingUpOgre/SettingUpOgreWindows.md index 9081777ee6d..2315c245692 100644 --- a/Docs/src/SettingUpOgre/SettingUpOgreWindows.md +++ b/Docs/src/SettingUpOgre/SettingUpOgreWindows.md @@ -5,7 +5,7 @@ # Requirements {#RequirementsWindows} * [CMake 3.x](https://cmake.org/download/) * Git - * Visual Studio 2013 - 2019 (2022 not tested). MinGW may work but we strongly recommend Visual Studio. + * Visual Studio 2015 - 2022. MinGW may work but we strongly recommend Visual Studio. * [DirectX June 2010 SDK](https://www.microsoft.com/en-us/download/details.aspx?id=6812). Optional. Needed if you use older Visual Studio versions and want the D3D11 plugin. Also comes with useful tools. * Windows 10 SDK. Contains the latest DirectX SDK, thus recommended over the DX June 2010 SDK, @@ -28,7 +28,7 @@ -# Open CMake GUI. -# Point "Where is the source code" to C:\\OgreDepsRepo\\; and "Where to build the binaries" pointing to "C:\\OgreDepsRepo\\build" --# Click 'Configure' and select the generator (i.e. if you're using Visual Studio 2013, select Visual Studio 12) +-# Click 'Configure' and select the generator (i.e. if you're using Visual Studio 2015, select Visual Studio 14) ![](images/CMakeWindowsDependencies.png) -# Answer 'Ok' when asked if you want to create the build directory -# Sometimes on bleeding edge repos there might be CMake syntax warnings. Ignore them. diff --git a/README.md b/README.md index 50ebae79c3f..5f8ba58349c 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ differences have diverged long enough. * Clang 3.3 or newer * GCC 5 or newer - * VS2013 or newer + * VS2015 or newer ## Samples For a list of samples and their demonstrated features, refer to the [samples section in the manual.](https://ogrecave.github.io/ogre-next/api/latest/_samples.html) @@ -114,7 +114,7 @@ For a list of samples and their demonstrated features, refer to the [samples sec # Dependencies (Windows) -* Visual Studio 2013 - 2019 (2022 not tested). MinGW may work but we strongly recommend Visual Studio. +* Visual Studio 2015 - 2022. MinGW may work but we strongly recommend Visual Studio. * [DirectX June 2010 SDK](https://www.microsoft.com/en-us/download/details.aspx?id=6812). Optional. Comes with useful tools. * Windows 10 SDK. Contains the latest DirectX SDK, thus recommended over the DX June 2010 SDK, but you may still want to install the June 2010 SDK for those tools. diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_Win32.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_Win32.bat deleted file mode 100644 index 1793ce01ff6..00000000000 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_Win32.bat +++ /dev/null @@ -1,71 +0,0 @@ - -@echo off -SETLOCAL - -set OGRE_BRANCH_NAME=master -set GENERATOR="Visual Studio 12 2013" -set PLATFORM=Win32 - -set CMAKE_BIN_x86="C:\Program Files (x86)\CMake\bin\cmake.exe" -set CMAKE_BIN_x64="C:\Program Files\CMake\bin\cmake.exe" -IF EXIST %CMAKE_BIN_x64% ( - echo CMake 64-bit detected - set CMAKE_BIN=%CMAKE_BIN_x64% -) ELSE ( - IF EXIST %CMAKE_BIN_x86% ( - echo CMake 32-bit detected - set CMAKE_BIN=%CMAKE_BIN_x86% - ) ELSE ( - echo Cannot detect either %CMAKE_BIN_x86% or - echo %CMAKE_BIN_x64% make sure CMake is installed - EXIT /B 1 - ) -) -echo Using CMake at %CMAKE_BIN% - -mkdir Ogre -cd Ogre -IF NOT EXIST ogre-next-deps ( - mkdir ogre-next-deps - echo --- Cloning ogre-next-deps --- - git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps -) ELSE ( - echo --- ogre-next-deps repo detected. Cloning skipped --- -) -cd ogre-next-deps -mkdir build -cd build -echo --- Building ogre-next-deps --- -%CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% .. -%CMAKE_BIN% --build . --config Debug -%CMAKE_BIN% --build . --target install --config Debug -%CMAKE_BIN% --build . --config Release -%CMAKE_BIN% --build . --target install --config Release - -cd ../../ -IF NOT EXIST ogre-next ( - echo --- Cloning Ogre master --- - git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next -) -cd ogre-next -IF NOT EXIST Dependencies ( - mklink /D Dependencies ..\ogre-next-deps\build\ogredeps - IF ERRORLEVEL 1 ( - echo Failed to create Dependency directory symlink. Run the script as Administrator. - EXIT /B 1 - ) -) -mkdir build -cd build -echo --- Running CMake configure --- -%CMAKE_BIN% -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% .. -echo --- Building Ogre (Debug) --- -%CMAKE_BIN% --build . --config Debug -%CMAKE_BIN% --build . --target install --config Debug -echo --- Building Ogre (Release) --- -%CMAKE_BIN% --build . --config Release -%CMAKE_BIN% --build . --target install --config Release - -echo Done! - -ENDLOCAL diff --git a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_x64.bat b/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_x64.bat deleted file mode 100644 index b1299c5124a..00000000000 --- a/Scripts/BuildScripts/output/build_ogre_Visual_Studio_12_2013_x64.bat +++ /dev/null @@ -1,71 +0,0 @@ - -@echo off -SETLOCAL - -set OGRE_BRANCH_NAME=master -set GENERATOR="Visual Studio 12 2013" -set PLATFORM=x64 - -set CMAKE_BIN_x86="C:\Program Files (x86)\CMake\bin\cmake.exe" -set CMAKE_BIN_x64="C:\Program Files\CMake\bin\cmake.exe" -IF EXIST %CMAKE_BIN_x64% ( - echo CMake 64-bit detected - set CMAKE_BIN=%CMAKE_BIN_x64% -) ELSE ( - IF EXIST %CMAKE_BIN_x86% ( - echo CMake 32-bit detected - set CMAKE_BIN=%CMAKE_BIN_x86% - ) ELSE ( - echo Cannot detect either %CMAKE_BIN_x86% or - echo %CMAKE_BIN_x64% make sure CMake is installed - EXIT /B 1 - ) -) -echo Using CMake at %CMAKE_BIN% - -mkdir Ogre -cd Ogre -IF NOT EXIST ogre-next-deps ( - mkdir ogre-next-deps - echo --- Cloning ogre-next-deps --- - git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps -) ELSE ( - echo --- ogre-next-deps repo detected. Cloning skipped --- -) -cd ogre-next-deps -mkdir build -cd build -echo --- Building ogre-next-deps --- -%CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% .. -%CMAKE_BIN% --build . --config Debug -%CMAKE_BIN% --build . --target install --config Debug -%CMAKE_BIN% --build . --config Release -%CMAKE_BIN% --build . --target install --config Release - -cd ../../ -IF NOT EXIST ogre-next ( - echo --- Cloning Ogre master --- - git clone --branch %OGRE_BRANCH_NAME% https://github.com/OGRECave/ogre-next -) -cd ogre-next -IF NOT EXIST Dependencies ( - mklink /D Dependencies ..\ogre-next-deps\build\ogredeps - IF ERRORLEVEL 1 ( - echo Failed to create Dependency directory symlink. Run the script as Administrator. - EXIT /B 1 - ) -) -mkdir build -cd build -echo --- Running CMake configure --- -%CMAKE_BIN% -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=..\..\ogre-next-deps\build\ogredeps -G %GENERATOR% -A %PLATFORM% .. -echo --- Building Ogre (Debug) --- -%CMAKE_BIN% --build . --config Debug -%CMAKE_BIN% --build . --target install --config Debug -echo --- Building Ogre (Release) --- -%CMAKE_BIN% --build . --config Release -%CMAKE_BIN% --build . --target install --config Release - -echo Done! - -ENDLOCAL diff --git a/appveyor.yml b/appveyor.yml index c6d2179cdb6..89e7edff280 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,9 +8,6 @@ environment: # - PLATFORM: x86 # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 # BUILD_SCRIPT: build_ogre_Visual_Studio_14_2015_Win32.bat -# - PLATFORM: x86 -# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 -# BUILD_SCRIPT: build_ogre_Visual_Studio_12_2013_Win32.bat # - PLATFORM: x64 # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 # BUILD_SCRIPT: build_ogre_Visual_Studio_15_2017_x64.bat