UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/simulator] Fix libpng/libjpeg usage

Browse Source
This commit is contained in:
Romain Goyet
2020-09-17 15:03:30 -04:00
committed by Léa Saviot
parent b32497da23
commit 8059821025
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/platform.simulator.linux.mak
View File

@@ -1,4 +1,2 @@
TOOLCHAIN = host-gcc
EXE = bin
EPSILON_SIMULATOR_HAS_LIBPNG = 1

2
build/platform.simulator.macos.mak
View File

@@ -6,8 +6,6 @@ APPLE_PLATFORM_MIN_VERSION = 10.10
ARCHS = x86_64
EPSILON_SIMULATOR_HAS_LIBPNG = 1
ifdef ARCH
BUILD_DIR := $(BUILD_DIR)/$(ARCH)
else

9
build/platform.simulator.mak
View File

@@ -8,13 +8,4 @@ TARGET ?= $(HOST)
BUILD_DIR := $(BUILD_DIR)/$(TARGET)
EPSILON_SIMULATOR_HAS_LIBPNG ?= 0
include build/platform.simulator.$(TARGET).mak
SFLAGS += -DEPSILON_SIMULATOR_HAS_LIBPNG=$(EPSILON_SIMULATOR_HAS_LIBPNG)
ifeq ($(EPSILON_SIMULATOR_HAS_LIBPNG),1)
SFLAGS += `libpng-config --cflags`
LDFLAGS += `libpng-config --ldflags`
endif

5
ion/src/simulator/linux/Makefile
View File

@@ -15,6 +15,9 @@ ion_src += $(addprefix ion/src/simulator/linux/, \
platform_language.cpp \
)
SFLAGS += $(shell pkg-config libpng libjpeg --cflags)
LDFLAGS += $(shell pkg-config libpng libjpeg --libs)
ion_src += $(addprefix ion/src/simulator/shared/, \
dummy/haptics_enabled.cpp \
dummy/keyboard_callback.cpp \
@@ -34,8 +37,6 @@ ion_src += ion/src/simulator/shared/dummy/telemetry_init.cpp
ion_src += ion/src/shared/telemetry_console.cpp
endif
LDFLAGS += -ljpeg -lpng
$(eval $(call rule_for, \
INCBIN, \
ion/src/simulator/linux/assets.s ion/src/simulator/linux/platform_images.h, \