Skip to content

Commit c8a7a22

Browse files
blonderblonder
committed
Add: folder VS2019 fro compiling with Microsoft Visual Studio 2019 Preview using vcpkg needed for the SDL library.
1 parent 5fd606b commit c8a7a22

9 files changed

+653
-0
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ x64/
1616
/oricutron.aps
1717
/msvc/**/Oricutron.psess
1818
/msvc/**/*.user
19+
/msvc/**/vcpkg

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "msvc/vcpkg"]
2+
path = msvc/vcpkg
3+
url = https://github.com/Microsoft/vcpkg.git

‎msvc/VS2019/Oricutron.sln

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oricutron", "Oricutron.vcxproj", "{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Release|x64 = Release|x64
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}.Debug|x64.ActiveCfg = Debug|x64
15+
{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}.Debug|x64.Build.0 = Debug|x64
16+
{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}.Release|x64.ActiveCfg = Release|x64
17+
{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}.Release|x64.Build.0 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {A01DCBAA-6E13-46A8-BF55-B03859482CD2}
24+
EndGlobalSection
25+
EndGlobal

‎msvc/VS2019/Oricutron.vcxproj

+258
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|x64">
9+
<Configuration>Release</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{89EA5DFF-F149-4A3C-9F9F-DD152D43934E}</ProjectGuid>
15+
<RootNamespace>Oricutron</RootNamespace>
16+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
17+
</PropertyGroup>
18+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
20+
<ConfigurationType>Application</ConfigurationType>
21+
<UseDebugLibraries>true</UseDebugLibraries>
22+
<PlatformToolset>v142</PlatformToolset>
23+
<CharacterSet>MultiByte</CharacterSet>
24+
<UseOfMfc />
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
27+
<ConfigurationType>Application</ConfigurationType>
28+
<UseDebugLibraries>false</UseDebugLibraries>
29+
<PlatformToolset>v142</PlatformToolset>
30+
<WholeProgramOptimization>true</WholeProgramOptimization>
31+
<CharacterSet>MultiByte</CharacterSet>
32+
<UseOfMfc />
33+
</PropertyGroup>
34+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
35+
<ImportGroup Label="ExtensionSettings">
36+
</ImportGroup>
37+
<ImportGroup Label="Shared">
38+
</ImportGroup>
39+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
40+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41+
</ImportGroup>
42+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
43+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
44+
</ImportGroup>
45+
<PropertyGroup Label="UserMacros" />
46+
<PropertyGroup />
47+
<ItemDefinitionGroup>
48+
<PreBuildEvent>
49+
<Command>
50+
if not exist "..\vcpkg\vcpkg.exe" ( git clone -q --depth 1 --single-branch https://github.com/Microsoft/vcpkg.git ..\vcpkg )
51+
if not exist "..\vcpkg\vcpkg.exe" ( ..\vcpkg\bootstrap-vcpkg.bat )
52+
if "$(Platform)"=="x86" ( if not exist "..\vcpkg\installed\x86-windows\bin\SDL2.dll" ( ..\vcpkg\vcpkg.exe install sdl2:x86-windows ) )
53+
if "$(Platform)"=="x64" ( if not exist "..\vcpkg\installed\x64-windows\bin\SDL2.dll" ( ..\vcpkg\vcpkg.exe install sdl2:x64-windows ) )
54+
</Command>
55+
</PreBuildEvent>
56+
<PostBuildEvent>
57+
<Command>
58+
if not exist "$(OutDir)\roms" ( xcopy "..\..\roms" "$(OutDir)\roms\" /E )
59+
if not exist "$(OutDir)\images" ( xcopy "..\..\images" "$(OutDir)\images\" /E )
60+
if not exist "$(OutDir)\oricutron.cfg" ( copy "..\..\oricutron.cfg" "$(OutDir)\oricutron.cfg" )
61+
if "$(Configuration.Contains('Debug'))"=="True" ( copy "..\vcpkg\installed\x64-windows\debug\bin\SDL2d.dll" "$(OutDir)\SDL2.dll" )
62+
if "$(Configuration.Contains('Release'))"=="True" ( copy "..\vcpkg\installed\x64-windows\bin\SDL2.dll" "$(OutDir)\SDL2.dll" )
63+
</Command>
64+
</PostBuildEvent>
65+
</ItemDefinitionGroup>
66+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<ClCompile>
68+
<WarningLevel>Level4</WarningLevel>
69+
<Optimization>Disabled</Optimization>
70+
<SDLCheck>true</SDLCheck>
71+
<AdditionalIncludeDirectories>..\vcpkg\installed\x64-windows\include\SDL2\</AdditionalIncludeDirectories>
72+
<PreprocessorDefinitions>SDL_MAIN_HANDLED=1;__OPENGL_AVAILABLE__;_MBCS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;__CBCOPY__;__CBPASTE__;APP_NAME_FULL="Oricutron 1.2";APP_YEAR="2015";VERSION_COPYRIGHTS="Oricutron 1.2.0 (c)2015 Peter Gordon ([email protected])";%(PreprocessorDefinitions)</PreprocessorDefinitions>
73+
<AdditionalOptions>/we4013 /we4115 %(AdditionalOptions)</AdditionalOptions>
74+
</ClCompile>
75+
<Link>
76+
<AdditionalDependencies>shlwapi.lib;SDL2.lib;ws2_32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
77+
<AdditionalLibraryDirectories>..\vcpkg\installed\x64-windows\lib\</AdditionalLibraryDirectories>
78+
<SubSystem>Console</SubSystem>
79+
<IgnoreAllDefaultLibraries>
80+
</IgnoreAllDefaultLibraries>
81+
<IgnoreSpecificDefaultLibraries>
82+
</IgnoreSpecificDefaultLibraries>
83+
<AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
84+
</Link>
85+
</ItemDefinitionGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
87+
<ClCompile>
88+
<WarningLevel>Level4</WarningLevel>
89+
<Optimization>MaxSpeed</Optimization>
90+
<FunctionLevelLinking>true</FunctionLevelLinking>
91+
<IntrinsicFunctions>true</IntrinsicFunctions>
92+
<SDLCheck>true</SDLCheck>
93+
<AdditionalIncludeDirectories>..\vcpkg\installed\x64-windows\include\SDL2\</AdditionalIncludeDirectories>
94+
<PreprocessorDefinitions>SDL_MAIN_HANDLED=1;__OPENGL_AVAILABLE__;_MBCS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;__CBCOPY__;__CBPASTE__;APP_NAME_FULL="Oricutron 1.2";APP_YEAR="2015";VERSION_COPYRIGHTS="Oricutron 1.2.0 (c)2015 Peter Gordon ([email protected])";%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
96+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
97+
<StringPooling>true</StringPooling>
98+
<AdditionalOptions>/we4013 /we4115 %(AdditionalOptions)</AdditionalOptions>
99+
<OmitFramePointers>true</OmitFramePointers>
100+
</ClCompile>
101+
<Link>
102+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
103+
<OptimizeReferences>true</OptimizeReferences>
104+
<AdditionalDependencies>shlwapi.lib;SDL2.lib;ws2_32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
105+
<AdditionalLibraryDirectories>..\vcpkg\installed\x64-windows\lib\</AdditionalLibraryDirectories>
106+
<SubSystem>Console</SubSystem>
107+
<IgnoreAllDefaultLibraries>
108+
</IgnoreAllDefaultLibraries>
109+
<IgnoreSpecificDefaultLibraries>
110+
</IgnoreSpecificDefaultLibraries>
111+
<AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
112+
</Link>
113+
</ItemDefinitionGroup>
114+
<ItemGroup>
115+
<ClCompile Include="..\..\6502.c" />
116+
<ClCompile Include="..\..\6551.c" />
117+
<ClCompile Include="..\..\6551_com.c" />
118+
<ClCompile Include="..\..\6551_loopback.c" />
119+
<ClCompile Include="..\..\6551_modem.c" />
120+
<ClCompile Include="..\..\8912.c" />
121+
<ClCompile Include="..\..\avi.c" />
122+
<ClCompile Include="..\..\disk.c" />
123+
<ClCompile Include="..\..\disk_pravetz.c" />
124+
<ClCompile Include="..\..\filereq_amiga.c">
125+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
126+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
127+
</ClCompile>
128+
<ClCompile Include="..\..\filereq_beos.cpp">
129+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
130+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
131+
</ClCompile>
132+
<ClCompile Include="..\..\filereq_gtk.c">
133+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
134+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
135+
</ClCompile>
136+
<ClCompile Include="..\..\filereq_sdl.c">
137+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
138+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
139+
</ClCompile>
140+
<ClCompile Include="..\..\filereq_win32.c" />
141+
<ClCompile Include="..\..\font.c" />
142+
<ClCompile Include="..\..\gui.c" />
143+
<ClCompile Include="..\..\gui_beos.cpp">
144+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
145+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
146+
</ClCompile>
147+
<ClCompile Include="..\..\gui_win.c" />
148+
<ClCompile Include="..\..\gui_x11.c">
149+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
150+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
151+
</ClCompile>
152+
<ClCompile Include="..\..\joystick.c" />
153+
<ClCompile Include="..\..\keyboard.c" />
154+
<ClCompile Include="..\..\machine.c" />
155+
<ClCompile Include="..\..\main.c" />
156+
<ClCompile Include="..\..\monitor.c" />
157+
<ClCompile Include="..\..\msgbox_beos.cpp">
158+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
159+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
160+
</ClCompile>
161+
<ClCompile Include="..\..\msgbox_gtk.c">
162+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
163+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
164+
</ClCompile>
165+
<ClCompile Include="..\..\msgbox_os2.c">
166+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
167+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
168+
</ClCompile>
169+
<ClCompile Include="..\..\msgbox_os4.c">
170+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
171+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
172+
</ClCompile>
173+
<ClCompile Include="..\..\msgbox_sdl.c">
174+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
175+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
176+
</ClCompile>
177+
<ClCompile Include="..\..\msgbox_win32.c" />
178+
<ClCompile Include="..\..\plugins\ch376\ch376.c" />
179+
<ClCompile Include="..\..\plugins\ch376\oric_ch376_plugin.c" />
180+
<ClCompile Include="..\..\render_gl.c" />
181+
<ClCompile Include="..\..\render_null.c" />
182+
<ClCompile Include="..\..\render_sw.c">
183+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
184+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
185+
</ClCompile>
186+
<ClCompile Include="..\..\render_sw8.c">
187+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
188+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
189+
</ClCompile>
190+
<ClCompile Include="..\..\snapshot.c" />
191+
<ClCompile Include="..\..\system_sdl.c" />
192+
<ClCompile Include="..\..\tape.c" />
193+
<ClCompile Include="..\..\ula.c" />
194+
<ClCompile Include="..\..\via.c" />
195+
</ItemGroup>
196+
<ItemGroup>
197+
<ClInclude Include="..\..\6502.h" />
198+
<ClInclude Include="..\..\6551.h" />
199+
<ClInclude Include="..\..\8912.h" />
200+
<ClInclude Include="..\..\avi.h" />
201+
<ClInclude Include="..\..\disk.h" />
202+
<ClInclude Include="..\..\disk_pravetz.h" />
203+
<ClInclude Include="..\..\filereq.h" />
204+
<ClInclude Include="..\..\gui.h" />
205+
<ClInclude Include="..\..\joystick.h" />
206+
<ClInclude Include="..\..\keyboard.h" />
207+
<ClInclude Include="..\..\machine.h" />
208+
<ClInclude Include="..\..\main.h" />
209+
<ClInclude Include="..\..\monitor.h" />
210+
<ClInclude Include="..\..\msgbox.h" />
211+
<ClInclude Include="..\..\plugins\ch376\ch376.h" />
212+
<ClInclude Include="..\..\plugins\ch376\oric_ch376_plugin.h" />
213+
<ClInclude Include="..\..\render_gl.h" />
214+
<ClInclude Include="..\..\render_null.h" />
215+
<ClInclude Include="..\..\render_sw.h" />
216+
<ClInclude Include="..\..\render_sw8.h" />
217+
<ClInclude Include="..\..\snapshot.h" />
218+
<ClInclude Include="..\..\system.h" />
219+
<ClInclude Include="..\..\system_sdl.h" />
220+
<ClInclude Include="..\..\tape.h" />
221+
<ClInclude Include="..\..\ula.h" />
222+
<ClInclude Include="..\..\via.h" />
223+
<ClInclude Include="..\strcasecmp.h" />
224+
<ClInclude Include="..\unistd.h" />
225+
</ItemGroup>
226+
<ItemGroup>
227+
<None Include="..\..\filereq_osx.m">
228+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
229+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
230+
</None>
231+
<None Include="..\..\gui_osx.m">
232+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
233+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
234+
</None>
235+
<None Include="..\..\Makefile">
236+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
237+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
238+
</None>
239+
<None Include="..\..\msgbox_osx.m">
240+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
241+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
242+
</None>
243+
<None Include="make_links.cmd">
244+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
245+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
246+
</None>
247+
<None Include="readme.md" />
248+
</ItemGroup>
249+
<ItemGroup>
250+
<Image Include="..\..\winicon.ico" />
251+
</ItemGroup>
252+
<ItemGroup>
253+
<ResourceCompile Include="..\..\oricutron.rc" />
254+
</ItemGroup>
255+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
256+
<ImportGroup Label="ExtensionTargets">
257+
</ImportGroup>
258+
</Project>

0 commit comments

Comments
 (0)