yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #386 from VelocityRa/master

Browse Source 
Experimental compatibility with VS 2015
This commit is contained in:
YVT 2016-03-03 10:54:38 +09:00
commit 7d9ee6fcfa
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -94,18 +94,18 @@ GCC 4.8 / Clang 3.2 or later is recommended because OpenSpades relies on C++11 f
### On Windows (with visual studio)
1. Get CMake, Visual Studio 2013 (Express), and the OpenSpades source.
1. Get CMake, Visual Studio 2013 (Express) or Visual Studio 2015 (not very supported), and the OpenSpades source.
Official: https://github.com/yvt/openspades
Unofficial: https://github.com/learn-more/openspades
2. Extract or checkout the source (all examples will assume ```E:/Projects/openspades```, update paths in the examples to reflect yours)
3. Get (pre-compiled) copies of fltk, glew, curl, sdl2 and zlib, and place them in ```E:/Projects/openspades/Sources/Externals```.
See the file ```E:/Projects/openspades/Sources/Externals/readme.txt``` for details (and a pre-compiled set of libraries).
See the file ```E:/Projects/openspades/Sources/Externals/readme.txt``` for details (and a pre-compiled set of libraries, make sure to pick the right one for your version of VS).
4. Run CMake, using the paths:
```Source: E:/Projects/openspades```
```Binaries: E:/Projects/openspades/OpenSpades.msvc```
For your convenience, create the directory: ```E:/Projects/openspades/OpenSpades.msvc/os.Resources```, extract the resources (.pak files) to this dir,
set ```OPENSPADES_RESDIR``` to point to this directory. (Run CMake again, now when running debug builds openspades will also read resources from this dir)
5. Open ```E:/Projects/openspades/OpenSpades.msvc/OpenSpades.sln``` in visual studio.
5. Open ```E:/Projects/openspades/OpenSpades.msvc/OpenSpades.sln``` in Visual Studio.
### On Mac OS X (with Xcode)

1
Sources/Client/MapView.h
View File

@ -24,6 +24,7 @@
namespace spades {
namespace client {
extern int palette[32][3];
class Client;
class IRenderer;
class IImage;

2
Sources/Externals/readme.txt vendored
View File

@ -28,3 +28,5 @@ Externals
A set of precompiled libraries (packed with the correct layout, built with Visual Studio 2010):
https://dl.dropboxusercontent.com/u/37804131/OpenSpades-Externals-Windows.zip
Libraries for Visual Studio 2015:
https://www.dropbox.com/s/pfvk8tns1qgkxpr/OpenSpades-Externals-Windows-VS2015.rar?dl=1

5
Sources/Gui/Main.cpp
View File

@ -57,10 +57,13 @@
#endif
#ifdef _MSC_VER>=1900 // Visual Studio 2015 or higher
extern "C" { FILE __iob_func[3] = { *stdin,*stdout,*stderr }; }
#endif
static const unsigned char splashImage[] = {
#include "SplashImage.inc"
};
static const unsigned char Icon[] = {
#include "Icon.inc"
};