mirror of https://github.com/snes9xgit/snes9x.git
Tupfile for super-repositories
- Add Tupfile - Revert Genode Make rules - Allow LIBRETRO_COMM_DIR override
This commit is contained in:
parent
11f02ad704
commit
47e2cf8b73
|
@ -303,22 +303,6 @@ else ifeq ($(platform), emscripten)
|
||||||
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
||||||
STATIC_LINKING = 1
|
STATIC_LINKING = 1
|
||||||
|
|
||||||
# Genode
|
|
||||||
else ifeq ($(platform), genode)
|
|
||||||
TARGET := $(TARGET_NAME)_libretro.lib.so
|
|
||||||
PKG_CONFIG := genode-lib genode-stdcxx
|
|
||||||
CXXFLAGS += -D__GENODE__
|
|
||||||
CXXFLAGS += $(shell pkg-config --cflags $(PKG_CONFIG))
|
|
||||||
|
|
||||||
LDFLAGS += -shared --version-script=link.T
|
|
||||||
LDFLAGS += $(shell pkg-config --libs $(PKG_CONFIG))
|
|
||||||
|
|
||||||
CC = $(shell pkg-config genode-base --variable=cc)
|
|
||||||
CXX = $(shell pkg-config genode-base --variable=cxx)
|
|
||||||
LD = $(shell pkg-config genode-base --variable=ld)
|
|
||||||
AR = $(shell pkg-config genode-base --variable=ar) -rcs
|
|
||||||
LIBS =
|
|
||||||
|
|
||||||
# Windows MSVC 2003 Xbox 1
|
# Windows MSVC 2003 Xbox 1
|
||||||
else ifeq ($(platform), xbox1_msvc2003)
|
else ifeq ($(platform), xbox1_msvc2003)
|
||||||
CFLAGS += -D__WIN32__
|
CFLAGS += -D__WIN32__
|
||||||
|
@ -641,7 +625,7 @@ ifeq ($(STATIC_LINKING),1)
|
||||||
else
|
else
|
||||||
LD = link.exe
|
LD = link.exe
|
||||||
endif
|
endif
|
||||||
else ifneq ($(platform),genode)
|
else
|
||||||
LD = $(CXX)
|
LD = $(CXX)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
ifeq ($(LIBRETRO_COMM_DIR),)
|
||||||
LIBRETRO_COMM_DIR = $(CORE_DIR)/libretro/libretro-common
|
LIBRETRO_COMM_DIR = $(CORE_DIR)/libretro/libretro-common
|
||||||
|
endif
|
||||||
|
|
||||||
INCFLAGS = -I$(CORE_DIR)/libretro -I$(CORE_DIR) -I$(CORE_DIR)/apu/ -I$(CORE_DIR)/apu/bapu
|
INCFLAGS = -I$(CORE_DIR)/libretro -I$(CORE_DIR) -I$(CORE_DIR)/apu/ -I$(CORE_DIR)/apu/bapu
|
||||||
|
|
||||||
ifneq (,$(findstring msvc2003,$(platform)))
|
ifneq (,$(findstring msvc2003,$(platform)))
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
TARGET_NAME=snes9x
|
||||||
|
CORE_DIR=$(TUP_CWD)/..
|
||||||
|
include_rules
|
Loading…
Reference in New Issue