mirror of https://github.com/sm64pc/sm64pc.git
Merge f085379e6b
into 59adb5c634
This commit is contained in:
commit
ab706a2ee1
22
Makefile
22
Makefile
|
@ -30,6 +30,9 @@ TARGET_WEB ?= 0
|
||||||
# Makeflag to enable OSX fixes
|
# Makeflag to enable OSX fixes
|
||||||
OSX_BUILD ?= 0
|
OSX_BUILD ?= 0
|
||||||
|
|
||||||
|
# Makeflag to enable OSX fixes on older versions
|
||||||
|
LEGACY_OSX_BUILD ?= 0
|
||||||
|
|
||||||
# Enable -no-pie linker option
|
# Enable -no-pie linker option
|
||||||
NO_PIE ?= 1
|
NO_PIE ?= 1
|
||||||
|
|
||||||
|
@ -194,7 +197,7 @@ ifeq ($(TARGET_RPI),1) # Define RPi to change SDL2 title & GLES2 hints
|
||||||
VERSION_CFLAGS += -DUSE_GLES
|
VERSION_CFLAGS += -DUSE_GLES
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSX_BUILD),1) # Modify GFX & SDL2 for OSX GL
|
ifeq (,$(filter 1,$(OSX_BUILD)$(LEGACY_OSX_BUILD))) # Modify GFX & SDL2 for OSX GL
|
||||||
VERSION_CFLAGS += -DOSX_BUILD
|
VERSION_CFLAGS += -DOSX_BUILD
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -436,7 +439,7 @@ ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth
|
||||||
|
|
||||||
AS := $(CROSS)as
|
AS := $(CROSS)as
|
||||||
|
|
||||||
ifeq ($(OSX_BUILD),1)
|
ifeq (,$(filter 1,$(OSX_BUILD)$(LEGACY_OSX_BUILD)))
|
||||||
AS := i686-w64-mingw32-as
|
AS := i686-w64-mingw32-as
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -470,6 +473,12 @@ else ifeq ($(OSX_BUILD),1)
|
||||||
CPP := cpp-9 -P
|
CPP := cpp-9 -P
|
||||||
OBJDUMP := i686-w64-mingw32-objdump
|
OBJDUMP := i686-w64-mingw32-objdump
|
||||||
OBJCOPY := i686-w64-mingw32-objcopy
|
OBJCOPY := i686-w64-mingw32-objcopy
|
||||||
|
else ifeq ($(LEGACY_OSX_BUILD),1)
|
||||||
|
CC := gcc
|
||||||
|
LD := $(CC)
|
||||||
|
CPP := cpp -P
|
||||||
|
OBJDUMP := i686-w64-mingw32-objdump
|
||||||
|
OBJCOPY := i686-w64-mingw32-objcopy
|
||||||
else # Linux & other builds
|
else # Linux & other builds
|
||||||
CPP := $(CROSS)cpp -P
|
CPP := $(CROSS)cpp -P
|
||||||
OBJCOPY := $(CROSS)objcopy
|
OBJCOPY := $(CROSS)objcopy
|
||||||
|
@ -502,7 +511,7 @@ else ifeq ($(findstring SDL,$(WINDOW_API)),SDL)
|
||||||
BACKEND_LDFLAGS += -lglew32 -lglu32 -lopengl32
|
BACKEND_LDFLAGS += -lglew32 -lglu32 -lopengl32
|
||||||
else ifeq ($(TARGET_RPI),1)
|
else ifeq ($(TARGET_RPI),1)
|
||||||
BACKEND_LDFLAGS += -lGLESv2
|
BACKEND_LDFLAGS += -lGLESv2
|
||||||
else ifeq ($(OSX_BUILD),1)
|
else ifeq (,$(filter 1,$(OSX_BUILD)$(LEGACY_OSX_BUILD)))
|
||||||
BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew`
|
BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew`
|
||||||
else
|
else
|
||||||
BACKEND_LDFLAGS += -lGL
|
BACKEND_LDFLAGS += -lGL
|
||||||
|
@ -540,6 +549,10 @@ ifneq ($(SDL1_USED)$(SDL2_USED),00)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(LEGACY_OSX_BUILD),1)
|
||||||
|
BACKEND_CFLAGS += -I/usr/local/include
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(WINDOWS_BUILD),1)
|
ifeq ($(WINDOWS_BUILD),1)
|
||||||
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(BACKEND_CFLAGS) $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
|
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(BACKEND_CFLAGS) $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
|
||||||
CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(BACKEND_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv
|
CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(BACKEND_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv
|
||||||
|
@ -639,6 +652,9 @@ else ifeq ($(TARGET_RPI),1)
|
||||||
|
|
||||||
else ifeq ($(OSX_BUILD),1)
|
else ifeq ($(OSX_BUILD),1)
|
||||||
LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
|
LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
|
||||||
|
|
||||||
|
else ifeq ($(LEGACY_OSX_BUILD),1)
|
||||||
|
LDFLAGS := -lm $(BACKEND_LDFLAGS) -fno-pie -lpthread
|
||||||
|
|
||||||
else ifeq ($(HOST_OS),Haiku)
|
else ifeq ($(HOST_OS),Haiku)
|
||||||
LDFLAGS := $(BACKEND_LDFLAGS) -no-pie
|
LDFLAGS := $(BACKEND_LDFLAGS) -no-pie
|
||||||
|
|
|
@ -266,7 +266,11 @@ void main_func(void) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(WAPI_SDL1) && defined(__APPLE__)
|
||||||
|
int SDL_main(int argc, char *argv[]) {
|
||||||
|
#else
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
#endif
|
||||||
parse_cli_opts(argc, argv);
|
parse_cli_opts(argc, argv);
|
||||||
main_func();
|
main_func();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue