mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2026-05-10 19:01:46 +00:00
[build] Try to fix more compile errors
This commit is contained in:
parent
968204e9d1
commit
e9be2ba20c
4 changed files with 9 additions and 13 deletions
4
Makefile
4
Makefile
|
|
@ -1121,7 +1121,9 @@ endif
|
||||||
CFLAGS += -fPIE
|
CFLAGS += -fPIE
|
||||||
|
|
||||||
# Generate a map file
|
# Generate a map file
|
||||||
LDFLAGS += -Wl,-Map $(MAP)
|
ifeq ($(OSX_BUILD),0)
|
||||||
|
LDFLAGS += -Wl,-Map $(MAP)
|
||||||
|
endif
|
||||||
|
|
||||||
# Prevent a crash with -sopt
|
# Prevent a crash with -sopt
|
||||||
export LANG := C
|
export LANG := C
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,12 @@ extern "C" {
|
||||||
|
|
||||||
#define AT_STARTUP __attribute__((constructor))
|
#define AT_STARTUP __attribute__((constructor))
|
||||||
|
|
||||||
|
#ifdef GIT_HASH
|
||||||
|
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s, [%s]", WINDOW_NAME, get_version(), GIT_HASH); title; })
|
||||||
|
#else
|
||||||
|
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s", WINDOW_NAME, get_version()); title; })
|
||||||
|
#endif
|
||||||
|
|
||||||
extern bool gGameInited;
|
extern bool gGameInited;
|
||||||
extern bool gGfxInited;
|
extern bool gGfxInited;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,6 @@ extern struct GfxWindowManagerAPI *wm_api;
|
||||||
void nx_init(void);
|
void nx_init(void);
|
||||||
void nx_cleanup(void);
|
void nx_cleanup(void);
|
||||||
|
|
||||||
#ifdef GIT_HASH
|
|
||||||
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s, [%s]", WINDOW_NAME, get_version(), GIT_HASH); title; })
|
|
||||||
#else
|
|
||||||
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s", WINDOW_NAME, get_version()); title; })
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -55,12 +55,6 @@ extern "C" {
|
||||||
#define RAPI_NAME "Dummy"
|
#define RAPI_NAME "Dummy"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GIT_HASH
|
|
||||||
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s, [%s]", WINDOW_NAME, get_version(), GIT_HASH); title; })
|
|
||||||
#else
|
|
||||||
#define TITLE ({ char title[96] = ""; snprintf(title, 96, "%s %s", WINDOW_NAME, get_version()); title; })
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue