Skip to content

Add cygwin preprocessor flags #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnlohr merged 2 commits into from
Feb 23, 2025
Merged

Add cygwin preprocessor flags #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744da77
Add cygwin preprocessor + remove special clang specific work around
cnlohr Feb 23, 2025
9ae820c
Fix CI
cnlohr Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
vim
gettext-base
- name: Check out respository code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Building rawdraw_sf.h
Expand All @@ -34,7 +34,7 @@ jobs:
# run: |
# git_hash=$(git rev-parse --short "$GITHUB_SHA")
# git commit -m "Updating rawdraw_sf.h to ${git_hash}" rawdraw_sf.h
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: rawdraw_sf
path: rawdraw_sf.h
Expand Down
2 changes: 1 addition & 1 deletion CNFG.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ int CNFGLastScancode = 0;
#include "CNFGHTTP.c"
#elif defined( __wasm__ )
#include "CNFGWASMDriver.c"
#elif defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#elif defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
#include "CNFGWinDriver.c"
#elif defined( EGL_LEAN_AND_MEAN )
#include "CNFGEGLLeanAndMean.c"
Expand Down
2 changes: 1 addition & 1 deletion CNFG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ extern uint32_t CNFGVertDataC[CNFG_BATCH];

#define CNFG_KEY_FOCUS 0xf000

#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)

#define CNFG_KEY_BACKSPACE 0x08
#define CNFG_KEY_TAB 0x09
Expand Down
10 changes: 5 additions & 5 deletions CNFGHTTP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ uint8_t WSPOPMASK()



#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#include <winsock2.h>
#define socklen_t uint32_t
Expand Down Expand Up @@ -1032,7 +1032,7 @@ int TickHTTP()
{
static double last;
double now;
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
static LARGE_INTEGER lpf;
LARGE_INTEGER li;

Expand Down Expand Up @@ -1092,7 +1092,7 @@ int TickHTTP()
memset( &tin, 0, addrlen );
int tsocket = accept( serverSocket, (struct sockaddr *)&tin, &addrlen );

#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
struct linger lx;
lx.l_onoff = 1;
lx.l_linger = 0;
Expand Down Expand Up @@ -1181,7 +1181,7 @@ int TickHTTP()

int RunHTTP( int port )
{
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
{
WORD wVersionRequested;
WSADATA wsaData;
Expand Down Expand Up @@ -1211,7 +1211,7 @@ int RunHTTP( int port )
}

//Disable SO_LINGER (Well, enable it but turn it way down)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
struct linger lx;
lx.l_onoff = 1;
lx.l_linger = 0;
Expand Down
2 changes: 1 addition & 1 deletion CNFGRasterizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ void CNFGBlitImage( uint32_t * data, int x, int y, int w, int h )
newv |= ((((newm>>24)&0xff) * alfa + ((oldm>>24)&0xff) * onemalfa + 128)>>8)<<24;
newv |= ((((newm>>16)&0xff) * alfa + ((oldm>>16)&0xff) * onemalfa + 128)>>8)<<16;
newv |= ((((newm>>8)&0xff) * alfa + ((oldm>>8)&0xff) * onemalfa + 128)>>8)<<8;
#elif defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
#elif defined(WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
uint32_t newv = 255UL<<24; //Alpha, then RGB
newv |= ((((newm>>24)&0xff) * alfa + ((oldm>>16)&0xff) * onemalfa + 128)>>8)<<16;
newv |= ((((newm>>16)&0xff) * alfa + ((oldm>>8)&0xff) * onemalfa + 128)>>8)<<8;
Expand Down
Loading