mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-04 05:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Linux building, require sigc++ >= 2.10.0

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

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

104
src/fake-api.h
View file

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

2
src/meson.build
View file

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