Perf counter Windows memory info (#4820)
* Fixup projects after many changes * Use GetProcessMemoryInfo to get memory details * Moved bracket, spaced the header includes to preserver order, added psapi libs to cmake build * Buggered up the CMake filemaster
Andrew Copland
GitHub
parent
d7e4b9ecb1
commit
859f052263
|
|
@ -185,6 +185,10 @@ if (PROFILER_ENABLED)
|
|||
add_definitions(-DPIONEER_PROFILER=1)
|
||||
endif(PROFILER_ENABLED)
|
||||
|
||||
if (WIN32)
|
||||
add_definitions(-DPSAPI_VERSION=1)
|
||||
endif (WIN32)
|
||||
|
||||
macro(set_cxx11_properties)
|
||||
set_target_properties(${ARGN} PROPERTIES
|
||||
CXX_STANDARD 11
|
||||
|
|
@ -315,7 +319,7 @@ if(USE_PIONEER_THIRDPARTY)
|
|||
endif()
|
||||
|
||||
if (WIN32)
|
||||
list(APPEND winLibs shlwapi)
|
||||
list(APPEND winLibs shlwapi psapi)
|
||||
endif (WIN32)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} LINK_PRIVATE ${pioneerLibs} ${winLibs})
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@
|
|||
#include <fstream>
|
||||
#include <functional>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
// order of header includes matters, thanks Windows.h!
|
||||
#include <psapi.h>
|
||||
#endif
|
||||
|
||||
using namespace PiGUI;
|
||||
|
||||
#define ignoreLine(f) f.ignore(std::numeric_limits<std::streamsize>::max(), '\n')
|
||||
|
|
@ -42,7 +48,13 @@ static PerfInfo::MemoryInfo GetMemoryInfo()
|
|||
statusFile.close();
|
||||
|
||||
#elif _WIN32
|
||||
// TODO: get win32 memory count
|
||||
// Get win32 memory count
|
||||
PROCESS_MEMORY_COUNTERS pmc;
|
||||
if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc))) {
|
||||
// convert from bytes to kilobytes
|
||||
ret.peakMemSize = pmc.PeakWorkingSetSize / 1024;
|
||||
ret.currentMemSize = pmc.WorkingSetSize / 1024;
|
||||
}
|
||||
#elif __APPLE__
|
||||
// TODO: get OSX memory count
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
<ClCompile Include="..\..\src\Lang.cpp" />
|
||||
<ClCompile Include="..\..\src\modelcompiler.cpp" />
|
||||
<ClCompile Include="..\..\src\ModManager.cpp" />
|
||||
<ClCompile Include="..\..\src\PerfStats.cpp" />
|
||||
<ClCompile Include="..\..\src\PngWriter.cpp" />
|
||||
<ClCompile Include="..\..\src\SDLWrappers.cpp" />
|
||||
<ClCompile Include="..\..\src\StringF.cpp" />
|
||||
|
|
@ -89,10 +90,10 @@
|
|||
<ClInclude Include="..\..\src\matrix4x4.h" />
|
||||
<ClInclude Include="..\..\src\ModManager.h" />
|
||||
<ClInclude Include="..\..\src\OS.h" />
|
||||
<ClInclude Include="..\..\src\PerfStats.h" />
|
||||
<ClInclude Include="..\..\src\PngWriter.h" />
|
||||
<ClInclude Include="..\..\src\Random.h" />
|
||||
<ClInclude Include="..\..\src\SDLWrappers.h" />
|
||||
<ClInclude Include="..\..\src\Serializer.h" />
|
||||
<ClInclude Include="..\..\src\StringF.h" />
|
||||
<ClInclude Include="..\..\src\StringRange.h" />
|
||||
<ClInclude Include="..\..\src\utils.h" />
|
||||
|
|
|
|||
|
|
@ -102,6 +102,9 @@
|
|||
<ClCompile Include="..\..\contrib\lz4\xxhash.c">
|
||||
<Filter>Source Files\lz4</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\PerfStats.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\IniConfig.h">
|
||||
|
|
@ -176,9 +179,6 @@
|
|||
<ClInclude Include="..\..\src\Lang.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Serializer.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\contrib\PicoDDS\PicoDDS.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -218,5 +218,8 @@
|
|||
<ClInclude Include="..\..\contrib\lz4\xxhash.h">
|
||||
<Filter>Source Files\lz4</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\PerfStats.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;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>
|
||||
|
|
@ -190,7 +190,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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/x86/vs2017;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
|
|
@ -203,7 +203,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-mt.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-mt.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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/x64/vs2017;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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/x86/vs2017;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
|
|
@ -233,7 +233,7 @@
|
|||
</Link>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
</ClCompile>
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-mt.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-mt.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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/x64/vs2017;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
</Link>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
|
||||
|
|
@ -268,14 +268,14 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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/x86/vs2017;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
</Link>
|
||||
<ClCompile />
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;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>
|
||||
|
|
@ -292,14 +292,14 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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/x64/vs2017;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
</Link>
|
||||
<ClCompile />
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;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>
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.lib; text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-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;freetype271MT.lib;sigcpp.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/x86/vs2017;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
|
|
@ -325,7 +325,7 @@
|
|||
<ClCompile />
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;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>
|
||||
|
|
@ -341,7 +341,7 @@
|
|||
<ClCompile />
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>glew.lib;profiler.lib;assimp-vc141-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.lib; text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;ui.lib;scenegraph.lib;gameui.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>Psapi.lib;glew.lib;profiler.lib;assimp-vc141-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype271MT.lib;sigcpp.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/x64/vs2017;$(SolutionDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
|
||||
<LargeAddressAware>true</LargeAddressAware>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
<ClCompile />
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../../../pioneer-thirdparty/source/libsigc++-2.10.2;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;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>
|
||||
|
|
@ -415,51 +415,54 @@
|
|||
<ClCompile Include="..\..\src\JsonUtils.cpp" />
|
||||
<ClCompile Include="..\..\src\KeyBindings.cpp" />
|
||||
<ClCompile Include="..\..\src\Lang.cpp" />
|
||||
<ClCompile Include="..\..\src\Lua.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaBody.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaCargoBody.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaColor.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaComms.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaConsole.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaConstants.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaDev.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaEngine.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaEvent.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaFaction.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaFileSystem.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaFixed.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaFormat.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaGame.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaHyperspaceCloud.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaInput.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaJson.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaLang.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaManager.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaMissile.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaModelBody.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaMusic.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaNameGen.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaObject.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaPiGui.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaPlanet.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaPlayer.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaPropertiedObject.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaRand.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaRef.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaSerializer.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaServerAgent.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaShip.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaShipDef.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaSpace.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaSpaceStation.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaStar.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaStarSystem.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaSystemBody.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaSystemPath.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaTimer.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaUtils.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaVector.cpp" />
|
||||
<ClCompile Include="..\..\src\LuaVector2.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\core\Import.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\core\Sandbox.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\Lua.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaBody.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaCargoBody.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaColor.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaComms.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaConsole.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaConstants.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaDev.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaEngine.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaEvent.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaFaction.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaFileSystem.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaFixed.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaFormat.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaGame.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaHyperspaceCloud.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaInput.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaJson.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaLang.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaManager.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaMissile.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaModelBody.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaMusic.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaNameGen.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaObject.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaPiGui.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaPlanet.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaPlayer.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaPropertiedObject.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaRand.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaRef.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaSerializer.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaServerAgent.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaShip.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaShipDef.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaSpace.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaSpaceStation.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaStar.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaStarSystem.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaSystemBody.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaSystemPath.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaTimer.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaUtils.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaVector.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\LuaVector2.cpp" />
|
||||
<ClCompile Include="..\..\src\lua\PropertyMap.cpp" />
|
||||
<ClCompile Include="..\..\src\main.cpp" />
|
||||
<ClCompile Include="..\..\src\MathUtil.cpp" />
|
||||
<ClCompile Include="..\..\src\Missile.cpp" />
|
||||
|
|
@ -470,16 +473,19 @@
|
|||
<ClCompile Include="..\..\src\NavLights.cpp" />
|
||||
<ClCompile Include="..\..\src\ObjectViewerView.cpp" />
|
||||
<ClCompile Include="..\..\src\Orbit.cpp" />
|
||||
<ClCompile Include="..\..\src\PerfStats.cpp" />
|
||||
<ClCompile Include="..\..\src\perlin.cpp" />
|
||||
<ClCompile Include="..\..\src\Pi.cpp" />
|
||||
<ClCompile Include="..\..\src\PiGui.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\Face.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\Image.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\LuaImage.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\LuaModelSpinner.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\ModelSpinner.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\PerfInfo.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\PiGui.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\PiGuiLua.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\LuaFace.cpp" />
|
||||
<ClCompile Include="..\..\src\pigui\PiGuiSandbox.cpp" />
|
||||
<ClCompile Include="..\..\src\Plane.cpp" />
|
||||
<ClCompile Include="..\..\src\Planet.cpp" />
|
||||
<ClCompile Include="..\..\src\Player.cpp" />
|
||||
|
|
@ -505,7 +511,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Projectile.cpp" />
|
||||
<ClCompile Include="..\..\src\PropertyMap.cpp" />
|
||||
<ClCompile Include="..\..\src\RandomColor.cpp" />
|
||||
<ClCompile Include="..\..\src\SDLWrappers.cpp" />
|
||||
<ClCompile Include="..\..\src\SectorView.cpp" />
|
||||
|
|
@ -573,7 +578,6 @@
|
|||
<ClInclude Include="..\..\src\BaseSphere.h" />
|
||||
<ClInclude Include="..\..\src\Beam.h" />
|
||||
<ClInclude Include="..\..\src\Body.h" />
|
||||
<ClInclude Include="..\..\src\buildopts.h" />
|
||||
<ClInclude Include="..\..\src\ByteRange.h" />
|
||||
<ClInclude Include="..\..\src\Camera.h" />
|
||||
<ClInclude Include="..\..\src\CameraController.h" />
|
||||
|
|
@ -617,39 +621,42 @@
|
|||
<ClInclude Include="..\..\src\JsonUtils.h" />
|
||||
<ClInclude Include="..\..\src\KeyBindings.h" />
|
||||
<ClInclude Include="..\..\src\libs.h" />
|
||||
<ClInclude Include="..\..\src\Lua.h" />
|
||||
<ClInclude Include="..\..\src\LuaColor.h" />
|
||||
<ClInclude Include="..\..\src\LuaComms.h" />
|
||||
<ClInclude Include="..\..\src\LuaConsole.h" />
|
||||
<ClInclude Include="..\..\src\LuaConstants.h" />
|
||||
<ClInclude Include="..\..\src\LuaDev.h" />
|
||||
<ClInclude Include="..\..\src\LuaEngine.h" />
|
||||
<ClInclude Include="..\..\src\LuaEvent.h" />
|
||||
<ClInclude Include="..\..\src\LuaFileSystem.h" />
|
||||
<ClInclude Include="..\..\src\LuaFixed.h" />
|
||||
<ClInclude Include="..\..\src\LuaFormat.h" />
|
||||
<ClInclude Include="..\..\src\LuaGame.h" />
|
||||
<ClInclude Include="..\..\src\LuaInput.h" />
|
||||
<ClInclude Include="..\..\src\LuaJson.h" />
|
||||
<ClInclude Include="..\..\src\LuaLang.h" />
|
||||
<ClInclude Include="..\..\src\LuaManager.h" />
|
||||
<ClInclude Include="..\..\src\LuaMissile.h" />
|
||||
<ClInclude Include="..\..\src\LuaMusic.h" />
|
||||
<ClInclude Include="..\..\src\LuaNameGen.h" />
|
||||
<ClInclude Include="..\..\src\LuaObject.h" />
|
||||
<ClInclude Include="..\..\src\LuaPiGui.h" />
|
||||
<ClInclude Include="..\..\src\LuaPushPull.h" />
|
||||
<ClInclude Include="..\..\src\LuaRef.h" />
|
||||
<ClInclude Include="..\..\src\LuaSerializer.h" />
|
||||
<ClInclude Include="..\..\src\LuaServerAgent.h" />
|
||||
<ClInclude Include="..\..\src\LuaShipDef.h" />
|
||||
<ClInclude Include="..\..\src\LuaSpace.h" />
|
||||
<ClInclude Include="..\..\src\LuaTable.h" />
|
||||
<ClInclude Include="..\..\src\LuaTimer.h" />
|
||||
<ClInclude Include="..\..\src\LuaUtils.h" />
|
||||
<ClInclude Include="..\..\src\LuaVector.h" />
|
||||
<ClInclude Include="..\..\src\LuaVector2.h" />
|
||||
<ClInclude Include="..\..\src\LuaWrappable.h" />
|
||||
<ClInclude Include="..\..\src\lua\core\CoreFwdDecl.h" />
|
||||
<ClInclude Include="..\..\src\lua\Lua.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaColor.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaComms.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaConsole.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaConstants.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaDev.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaEngine.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaEvent.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaFileSystem.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaFixed.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaFormat.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaGame.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaInput.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaJson.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaLang.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaManager.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaMissile.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaMusic.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaNameGen.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaObject.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaPiGui.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaPushPull.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaRef.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaSerializer.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaServerAgent.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaShipDef.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaSpace.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaTable.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaTimer.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaUtils.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaVector.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaVector2.h" />
|
||||
<ClInclude Include="..\..\src\lua\LuaWrappable.h" />
|
||||
<ClInclude Include="..\..\src\lua\PropertiedObject.h" />
|
||||
<ClInclude Include="..\..\src\lua\PropertyMap.h" />
|
||||
<ClInclude Include="..\..\src\MathUtil.h" />
|
||||
<ClInclude Include="..\..\src\matrix3x3.h" />
|
||||
<ClInclude Include="..\..\src\matrix4x4.h" />
|
||||
|
|
@ -663,20 +670,20 @@
|
|||
<ClInclude Include="..\..\src\ObjectViewerView.h" />
|
||||
<ClInclude Include="..\..\src\Orbit.h" />
|
||||
<ClInclude Include="..\..\src\OS.h" />
|
||||
<ClInclude Include="..\..\src\PerfStats.h" />
|
||||
<ClInclude Include="..\..\src\perlin.h" />
|
||||
<ClInclude Include="..\..\src\Pi.h" />
|
||||
<ClInclude Include="..\..\src\PiGui.h" />
|
||||
<ClInclude Include="..\..\src\pigui\Face.h" />
|
||||
<ClInclude Include="..\..\src\pigui\Image.h" />
|
||||
<ClInclude Include="..\..\src\pigui\ModelSpinner.h" />
|
||||
<ClInclude Include="..\..\src\pigui\PerfInfo.h" />
|
||||
<ClInclude Include="..\..\src\pigui\PiGui.h" />
|
||||
<ClInclude Include="..\..\src\pigui\PiGuiLua.h" />
|
||||
<ClInclude Include="..\..\src\Plane.h" />
|
||||
<ClInclude Include="..\..\src\Planet.h" />
|
||||
<ClInclude Include="..\..\src\Player.h" />
|
||||
<ClInclude Include="..\..\src\PngWriter.h" />
|
||||
<ClInclude Include="..\..\src\Projectile.h" />
|
||||
<ClInclude Include="..\..\src\PropertiedObject.h" />
|
||||
<ClInclude Include="..\..\src\PropertyMap.h" />
|
||||
<ClInclude Include="..\..\src\Quaternion.h" />
|
||||
<ClInclude Include="..\..\src\Random.h" />
|
||||
<ClInclude Include="..\..\src\RandomColor.h" />
|
||||
|
|
|
|||
|
|
@ -31,6 +31,12 @@
|
|||
<Filter Include="src\lz4">
|
||||
<UniqueIdentifier>{a90916ce-5155-4b0b-baa1-878bd29b7741}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="src\Lua">
|
||||
<UniqueIdentifier>{04ea10f9-e4ca-4362-b2af-8434cf3c0418}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="src\Lua\Core">
|
||||
<UniqueIdentifier>{8b8f8935-2d4d-49c5-8932-3c973b1fc69a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\Body.cpp">
|
||||
|
|
@ -63,69 +69,6 @@
|
|||
<ClCompile Include="..\..\src\KeyBindings.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaBody.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaCargoBody.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaConstants.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaEngine.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaFormat.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaGame.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaManager.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaNameGen.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaObject.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaPlanet.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaPlayer.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaHyperspaceCloud.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaRand.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaSerializer.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaShip.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaSpace.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaSpaceStation.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaStar.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaStarSystem.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaTimer.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaUtils.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -201,24 +144,12 @@
|
|||
<ClCompile Include="..\..\src\Background.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaMusic.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaSystemPath.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Lang.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\StringF.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaConsole.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaLang.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\TerrainBody.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -258,18 +189,6 @@
|
|||
<ClCompile Include="..\..\src\ModManager.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaFixed.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaVector.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaSystemBody.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaComms.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\win32\FileSystemWin32.cpp">
|
||||
<Filter>src\win32</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -285,33 +204,15 @@
|
|||
<ClCompile Include="..\..\src\win32\WinMath.cpp">
|
||||
<Filter>src\win32</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaEvent.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaFileSystem.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Lua.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaRef.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\DeathView.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaDev.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Intro.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Tombstone.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaFaction.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\PngWriter.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -333,27 +234,15 @@
|
|||
<ClCompile Include="..\..\src\EnumStrings.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaMissile.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaShipDef.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\NavLights.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Orbit.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaPropertiedObject.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\GeoPatchID.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\PropertyMap.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\GeoPatch.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -390,9 +279,6 @@
|
|||
<ClCompile Include="..\..\src\ShipCockpit.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaModelBody.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\HudTrail.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -417,9 +303,6 @@
|
|||
<ClCompile Include="..\..\src\ServerAgent.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaServerAgent.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\GasGiantJobs.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -438,12 +321,6 @@
|
|||
<ClCompile Include="..\..\contrib\imgui\imgui_draw.cpp">
|
||||
<Filter>src\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaPiGui.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\PiGui.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\FixedGuns.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -459,9 +336,6 @@
|
|||
<ClCompile Include="..\..\src\JsonUtils.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaInput.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\Input.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -474,9 +348,6 @@
|
|||
<ClCompile Include="..\..\contrib\imgui\examples\imgui_impl_sdl.cpp">
|
||||
<Filter>src\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaJson.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\sound\AmbientSounds.cpp">
|
||||
<Filter>src\sound</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -495,9 +366,6 @@
|
|||
<ClCompile Include="..\..\src\ship\ShipViewController.cpp">
|
||||
<Filter>src\ship</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaVector2.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\pigui\Face.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -510,9 +378,6 @@
|
|||
<ClCompile Include="..\..\src\ship\Propulsion.cpp">
|
||||
<Filter>src\ship</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\LuaColor.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\pigui\LuaModelSpinner.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -537,6 +402,162 @@
|
|||
<ClCompile Include="..\..\src\pigui\LuaImage.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\PerfStats.cpp">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\Lua.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaBody.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaCargoBody.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaColor.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaComms.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaConsole.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaConstants.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaDev.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaEngine.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaEvent.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaFaction.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaFileSystem.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaFixed.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaFormat.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaGame.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaHyperspaceCloud.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaInput.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaJson.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaLang.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaManager.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaMissile.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaModelBody.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaMusic.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaNameGen.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaObject.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaPiGui.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaPlanet.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaPlayer.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaPropertiedObject.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaRand.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaRef.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaSerializer.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaServerAgent.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaShip.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaShipDef.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaSpace.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaSpaceStation.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaStar.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaStarSystem.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaSystemBody.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaSystemPath.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaTimer.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaUtils.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaVector.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\LuaVector2.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\PropertyMap.cpp">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\core\Import.cpp">
|
||||
<Filter>src\Lua\Core</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\lua\core\Sandbox.cpp">
|
||||
<Filter>src\Lua\Core</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\pigui\PerfInfo.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\pigui\PiGui.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\pigui\PiGuiSandbox.cpp">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\Aabb.h">
|
||||
|
|
@ -548,9 +569,6 @@
|
|||
<ClInclude Include="..\..\src\Body.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\buildopts.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CargoBody.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -593,42 +611,6 @@
|
|||
<ClInclude Include="..\..\src\libs.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaConstants.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaEngine.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaFormat.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaGame.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaManager.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaNameGen.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaObject.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaSerializer.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaShipDef.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaSpace.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaTimer.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaUtils.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\matrix4x4.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -716,18 +698,9 @@
|
|||
<ClInclude Include="..\..\src\Background.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaMusic.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaConsole.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\StringF.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaLang.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\TerrainBody.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -773,15 +746,6 @@
|
|||
<ClInclude Include="..\..\src\ModManager.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaVector.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaFixed.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaComms.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\OS.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -791,33 +755,12 @@
|
|||
<ClInclude Include="..\..\src\win32\WinMath.h">
|
||||
<Filter>src\win32</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaEvent.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaFileSystem.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Lua.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\AnimationCurves.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaRef.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaTable.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaPushPull.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\DeathView.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaDev.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Intro.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -848,27 +791,15 @@
|
|||
<ClInclude Include="..\..\src\EnumStrings.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaMissile.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Random.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaWrappable.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\NavLights.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Orbit.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\PropertiedObject.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\PropertyMap.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\GeoPatchID.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -938,9 +869,6 @@
|
|||
<ClInclude Include="..\..\src\ServerAgent.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaServerAgent.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\GasGiantJobs.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -959,12 +887,6 @@
|
|||
<ClInclude Include="..\..\contrib\nanosvg\nanosvgrast.h">
|
||||
<Filter>src\nanosvg</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaPiGui.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\PiGui.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\FixedGuns.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -983,9 +905,6 @@
|
|||
<ClInclude Include="..\..\src\Input.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaInput.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\contrib\imgui\imconfig.h">
|
||||
<Filter>src\imgui</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1016,9 +935,6 @@
|
|||
<ClInclude Include="..\..\contrib\json\json_fwd.hpp">
|
||||
<Filter>src\json</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaJson.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\sound\AmbientSounds.h">
|
||||
<Filter>src\sound</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1040,9 +956,6 @@
|
|||
<ClInclude Include="..\..\src\ship\ShipViewController.h">
|
||||
<Filter>src\ship</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaVector2.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\pigui\Face.h">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1052,9 +965,6 @@
|
|||
<ClInclude Include="..\..\src\ship\Propulsion.h">
|
||||
<Filter>src\ship</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\LuaColor.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\pigui\ModelSpinner.h">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1076,6 +986,123 @@
|
|||
<ClInclude Include="..\..\src\FrameId.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\PerfStats.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\Lua.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaColor.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaComms.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaConsole.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaConstants.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaDev.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaEngine.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaEvent.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaFileSystem.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaFixed.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaFormat.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaGame.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaInput.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaJson.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaLang.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaManager.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaMissile.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaMusic.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaNameGen.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaObject.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaPiGui.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaPushPull.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaRef.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaSerializer.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaServerAgent.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaShipDef.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaSpace.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaTable.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaTimer.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaUtils.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaVector.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaVector2.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\LuaWrappable.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\PropertiedObject.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\PropertyMap.h">
|
||||
<Filter>src\Lua</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\lua\core\CoreFwdDecl.h">
|
||||
<Filter>src\Lua\Core</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\pigui\PerfInfo.h">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\pigui\PiGui.h">
|
||||
<Filter>src\pigui</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\src\win32\pioneer.rc">
|
||||
|
|
|
|||
Loading…
Reference in New Issue