diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 85ffcddb8..629f739c8 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -13,6 +13,7 @@ concurrency: group: ${{ github.ref }}-linux cancel-in-progress: true +jobs: #============================================ # =============== 32 BIT LINUX ============== # =========================================== diff --git a/src/AudioBackend.c b/src/AudioBackend.c index 157da4bfe..590f8443d 100644 --- a/src/AudioBackend.c +++ b/src/AudioBackend.c @@ -28,11 +28,12 @@ static void AudioBase_FreeChunks(struct AudioChunk* chunks, int numChunks); *#########################################################################################################################*/ /* Simpler to just include subset of OpenAL actually use here instead of including */ /* === BEGIN OPENAL HEADERS === */ -#if defined _WIN32 -#define APIENTRY __cdecl +#if defined CC_BUILD_WIN + #define APIENTRY __cdecl #else -#define APIENTRY + #define APIENTRY #endif + #define AL_NONE 0 #define AL_GAIN 0x100A #define AL_SOURCE_STATE 0x1010 diff --git a/src/Http_Worker.c b/src/Http_Worker.c index f77ecb757..f9c14c6b1 100644 --- a/src/Http_Worker.c +++ b/src/Http_Worker.c @@ -161,10 +161,10 @@ typedef int CURLcode; #define CURL_HTTP_VERSION_1_1 2L /* stick to HTTP 1.1 */ -#if defined _WIN32 -#define APIENTRY __cdecl +#if defined CC_BUILD_WIN + #define APIENTRY __cdecl #else -#define APIENTRY + #define APIENTRY #endif static CURLcode (APIENTRY *_curl_global_init)(long flags); diff --git a/src/_GLShared.h b/src/_GLShared.h index 2b526b01f..2d049aa15 100644 --- a/src/_GLShared.h +++ b/src/_GLShared.h @@ -3,19 +3,19 @@ #define _GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 #if defined CC_BUILD_WEB || defined CC_BUILD_ANDROID -#define PIXEL_FORMAT GL_RGBA + #define PIXEL_FORMAT GL_RGBA #else -#define PIXEL_FORMAT _GL_BGRA_EXT + #define PIXEL_FORMAT _GL_BGRA_EXT #endif #if defined CC_BIG_ENDIAN -/* Pixels are stored in memory as A,R,G,B but GL_UNSIGNED_BYTE will interpret as B,G,R,A */ -/* So use GL_UNSIGNED_INT_8_8_8_8_REV instead to remedy this */ -#define TRANSFER_FORMAT _GL_UNSIGNED_INT_8_8_8_8_REV + /* Pixels are stored in memory as A,R,G,B but GL_UNSIGNED_BYTE will interpret as B,G,R,A */ + /* So use GL_UNSIGNED_INT_8_8_8_8_REV instead to remedy this */ + #define TRANSFER_FORMAT _GL_UNSIGNED_INT_8_8_8_8_REV #else -/* Pixels are stored in memory as B,G,R,A and GL_UNSIGNED_BYTE will interpret as B,G,R,A */ -/* So fine to just use GL_UNSIGNED_BYTE here */ -#define TRANSFER_FORMAT GL_UNSIGNED_BYTE + /* Pixels are stored in memory as B,G,R,A and GL_UNSIGNED_BYTE will interpret as B,G,R,A */ + /* So fine to just use GL_UNSIGNED_BYTE here */ + #define TRANSFER_FORMAT GL_UNSIGNED_BYTE #endif #define uint_to_ptr(raw) ((void*)((cc_uintptr)(raw)))