Merge branch 'mover_in_c++' into mover_in_c++

2026-09-03 11:09:18 +02:00 · 2017-03-15 12:04:14 +01:00
parent d2ddf4e871 0cd3109587
commit 2b47f1951c
228 changed files with 7336 additions and 60131 deletions
--- a/maszyna.vcxproj
+++ b/maszyna.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -13,18 +13,17 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8E0232E5-1C67-442F-9E04-45ED2DDFC960}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -37,14 +36,11 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>mhEU07-201702debug</TargetName>
-    <IntDir>E:\Gry\EU07\eu07 exe\tmj-cpp-hamulec</IntDir>
-    <OutDir>E:\Gry\EU07\eu07 exe\tmj-cpp</OutDir>
+    <TargetName>eu07++</TargetName>
+    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)bin\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>mkEU07-20170308</TargetName>
-    <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>E:\Gry\EU07\MaSzyna_16_08</OutDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -52,37 +48,36 @@
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <MinimalRebuild>false</MinimalRebuild>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
    </ClCompile>
    <Link>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
@@ -103,9 +98,11 @@
    <ClCompile Include="EvLaunch.cpp" />
    <ClCompile Include="FadeSound.cpp" />
    <ClCompile Include="Float3d.cpp" />
+    <ClCompile Include="frustum.cpp" />
    <ClCompile Include="Gauge.cpp" />
    <ClCompile Include="Globals.cpp" />
    <ClCompile Include="Ground.cpp" />
+    <ClCompile Include="lightarray.cpp" />
    <ClCompile Include="Logs.cpp" />
    <ClCompile Include="mczapkie\friction.cpp" />
    <ClCompile Include="mczapkie\hamulce.cpp" />
@@ -117,19 +114,23 @@
    <ClCompile Include="Model3d.cpp" />
    <ClCompile Include="mtable.cpp" />
    <ClCompile Include="Names.cpp" />
-    <ClCompile Include="opengl\ARB_Multisample.cpp" />
    <ClCompile Include="parser.cpp" />
    <ClCompile Include="PyInt.cpp" />
    <ClCompile Include="RealSound.cpp" />
+    <ClCompile Include="renderer.cpp" />
    <ClCompile Include="ResourceManager.cpp" />
    <ClCompile Include="Segment.cpp" />
    <ClCompile Include="sky.cpp" />
+    <ClCompile Include="skydome.cpp" />
+    <ClCompile Include="sn_utils.cpp" />
    <ClCompile Include="Sound.cpp" />
    <ClCompile Include="Spring.cpp" />
+    <ClCompile Include="stars.cpp" />
    <ClCompile Include="stdafx.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
    </ClCompile>
+    <ClCompile Include="sun.cpp" />
    <ClCompile Include="Texture.cpp" />
    <ClCompile Include="TextureDDS.cpp" />
    <ClCompile Include="Timer.cpp" />
@@ -140,6 +141,7 @@
    <ClCompile Include="TrkFoll.cpp" />
    <ClCompile Include="VBO.cpp" />
    <ClCompile Include="wavread.cpp" />
+    <ClCompile Include="windows.cpp" />
    <ClCompile Include="World.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -149,10 +151,12 @@
    <ClInclude Include="Button.h" />
    <ClInclude Include="Camera.h" />
    <ClInclude Include="Classes.h" />
+    <ClInclude Include="color.h" />
    <ClInclude Include="Console.h" />
    <ClInclude Include="Console\LPT.h" />
    <ClInclude Include="Console\MWD.h" />
    <ClInclude Include="Console\PoKeys55.h" />
+    <ClInclude Include="Data.h" />
    <ClInclude Include="Driver.h" />
    <ClInclude Include="dumb3d.h" />
    <ClInclude Include="DynObj.h" />
@@ -160,9 +164,11 @@
    <ClInclude Include="EvLaunch.h" />
    <ClInclude Include="FadeSound.h" />
    <ClInclude Include="Float3d.h" />
+    <ClInclude Include="frustum.h" />
    <ClInclude Include="Gauge.h" />
    <ClInclude Include="Globals.h" />
    <ClInclude Include="Ground.h" />
+    <ClInclude Include="lightarray.h" />
    <ClInclude Include="Logs.h" />
    <ClInclude Include="McZapkie\friction.h" />
    <ClInclude Include="McZapkie\hamulce.h" />
@@ -174,20 +180,21 @@
    <ClInclude Include="Model3d.h" />
    <ClInclude Include="mtable.h" />
    <ClInclude Include="Names.h" />
-    <ClInclude Include="opengl\arb_multisample.h" />
-    <ClInclude Include="opengl\glew.h" />
-    <ClInclude Include="opengl\wglew.h" />
    <ClInclude Include="parser.h" />
    <ClInclude Include="PyInt.h" />
-    <ClInclude Include="python\include\Python.h" />
    <ClInclude Include="RealSound.h" />
+    <ClInclude Include="renderer.h" />
    <ClInclude Include="resource.h" />
    <ClInclude Include="ResourceManager.h" />
    <ClInclude Include="Segment.h" />
    <ClInclude Include="sky.h" />
+    <ClInclude Include="skydome.h" />
+    <ClInclude Include="sn_utils.h" />
    <ClInclude Include="Sound.h" />
    <ClInclude Include="Spring.h" />
+    <ClInclude Include="stars.h" />
    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="sun.h" />
    <ClInclude Include="targetver.h" />
    <ClInclude Include="Texture.h" />
    <ClInclude Include="TextureDDS.h" />
@@ -208,10 +215,6 @@
  <ItemGroup>
    <Image Include="eu07.ico" />
  </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-    <None Include="ClassDiagram1.cd" />
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>