mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-22 17:12:25 -05:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable ModernGL build

Browse source
This commit is contained in:
UnknownShadow200 2022-01-05 15:28:41 +11:00
parent fdd6e58063
commit 1728314b59
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ClassiCube.vcxproj
View file

@ -22,7 +22,7 @@
<ProjectGuid>{8A7D82BD-178A-4785-B41B-70EDE998920A}</ProjectGuid> <ProjectGuid>{8A7D82BD-178A-4785-B41B-70EDE998920A}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>ClassiCube</RootNamespace> <RootNamespace>ClassiCube</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -41,7 +41,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

24
src/Platform_Posix.c
View file

@ -784,27 +784,19 @@ cc_bool Updater_Clean(void) { return true; }
#if defined CC_BUILD_LINUX #if defined CC_BUILD_LINUX
#if __x86_64__ #if __x86_64__
const struct UpdaterInfo Updater_Info = { const struct UpdaterInfo Updater_Info = {
#ifndef CC_BUILD_GLMODERN "&eModernGL is recommended for newer machines (2015 or later)", 2,
"", 1, { { "OpenGL", "ClassiCube" } }
#else
"&eModernGL is recommended for newer machines (2010 or later)", 2,
{ {
{ "OpenGL", "ClassiCube" }, { "OpenGL", "ClassiCube" },
{ "ModernGL", "cc-nix64-gl2" } { "ModernGL", "cc-nix64-gl2" }
} }
#endif
}; };
#elif __i386__ #elif __i386__
const struct UpdaterInfo Updater_Info = { const struct UpdaterInfo Updater_Info = {
#ifndef CC_BUILD_GLMODERN "&eModernGL is recommended for newer machines (2015 or later)", 2,
"", 1, { { "OpenGL", "ClassiCube.32" } }
#else
"&eModernGL is recommended for newer machines (2010 or later)", 2,
{ {
{ "OpenGL", "ClassiCube.32" }, { "OpenGL", "ClassiCube.32" },
{ "ModernGL", "cc-nix32-gl2" } { "ModernGL", "cc-nix32-gl2" }
} }
#endif
}; };
#elif CC_BUILD_RPI #elif CC_BUILD_RPI
const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL", "ClassiCube.rpi" } } }; const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL", "ClassiCube.rpi" } } };
@ -814,27 +806,19 @@ const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to updat
#elif defined CC_BUILD_MACOS #elif defined CC_BUILD_MACOS
#if __x86_64__ #if __x86_64__
const struct UpdaterInfo Updater_Info = { const struct UpdaterInfo Updater_Info = {
#ifndef CC_BUILD_GLMODERN "&eModernGL is recommended for newer machines (2015 or later)", 2,
"", 1, { { "OpenGL", "ClassiCube.64.osx" } }
#else
"&eModernGL is recommended for newer machines (2010 or later)", 2,
{ {
{ "OpenGL", "ClassiCube.64.osx" }, { "OpenGL", "ClassiCube.64.osx" },
{ "ModernGL", "cc-osx64-gl2" } { "ModernGL", "cc-osx64-gl2" }
} }
#endif
}; };
#elif __i386__ #elif __i386__
const struct UpdaterInfo Updater_Info = { const struct UpdaterInfo Updater_Info = {
#ifndef CC_BUILD_GLMODERN "&eModernGL is recommended for newer machines (2015 or later)", 2,
"", 1, { { "OpenGL", "ClassiCube.osx" } }
#else
"&eModernGL is recommended for newer machines (2010 or later)", 2,
{ {
{ "OpenGL", "ClassiCube.osx" }, { "OpenGL", "ClassiCube.osx" },
{ "ModernGL", "cc-osx32-gl2" } { "ModernGL", "cc-osx32-gl2" }
} }
#endif
}; };
#else #else
const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 }; const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };