Move netlogger code around
This commit is contained in:
parent
6ce9150585
commit
c6eb7988dc
|
@ -137,7 +137,7 @@ endif
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
CFLAGS += -DHAVE_LOGGER
|
CFLAGS += -DHAVE_LOGGER
|
||||||
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
||||||
INCLUDE += -Iconsole/logger
|
INCLUDE += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
|
ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
|
||||||
|
@ -154,7 +154,7 @@ endif
|
||||||
|
|
||||||
ifeq ($(HAVE_FILE_LOGGER), 1)
|
ifeq ($(HAVE_FILE_LOGGER), 1)
|
||||||
CFLAGS += -DHAVE_FILE_LOGGER
|
CFLAGS += -DHAVE_FILE_LOGGER
|
||||||
INCLUDE += -Iconsole/logger
|
INCLUDE += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_RARCH_EXEC), 1)
|
ifeq ($(HAVE_RARCH_EXEC), 1)
|
||||||
|
|
|
@ -121,7 +121,7 @@ endif
|
||||||
|
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
DEFINES += -DHAVE_LOGGER
|
DEFINES += -DHAVE_LOGGER
|
||||||
INCDIRS += -Iconsole/logger
|
INCDIRS += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
|
PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
|
||||||
|
|
|
@ -121,7 +121,7 @@ endif
|
||||||
|
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
DEFINES += -DHAVE_LOGGER
|
DEFINES += -DHAVE_LOGGER
|
||||||
INCDIRS += -Iconsole/logger
|
INCDIRS += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
|
PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
|
||||||
|
|
|
@ -22,8 +22,8 @@ PPU_CFLAGS += -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUT
|
||||||
PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_null.c file_path.c compat/compat.c conf/config_file.c
|
PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_null.c file_path.c compat/compat.c conf/config_file.c
|
||||||
|
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
PPU_CFLAGS += -DHAVE_LOGGER -Iconsole/logger
|
PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger
|
||||||
PPU_SRCS += console/logger/logger.c
|
PPU_SRCS += logger/netlogger/logger.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PPU_TARGET = retroarch-salamander_ps3.elf
|
PPU_TARGET = retroarch-salamander_ps3.elf
|
||||||
|
|
|
@ -83,7 +83,7 @@ OBJ = griffin/griffin.o
|
||||||
|
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
CFLAGS += -DHAVE_LOGGER
|
CFLAGS += -DHAVE_LOGGER
|
||||||
CFLAGS += -Iconsole/logger
|
CFLAGS += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_FILE_LOGGER), 1)
|
ifeq ($(HAVE_FILE_LOGGER), 1)
|
||||||
|
|
|
@ -44,13 +44,13 @@ OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platfo
|
||||||
ifeq ($(HAVE_LOGGER), 1)
|
ifeq ($(HAVE_LOGGER), 1)
|
||||||
CFLAGS += -DHAVE_LOGGER
|
CFLAGS += -DHAVE_LOGGER
|
||||||
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
||||||
CFLAGS += -Iconsole/logger
|
CFLAGS += -Ilogger/netlogger
|
||||||
OBJ += console/logger/logger.o
|
OBJ += logger/netlogger/logger.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_FILE_LOGGER), 1)
|
ifeq ($(HAVE_FILE_LOGGER), 1)
|
||||||
CFLAGS += -DHAVE_FILE_LOGGER
|
CFLAGS += -DHAVE_FILE_LOGGER
|
||||||
CFLAGS += -Iconsole/logger
|
CFLAGS += -Ilogger/netlogger
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts
|
CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts
|
||||||
|
|
|
@ -38,9 +38,9 @@ CONSOLE EXTENSIONS
|
||||||
#ifdef RARCH_CONSOLE
|
#ifdef RARCH_CONSOLE
|
||||||
|
|
||||||
#if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
|
#if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
|
||||||
#include "../console/logger/psl1ght_logger.c"
|
#include "../logger/netlogger/psl1ght_logger.c"
|
||||||
#elif defined(HAVE_LOGGER) && !defined(ANDROID)
|
#elif defined(HAVE_LOGGER) && !defined(ANDROID)
|
||||||
#include "../console/logger/logger.c"
|
#include "../logger/netlogger/logger.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HW_DOL
|
#ifdef HW_DOL
|
||||||
|
|
Loading…
Reference in New Issue