Fix Linux building, require sigc++ >= 2.10.0

This commit is contained in:
Struma 2020-01-18 20:22:12 -05:00 committed by Roza
parent 108f85766c
commit 8520c762c3
3 changed files with 51 additions and 90 deletions

View file

@ -120,6 +120,7 @@ elif host_system == 'darwin'
global_link_args += '-mmacosx-version-min='+minimum_macos_version
else
subdir('linux')
add_project_arguments('-std=c++11', language: 'objcpp')
endif
executable(meson.project_name(),

View file

@ -19,139 +19,99 @@ typedef unsigned int DWORD, UINT, *LPDWORD;
typedef char BYTE, *LPSTR, *LPCSTR, *LPCTSTR, *LPTSTR, *PBYTE;
typedef short SHORT;
typedef int LONG;
#ifdef __APPLE__
typedef signed char BOOL;
#endif
typedef void VOID, *LPVOID, *HANDLE, *HMODULE, *HWND;
typedef size_t SIZE_T;
typedef struct {
LONG x;
LONG y;
LONG x;
LONG y;
} POINT, *LPPOINT;
typedef struct {
LONG left;
LONG top;
LONG right;
LONG bottom;
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECT, *PRECT, *NPRECT, *LPRECT;
typedef struct {
BYTE ACLineStatus;
BYTE BatteryFlag;
BYTE BatteryLifePercent;
BYTE SystemStatusFlag;
DWORD BatteryLifeTime;
DWORD BatteryFullLifeTime;
BYTE ACLineStatus;
BYTE BatteryFlag;
BYTE BatteryLifePercent;
BYTE SystemStatusFlag;
DWORD BatteryLifeTime;
DWORD BatteryFullLifeTime;
} SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
#endif
#define DUMMY_VAL 571
#define NOP \
{ \
return; \
}
#define NOP_VAL(x) \
{ \
return x; \
}
#define NOP \
{ return; }
#define NOP_VAL(x) \
{ return x; }
PREFABI DWORD
MKXP_GetCurrentThreadId(void);
PREFABI DWORD MKXP_GetCurrentThreadId(void);
PREFABI DWORD
MKXP_GetWindowThreadProcessId(HWND hWnd, LPDWORD lpdwProcessId);
PREFABI DWORD MKXP_GetWindowThreadProcessId(HWND hWnd, LPDWORD lpdwProcessId);
PREFABI HWND
MKXP_FindWindowEx(HWND hWnd,
HWND hWndChildAfter,
LPCSTR lpszClass,
LPCSTR lpszWindow
);
PREFABI HWND MKXP_FindWindowEx(HWND hWnd, HWND hWndChildAfter, LPCSTR lpszClass,
LPCSTR lpszWindow);
PREFABI DWORD
MKXP_GetForegroundWindow(void);
PREFABI DWORD MKXP_GetForegroundWindow(void);
PREFABI BOOL
MKXP_GetClientRect(HWND hWnd, LPRECT lpRect);
PREFABI BOOL MKXP_GetClientRect(HWND hWnd, LPRECT lpRect);
PREFABI BOOL
MKXP_GetCursorPos(LPPOINT lpPoint);
PREFABI BOOL MKXP_GetCursorPos(LPPOINT lpPoint);
PREFABI BOOL
MKXP_ScreenToClient(HWND hWnd, LPPOINT lpPoint);
PREFABI BOOL MKXP_ScreenToClient(HWND hWnd, LPPOINT lpPoint);
PREFABI BOOL
MKXP_SetWindowPos(HWND hWnd,
HWND hWndInsertAfter,
int X,
int Y,
int cx,
int cy,
UINT uFlags);
PREFABI BOOL MKXP_SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y,
int cx, int cy, UINT uFlags);
PREFABI BOOL
MKXP_SetWindowTextA(HWND hWnd, LPCSTR lpString);
PREFABI BOOL MKXP_SetWindowTextA(HWND hWnd, LPCSTR lpString);
PREFABI BOOL
MKXP_GetWindowRect(HWND hWnd, LPRECT lpRect);
PREFABI BOOL MKXP_GetWindowRect(HWND hWnd, LPRECT lpRect);
PREFABI BOOL
MKXP_RegisterHotKey(HWND hWnd,
int id,
UINT fsModifiers,
UINT vk);
PREFABI BOOL MKXP_RegisterHotKey(HWND hWnd, int id, UINT fsModifiers, UINT vk);
PREFABI LONG
MKXP_SetWindowLong(HWND hWnd, int nIndex, LONG dwNewLong);
PREFABI LONG MKXP_SetWindowLong(HWND hWnd, int nIndex, LONG dwNewLong);
PREFABI BOOL
MKXP_GetKeyboardState(PBYTE lpKeyState);
PREFABI BOOL MKXP_GetKeyboardState(PBYTE lpKeyState);
#ifndef __WIN32__
PREFABI VOID
MKXP_RtlMoveMemory(VOID *Destination, VOID *Source, SIZE_T Length);
PREFABI VOID MKXP_RtlMoveMemory(VOID *Destination, VOID *Source, SIZE_T Length);
PREFABI HMODULE
MKXP_LoadLibrary(LPCSTR lpLibFileName);
PREFABI HMODULE MKXP_LoadLibrary(LPCSTR lpLibFileName);
PREFABI BOOL
MKXP_FreeLibrary(HMODULE hLibModule);
PREFABI BOOL MKXP_FreeLibrary(HMODULE hLibModule);
PREFABI SHORT
MKXP_GetAsyncKeyState(int vKey);
PREFABI SHORT MKXP_GetAsyncKeyState(int vKey);
PREFABI BOOL
MKXP_GetSystemPowerStatus(LPSYSTEM_POWER_STATUS lpSystemPowerStatus);
PREFABI BOOL
MKXP_ShowWindow(HWND hWnd, int nCmdShow);
PREFABI BOOL MKXP_ShowWindow(HWND hWnd, int nCmdShow);
PREFABI int
MKXP_GetSystemMetrics(int nIndex);
PREFABI int MKXP_GetSystemMetrics(int nIndex);
PREFABI HWND
MKXP_SetCapture(HWND hWnd);
PREFABI HWND MKXP_SetCapture(HWND hWnd);
PREFABI BOOL
MKXP_ReleaseCapture(void);
PREFABI BOOL MKXP_ReleaseCapture(void);
PREFABI int
MKXP_ShowCursor(BOOL bShow);
PREFABI int MKXP_ShowCursor(BOOL bShow);
PREFABI DWORD
MKXP_GetPrivateProfileString(LPCTSTR lpAppName,
LPCTSTR lpKeyName,
LPCTSTR lpDefault,
LPTSTR lpReturnedString,
DWORD nSize,
LPCTSTR lpFileName);
PREFABI DWORD MKXP_GetPrivateProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName,
LPCTSTR lpDefault,
LPTSTR lpReturnedString, DWORD nSize,
LPCTSTR lpFileName);
PREFABI short
MKXP_GetUserDefaultLangID(void);
PREFABI short MKXP_GetUserDefaultLangID(void);
PREFABI BOOL
MKXP_GetUserName(LPSTR lpBuffer, LPDWORD pcbBuffer);
PREFABI BOOL MKXP_GetUserName(LPSTR lpBuffer, LPDWORD pcbBuffer);
#endif
#endif

View file

@ -1,4 +1,4 @@
sigcxx = dependency('sigc++-2.0')
sigcxx = dependency('sigc++-2.0', version: '>=2.10.0')
pixman = dependency('pixman-1')
physfs = dependency('physfs', version: '>=2.1')
vorbisfile = dependency('vorbisfile')