mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-15 18:45:23 -04:00
un-un-un-un-re-enable ModernGL build
Also slightly improve raspberry pi builds by adding 64 bit build and using 'OpenGL ES' instead of 'OpenGL'
This commit is contained in:
parent
8db639020e
commit
d62b387363
@ -769,66 +769,54 @@ static cc_result Process_RawGetExePath(char* path, int* len) {
|
||||
const char* const Updater_D3D9 = NULL;
|
||||
cc_bool Updater_Clean(void) { return true; }
|
||||
|
||||
#if defined CC_BUILD_LINUX
|
||||
#if __x86_64__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
#ifndef CC_BUILD_GLMODERN
|
||||
"", 1, { { "OpenGL", "ClassiCube" } }
|
||||
#if defined CC_BUILD_RPI
|
||||
#if __aarch64__
|
||||
const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL ES", "cc-rpi64" } } };
|
||||
#else
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-nix64-gl2" },
|
||||
{ "OpenGL", "ClassiCube" }
|
||||
}
|
||||
const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL ES", "ClassiCube.rpi" } } };
|
||||
#endif
|
||||
};
|
||||
#elif __i386__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
#ifndef CC_BUILD_GLMODERN
|
||||
"", 1, { { "OpenGL", "ClassiCube.32" } }
|
||||
#elif defined CC_BUILD_LINUX
|
||||
#if __x86_64__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-nix64-gl2" },
|
||||
{ "OpenGL", "ClassiCube" }
|
||||
}
|
||||
};
|
||||
#elif __i386__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-nix32-gl2" },
|
||||
{ "OpenGL", "ClassiCube.32" }
|
||||
}
|
||||
};
|
||||
#else
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-nix32-gl2" },
|
||||
{ "OpenGL", "ClassiCube.32" }
|
||||
}
|
||||
const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };
|
||||
#endif
|
||||
};
|
||||
#elif CC_BUILD_RPI
|
||||
const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL", "ClassiCube.rpi" } } };
|
||||
#else
|
||||
const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };
|
||||
#endif
|
||||
#elif defined CC_BUILD_MACOS
|
||||
#if __x86_64__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
#ifndef CC_BUILD_GLMODERN
|
||||
"", 1, { { "OpenGL", "ClassiCube.64.osx" } }
|
||||
#if __x86_64__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-osx64-gl2" },
|
||||
{ "OpenGL", "ClassiCube.64.osx" }
|
||||
}
|
||||
};
|
||||
#elif __i386__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-osx32-gl2" },
|
||||
{ "OpenGL", "ClassiCube.osx" }
|
||||
}
|
||||
};
|
||||
#else
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-osx64-gl2" },
|
||||
{ "OpenGL", "ClassiCube.64.osx" }
|
||||
}
|
||||
const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };
|
||||
#endif
|
||||
};
|
||||
#elif __i386__
|
||||
const struct UpdaterInfo Updater_Info = {
|
||||
#ifndef CC_BUILD_GLMODERN
|
||||
"", 1, { { "OpenGL", "ClassiCube.osx" } }
|
||||
#else
|
||||
"&eModernGL is recommended for newer machines (2010 or later)", 2,
|
||||
{
|
||||
{ "ModernGL", "cc-osx32-gl2" },
|
||||
{ "OpenGL", "ClassiCube.osx" }
|
||||
}
|
||||
#endif
|
||||
};
|
||||
#else
|
||||
const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };
|
||||
#endif
|
||||
#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 };
|
||||
#endif
|
||||
|
||||
cc_result Updater_Start(const char** action) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user