Skip to content

Commit 0d5c4f7

Browse files
trigger-segfaulttrigger-segfault
committed
IT JUST WORKS
* Fixed the entire external library pipeline. * Added setup.ps1, a handy powershell script to download, extract and organize ALL external dependencies. * Added makelibs.bat, a shorthand for creating all required .lib files from .dll/.def files in one go. (must be run in VS Developer Command Prompt. * All projects have had their vcxproj files cleaned up. * All configuration combinations are now buildable out of the box!!! (after library setup) * Finalized BUILDING.md build instructions, and removed build instructions previously present in "lib/". * Removed 10 kilotons of dlls just hanging out in the project folders. -- Without those I never would have Identified the issue with the wrong mpg123 library version <3 * Removed some " - Copy" files that had served their purpose. (they served no purpose) * Removed the old Asciifier.cpp and .h files partying the the repository root folder. * Added "assets/" with various previews of each program. Including an Ancient Egyptian version of AsciiArtist before it even had a name (dated around 2010, that shit can't even be run without installing VS 2008 VC++ express for those juicy debug dlls. Thanks past me!)
1 parent bc9ed86 commit 0d5c4f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+861
-1286
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# External libraries
2+
lib/*/
3+
4+
15
# Compiled Object files
26
*.slo
37
*.lo

‎AsciiArtist.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
5-
MinimumVisualStudioVersion = 10.0.40219.1
3+
# Visual Studio 16
4+
VisualStudioVersion = 16.0.0
5+
MinimumVisualStudioVersion = 15.9.13
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsciiArtist", "AsciiArtist\AsciiArtist.vcxproj", "{0CC0F0F4-8041-4F01-B186-A1071367BB3D}"
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerConsoleLib", "PowerConsoleLib\PowerConsoleLib.vcxproj", "{B571C836-8F8A-4A07-B42B-B93C98690426}"

‎AsciiArtist/AsciiArtist.vcxproj

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{0CC0F0F4-8041-4F01-B186-A1071367BB3D}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>AsciiArtist</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v140</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3535
<ConfigurationType>Application</ConfigurationType>
3636
<UseDebugLibraries>false</UseDebugLibraries>
37-
<PlatformToolset>v140</PlatformToolset>
37+
<PlatformToolset>v142</PlatformToolset>
3838
<WholeProgramOptimization>true</WholeProgramOptimization>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4242
<ConfigurationType>Application</ConfigurationType>
4343
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>Application</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>
@@ -71,28 +71,38 @@
7171
<PropertyGroup Label="UserMacros" />
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7373
<LinkIncremental>true</LinkIncremental>
74+
<OutDir>$(ProjectDir)bin\$(Configuration)-$(Platform)\</OutDir>
75+
<IntDir>$(ProjectDir)obj\$(Configuration)-$(Platform)\</IntDir>
7476
<IncludePath>$(ProjectDir);$(ProjectDir)..\PowerConsoleLib\;$(IncludePath)</IncludePath>
7577
</PropertyGroup>
7678
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7779
<LinkIncremental>true</LinkIncremental>
80+
<OutDir>$(ProjectDir)bin\$(Configuration)-$(Platform)\</OutDir>
81+
<IntDir>$(ProjectDir)obj\$(Configuration)-$(Platform)\</IntDir>
82+
<IncludePath>$(ProjectDir);$(ProjectDir)..\PowerConsoleLib\;$(IncludePath)</IncludePath>
7883
</PropertyGroup>
7984
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8085
<LinkIncremental>false</LinkIncremental>
86+
<OutDir>$(ProjectDir)bin\$(Configuration)-$(Platform)\</OutDir>
87+
<IntDir>$(ProjectDir)obj\$(Configuration)-$(Platform)\</IntDir>
8188
<IncludePath>$(ProjectDir);$(ProjectDir)..\PowerConsoleLib\;$(IncludePath)</IncludePath>
8289
</PropertyGroup>
8390
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8491
<LinkIncremental>false</LinkIncremental>
92+
<OutDir>$(ProjectDir)bin\$(Configuration)-$(Platform)\</OutDir>
93+
<IntDir>$(ProjectDir)obj\$(Configuration)-$(Platform)\</IntDir>
94+
<IncludePath>$(ProjectDir);$(ProjectDir)..\PowerConsoleLib\;$(IncludePath)</IncludePath>
8595
</PropertyGroup>
8696
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8797
<ClCompile>
8898
<PrecompiledHeader>Use</PrecompiledHeader>
8999
<WarningLevel>Level3</WarningLevel>
90100
<Optimization>Disabled</Optimization>
101+
<IntrinsicFunctions>true</IntrinsicFunctions>
91102
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103+
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
92104
<SDLCheck>true</SDLCheck>
93-
<IntrinsicFunctions>true</IntrinsicFunctions>
94-
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
95-
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
105+
<LanguageStandard>stdcpp17</LanguageStandard>
96106
</ClCompile>
97107
<Link>
98108
<SubSystem>Console</SubSystem>
@@ -105,7 +115,9 @@
105115
<PrecompiledHeader>Use</PrecompiledHeader>
106116
<WarningLevel>Level3</WarningLevel>
107117
<Optimization>Disabled</Optimization>
108-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
120+
<LanguageStandard>stdcpp17</LanguageStandard>
109121
</ClCompile>
110122
<Link>
111123
<SubSystem>Console</SubSystem>
@@ -120,7 +132,8 @@
120132
<FunctionLevelLinking>true</FunctionLevelLinking>
121133
<IntrinsicFunctions>true</IntrinsicFunctions>
122134
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123-
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
135+
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
136+
<LanguageStandard>stdcpp17</LanguageStandard>
124137
</ClCompile>
125138
<Link>
126139
<SubSystem>Console</SubSystem>
@@ -136,7 +149,9 @@
136149
<Optimization>MaxSpeed</Optimization>
137150
<FunctionLevelLinking>true</FunctionLevelLinking>
138151
<IntrinsicFunctions>true</IntrinsicFunctions>
139-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153+
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
154+
<LanguageStandard>stdcpp17</LanguageStandard>
140155
</ClCompile>
141156
<Link>
142157
<SubSystem>Console</SubSystem>

‎AsciiTetris/AsciiTetris - Copy.vcxproj

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)