Resurrect linux build (checked on Ubuntu 18.04)

Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2020-06-07 11:49:57 +01:00
parent 1663c7caf3
commit 23219734da
9 changed files with 22 additions and 20 deletions

View File

@ -1,4 +1,4 @@
#include "pch.h"
#include "stdafx.h"
#include "Game.h"
namespace Gaming {

View File

@ -1,4 +1,4 @@
#include "pch.h"
#include "stdafx.h"
#include "GameController.h"
#include "Game.h"

View File

@ -89,7 +89,7 @@
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
@ -112,7 +112,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
@ -127,7 +127,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
@ -141,7 +141,7 @@
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
@ -160,7 +160,7 @@
<ItemGroup>
<ClCompile Include="Game.cpp" />
<ClCompile Include="GameController.cpp" />
<ClCompile Include="pch.cpp">
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@ -172,7 +172,7 @@
<ClInclude Include="..\inc\Game.h" />
<ClInclude Include="..\inc\GameController.h" />
<ClInclude Include="..\inc\SDLWrapper.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -17,10 +17,10 @@
<ClCompile Include="GameController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pch.cpp">
<ClCompile Include="SDLWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SDLWrapper.cpp">
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@ -31,10 +31,10 @@
<ClInclude Include="..\inc\GameController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pch.h">
<ClInclude Include="..\inc\SDLWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\inc\SDLWrapper.h">
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

View File

@ -1,4 +1,4 @@
#include "pch.h"
#include "stdafx.h"
#include "SDLWrapper.h"
using namespace Gaming;

View File

@ -1,5 +1,5 @@
// pch.cpp: source file corresponding to the pre-compiled header
// stdafx.cpp: source file corresponding to the pre-compiled header
#include "pch.h"
#include "stdafx.h"
// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.

View File

@ -1,11 +1,11 @@
// pch.h: This is a precompiled header file.
// stdafx.h: This is a precompiled header file.
// Files listed below are compiled only once, improving build performance for future builds.
// This also affects IntelliSense performance, including code completion and many code browsing features.
// However, files listed here are ALL re-compiled if any one of them is updated between builds.
// Do not add files here that you will be updating frequently as this negates the performance advantage.
#ifndef PCH_H
#define PCH_H
#ifndef STDAFX_H
#define STDAFX_H
#include <cstdint>
#include <map>
@ -17,4 +17,4 @@
#include <Device.h>
#endif //PCH_H
#endif //STDAFX_H

View File

@ -3,6 +3,8 @@
#include <cstdint>
#include <fstream>
#include <string>
#include <ios>
#include <sstream>
#include <map>
#include <optional>
#include <vector>

View File

@ -2,7 +2,7 @@ LIB = libeightbit.a
CXXFLAGS = -I ../inc
CXXFILES = BigEndianProcessor.cpp Bus.cpp Chip.cpp Device.cpp EventArgs.cpp InputOutput.cpp IntelProcessor.cpp LittleEndianProcessor.cpp Memory.cpp Processor.cpp Ram.cpp Rom.cpp UnusedMemory.cpp
CXXFILES = BigEndianProcessor.cpp Bus.cpp Chip.cpp Device.cpp EventArgs.cpp InputOutput.cpp IntelHexFile.cpp IntelProcessor.cpp LittleEndianProcessor.cpp Memory.cpp Processor.cpp Ram.cpp Rom.cpp UnusedMemory.cpp
include ../compile.mk
include ../lib_build.mk