Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GLEW resurrection, initial code and project changes

master
Andrew Copland 2017-02-14 15:49:10 +00:00
parent a682495722
commit 811ce25c3f
25 changed files with 49741 additions and 4408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -7,7 +7,7 @@ before_install:
- cd pioneer-thirdparty/ && autoconf && ./configure && make assimp && make sdl2 && make sdl2_image && cd ../
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
- sudo apt-get install -qq mesa-common-dev libfreetype6-dev libfreeimage-dev libsigc++-2.0-dev libvorbis-dev gcc-4.8 g++-4.8
- sudo apt-get install -qq mesa-common-dev libfreetype6-dev libfreeimage-dev libglew-dev libsigc++-2.0-dev libvorbis-dev gcc-4.8 g++-4.8
- sudo rm /usr/bin/gcc /usr/bin/g++
- sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
- sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++

6
AUTHORS.txt
View File

@ -121,6 +121,12 @@ Pioneer includes the following third-party software:
Lua 5.2.1 by R. Ierusalimschy, L. H. de Figueiredo & W. Celes,
Copyright (C) 1994-2012 Lua.org, PUC-Rio
Licensed under the MIT licence (see contrib/lua/lua.h)
GLEW: The OpenGL Extension Wrangler
Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
Copyright (C) 2002, Lev Povalahev
Licensed under the Modified BSD licence (see licenses/GLEW.txt)
miniz by Rich Geldreich, April 2012
Public domain (see contrib/miniz/miniz.h)

3
configure.ac
View File

@ -173,7 +173,7 @@ EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DPIONEER_VERSION=\\\"$PIONEER_VERSION\\\" -DPIO
dnl __STDC_LIMIT_MACROS is defined so that GCC 4.7 will provide limit macros (eg, INT64_MAX) as part of cstdint
dnl (note, __STDC_LIMIT_MACROS is not needed in GCC 4.8 or later; those macros are part of the C++11 standard)
dnl __STDC_FORMAT_MACROS is the same deal for the (PRI|SCN)[ud](32|64) macros
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS"
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DGLEW_STATIC -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS"
dnl Compiler warning options
@ -425,6 +425,7 @@ AC_CONFIG_FILES([
contrib/json/Makefile
contrib/PicoDDS/Makefile
contrib/vcacheopt/Makefile
contrib/glew/Makefile
contrib/profiler/Makefile
osx/Makefile
win32/Makefile])

2
contrib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt profiler imgui
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt glew profiler imgui

6
contrib/glew/Makefile.am Normal file
View File

@ -0,0 +1,6 @@
# Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.common
noinst_LIBRARIES = libglew.a
libglew_a_SOURCES = glew.c
noinst_HEADERS = glew.h glxew.h wglew.h eglew.h

2261
contrib/glew/eglew.h Normal file
View File

File diff suppressed because it is too large Load Diff

23952
contrib/glew/glew.c Normal file
View File

File diff suppressed because it is too large Load Diff

20113
contrib/glew/glew.h Normal file
View File

File diff suppressed because it is too large Load Diff

1769
contrib/glew/glxew.h Normal file
View File

File diff suppressed because it is too large Load Diff

1427
contrib/glew/wglew.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/Makefile.am
View File

@ -309,6 +309,7 @@ pioneer_LDADD = \
../contrib/PicoDDS/libpicodds.a \
../contrib/jenkins/libjenkins.a \
../contrib/json/libjson.a \
../contrib/glew/libglew.a \
../contrib/profiler/libprofiler.a \
../contrib/imgui/libimgui.a
@ -390,6 +391,7 @@ uitest_LDADD = \
../contrib/jenkins/libjenkins.a \
../contrib/PicoDDS/libpicodds.a \
../contrib/json/libjson.a \
../contrib/glew/libglew.a \
../contrib/profiler/libprofiler.a
uitest_LDADD += \
@ -417,6 +419,7 @@ textstress_LDADD = \
graphics/libgraphics.a \
posix/libposix.a \
../contrib/json/libjson.a \
../contrib/glew/libglew.a \
../contrib/profiler/libprofiler.a
textstress_LDADD += \
@ -456,6 +459,7 @@ modelcompiler_LDADD = \
text/libtext.a \
../contrib/PicoDDS/libpicodds.a \
../contrib/json/libjson.a \
../contrib/glew/libglew.a \
../contrib/profiler/libprofiler.a
modelcompiler_LDADD += \

4
src/graphics/opengl/GLDebug.h
View File

@ -90,7 +90,7 @@ namespace Graphics {
public:
//register the callback function, if the extension is available
static void Enable() {
if (ogl_ext_KHR_debug == ogl_LOAD_FAILED) {
if (!glewIsSupported("GL_KHR_debug")) {
Output("GL_KHR_debug is not supported; GLDebug will not work\n");
return;
}
@ -105,7 +105,7 @@ namespace Graphics {
}
static void Disable() {
if (ogl_ext_KHR_debug == ogl_LOAD_SUCCEEDED) {
if (glewIsSupported("GL_KHR_debug")) {
glDisable(GL_DEBUG_OUTPUT);
}
}

2
src/graphics/opengl/Makefile.am
View File

@ -8,7 +8,6 @@ AM_CPPFLAGS += -I$(srcdir)/../.. -isystem $(top_srcdir)/contrib
noinst_LIBRARIES = libgraphicsopengl.a
noinst_HEADERS = \
gl_core_3_x.h \
OpenGLLibs.h \
GLDebug.h \
MaterialGL.h \
@ -33,7 +32,6 @@ noinst_HEADERS = \
BillboardMaterial.h
libgraphicsopengl_a_SOURCES = \
gl_core_3_x.c \
MaterialGL.cpp \
RenderStateGL.cpp \
RenderTargetGL.cpp \

4
src/graphics/opengl/OpenGLLibs.h
View File

@ -6,8 +6,6 @@
#ifndef _OGL_OPENGLIBS_H
#define _OGL_OPENGLIBS_H
// The glLoadGen header was generated using the following command line:
// lua LoadGen.lua -style=pointer_c -spec=gl -version=3.3 -profile=core core_3_x -stdext=gl_ubiquitous.txt -stdext=gl_core_post_3_3.txt -ext ARB_seamless_cube_map ARB_seamless_cubemap_per_texture ARB_draw_instanced ARB_uniform_buffer_object ARB_instanced_arrays
#include "graphics/opengl/gl_core_3_x.h"
#include "glew/glew.h"
#endif

42
src/graphics/opengl/RendererGL.cpp
View File

@ -70,20 +70,36 @@ RendererOGL::RendererOGL(WindowSDL *window, const Graphics::Settings &vs)
, m_activeRenderState(nullptr)
, m_matrixMode(MatrixMode::MODELVIEW)
{
if (!initted) {
initted = true;
glewExperimental = true;
GLenum glew_err;
if ((glew_err = glewInit()) != GLEW_OK)
Error("GLEW initialisation failed: %s", glewGetErrorString(glew_err));
if (!ogl_LoadFunctions())
Error(
"Pioneer can not run on your graphics card as it does not appear to support OpenGL 3.3\n"
"Please check to see if your GPU driver vendor has an updated driver - or that drivers are installed correctly."
);
// pump this once as glewExperimental is necessary but spews a single error
GLenum err = glGetError();
if (!glewIsSupported("GL_VERSION_3_1") )
{
Error(
"Pioneer can not run on your graphics card as it does not appear to support OpenGL 3.1\n"
"Please check to see if your GPU driver vendor has an updated driver - or that drivers are installed correctly."
);
}
if (ogl_ext_EXT_texture_compression_s3tc == ogl_LOAD_FAILED)
if (!glewIsSupported("GL_EXT_texture_compression_s3tc"))
{
if (glewIsSupported("GL_ARB_texture_compression")) {
GLint intv[4];
glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &intv[0]);
if( intv[0] == 0 ) {
Error("GL_NUM_COMPRESSED_TEXTURE_FORMATS is zero.\nPioneer can not run on your graphics card as it does not support compressed (DXTn/S3TC) format textures.");
}
} else {
Error(
"OpenGL extension GL_EXT_texture_compression_s3tc not supported.\n"
"Pioneer can not run on your graphics card as it does not support compressed (DXTn/S3TC) format textures."
);
}
}
const char *ver = (const char *)glGetString(GL_VERSION);
@ -202,6 +218,7 @@ void RendererOGL::WriteRendererInfo(std::ostream &out) const
out << " " << glGetString(GL_RENDERER) << "\n";
out << "Available extensions:" << "\n";
if (glewIsSupported("GL_VERSION_3_1"))
{
out << "Shading language version: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << "\n";
GLint numext = 0;
@ -210,6 +227,15 @@ void RendererOGL::WriteRendererInfo(std::ostream &out) const
out << " " << glGetStringi(GL_EXTENSIONS, i) << "\n";
}
}
else
{
out << " ";
std::istringstream ext(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
std::copy(
std::istream_iterator<std::string>(ext),
std::istream_iterator<std::string>(),
std::ostream_iterator<std::string>(out, "\n "));
}
out << "\nImplementation Limits:\n";

2
src/graphics/opengl/TextureGL.h
View File

@ -5,7 +5,7 @@
#define _TEXTUREGL_H
#include "graphics/Texture.h"
#include "gl_core_3_x.h"
#include "OpenGLLibs.h"
namespace Graphics {

1930
src/graphics/opengl/gl_core_3_x.c
View File

File diff suppressed because it is too large Load Diff

2435
src/graphics/opengl/gl_core_3_x.h
View File

File diff suppressed because it is too large Load Diff

7
win32/codeblocks/premake4.lua
View File

@ -33,6 +33,7 @@ solution "Pioneer"
libdirs { path.join(TP_DIR, "lib") }
end
includedirs { ".", SRCDIR, BASEDIR .. "contrib" }
defines { "GLEW_STATIC" }
vpaths (VPATHS)
--std=c++11 causes errors with miniz
buildoptions { "-std=gnu++11" }
@ -102,6 +103,10 @@ solution "Pioneer"
files { LIBDIR .. "FileSystemWin32.cpp", LIBDIR .. "OSWin32.cpp" }
--contrib libs
project "glew"
kind "StaticLib"
files { BASEDIR .. "contrib/glew/*.h", BASEDIR .. "contrib/glew/*.c" }
project "jenkins"
kind "StaticLib"
files { BASEDIR .. "contrib/jenkins/lookup3.*" }
@ -140,7 +145,7 @@ solution "Pioneer"
linkoptions "-mwindows"
end
links { "galaxy", "terrain", "gameui", "collider", "gui",
"scenegraph", "text", "ui", "graphics", "win32",
"scenegraph", "text", "ui", "graphics", "win32", "glew",
"jenkins", "json", "lua", "picodds"
}
links { "mingw32", "SDL2main" , "SDL2", "SDL2_Image", "png", "libcurl",

127
win32/vs2015/glew/glew.vcxproj Normal file
View File

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PreRelease|Win32">
<Configuration>PreRelease</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Profile|Win32">
<Configuration>Profile</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\contrib\glew\glew.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}</ProjectGuid>
<RootNamespace>glew</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\common.props" />
<Import Project="..\PreRelease.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

6
win32/vs2015/glew/glew.vcxproj.filters Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\..\contrib\glew\glew.c" />
</ItemGroup>
</Project>

7
win32/vs2015/graphics/graphics.vcxproj
View File

@ -133,12 +133,6 @@
<ClCompile Include="..\..\..\src\graphics\opengl\GasGiantMaterial.cpp" />
<ClCompile Include="..\..\..\src\graphics\opengl\GenGasGiantColourMaterial.cpp" />
<ClCompile Include="..\..\..\src\graphics\opengl\GeoSphereMaterial.cpp" />
<ClCompile Include="..\..\..\src\graphics\opengl\gl_core_3_x.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\src\graphics\opengl\MaterialGL.cpp" />
<ClCompile Include="..\..\..\src\graphics\opengl\MultiMaterial.cpp" />
<ClCompile Include="..\..\..\src\graphics\opengl\Program.cpp" />
@ -178,7 +172,6 @@
<ClInclude Include="..\..\..\src\graphics\opengl\GenGasGiantColourMaterial.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\GeoSphereMaterial.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\GLDebug.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\gl_core_3_x.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\MaterialGL.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\MultiMaterial.h" />
<ClInclude Include="..\..\..\src\graphics\opengl\OpenGLLibs.h" />

6
win32/vs2015/graphics/graphics.vcxproj.filters
View File

@ -62,9 +62,6 @@
<ClCompile Include="..\..\..\src\graphics\opengl\MultiMaterial.cpp">
<Filter>opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\graphics\opengl\gl_core_3_x.c">
<Filter>opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\graphics\dummy\RendererDummy.cpp">
<Filter>dummy</Filter>
</ClCompile>
@ -147,9 +144,6 @@
<ClInclude Include="..\..\..\src\graphics\opengl\RendererGL.h">
<Filter>opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\graphics\opengl\gl_core_3_x.h">
<Filter>opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\graphics\dummy\MaterialDummy.h">
<Filter>dummy</Filter>
</ClInclude>

16
win32/vs2015/pioneer.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pioneer", "pioneer.vcxproj", "{65A1BBFB-7A42-497C-BF65-A0A06664A204}"
ProjectSection(ProjectDependencies) = postProject
@ -18,6 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pioneer", "pioneer.vcxproj"
{B19B00BA-F9DE-451F-9E16-C5E582DEEE77} = {B19B00BA-F9DE-451F-9E16-C5E582DEEE77}
{E34F7DBC-F23D-481A-B920-E53F56C53EE8} = {E34F7DBC-F23D-481A-B920-E53F56C53EE8}
{F604C1BC-C921-4468-8F09-427705AD9D29} = {F604C1BC-C921-4468-8F09-427705AD9D29}
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} = {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "text", "text\text.vcxproj", "{06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}"
@ -100,8 +101,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelcompiler", "modelcompi
{B19B00BA-F9DE-451F-9E16-C5E582DEEE77} = {B19B00BA-F9DE-451F-9E16-C5E582DEEE77}
{E34F7DBC-F23D-481A-B920-E53F56C53EE8} = {E34F7DBC-F23D-481A-B920-E53F56C53EE8}
{F604C1BC-C921-4468-8F09-427705AD9D29} = {F604C1BC-C921-4468-8F09-427705AD9D29}
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} = {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "glew\glew.vcxproj", "{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -230,6 +234,14 @@ Global
{8006A44D-1877-42EE-99A6-214E8B328AEE}.Profile|Win32.Build.0 = Profile|Win32
{8006A44D-1877-42EE-99A6-214E8B328AEE}.Release|Win32.ActiveCfg = Release|Win32
{8006A44D-1877-42EE-99A6-214E8B328AEE}.Release|Win32.Build.0 = Release|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Debug|Win32.ActiveCfg = Debug|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Debug|Win32.Build.0 = Debug|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.PreRelease|Win32.ActiveCfg = PreRelease|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.PreRelease|Win32.Build.0 = PreRelease|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Profile|Win32.ActiveCfg = Profile|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Profile|Win32.Build.0 = Profile|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Release|Win32.ActiveCfg = Release|Win32
{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

16
win32/vs2015/pioneer.vcxproj
View File

@ -97,7 +97,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -106,7 +106,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;shlwapi.lib;libogg_static_vc2015_debug.lib;libvorbis_static_v140_debug.lib;libvorbisfile_static_v140_debug.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-d-2_0.lib;libpng15.lib;zlib.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;ui.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>glew.lib;libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;shlwapi.lib;libogg_static_vc2015_debug.lib;libvorbis_static_v140_debug.lib;libvorbisfile_static_v140_debug.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-d-2_0.lib;libpng15.lib;zlib.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;ui.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/vs2015;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<LargeAddressAware>true</LargeAddressAware>
@ -120,7 +120,7 @@
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-d-2_0.lib;libpng15.lib;zlib.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;ui.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>glew.lib;libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-d-2_0.lib;libpng15.lib;zlib.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;ui.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/vs2015;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@ -128,7 +128,7 @@
</Link>
<ClCompile>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
@ -141,14 +141,14 @@
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-2_0.lib;libpng15.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>glew.lib;libcurl.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-2_0.lib;libpng15.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/vs2015;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
</Link>
<ClCompile />
<ClCompile>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<SDLCheck>false</SDLCheck>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@ -165,7 +165,7 @@
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>libcurl.lib;common.lib;crash_generation_client.lib;exception_handler.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-2_0.lib;libpng15.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>glew.lib;libcurl.lib;common.lib;crash_generation_client.lib;exception_handler.lib;profiler.lib;json.lib;assimp-vc140-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static_vc2015_release.lib;libvorbis_static_v140_release.lib;libvorbisfile_static_v140_release.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype2312MT.lib;sigc-v140-2_0.lib;libpng15.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>../../win32/lib;../../../pioneer-thirdparty/win32/lib/vs2015;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@ -173,7 +173,7 @@
<ClCompile />
<ClCompile>
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Qpar-report:2 /Qvec-report:2 %(AdditionalOptions)</AdditionalOptions>
<SDLCheck>false</SDLCheck>
<MultiProcessorCompilation>true</MultiProcessorCompilation>