From 80598210255dd18c0ace006d5fd315321351ff43 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Thu, 17 Sep 2020 15:03:30 -0400
Subject: [PATCH] [ion/simulator] Fix libpng/libjpeg usage

---
 build/platform.simulator.linux.mak | 2 --
 build/platform.simulator.macos.mak | 2 --
 build/platform.simulator.mak       | 9 ---------
 ion/src/simulator/linux/Makefile   | 5 +++--
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/build/platform.simulator.linux.mak b/build/platform.simulator.linux.mak
index 87e07660d..19e01ba1e 100644
--- a/build/platform.simulator.linux.mak
+++ b/build/platform.simulator.linux.mak
@@ -1,4 +1,2 @@
 TOOLCHAIN = host-gcc
 EXE = bin
-
-EPSILON_SIMULATOR_HAS_LIBPNG = 1
diff --git a/build/platform.simulator.macos.mak b/build/platform.simulator.macos.mak
index 5f2c492e5..bbe011e52 100644
--- a/build/platform.simulator.macos.mak
+++ b/build/platform.simulator.macos.mak
@@ -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
diff --git a/build/platform.simulator.mak b/build/platform.simulator.mak
index e25beb0b8..07f1edd9e 100644
--- a/build/platform.simulator.mak
+++ b/build/platform.simulator.mak
@@ -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
\ No newline at end of file
diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile
index 449ef3651..ca7da03fa 100644
--- a/ion/src/simulator/linux/Makefile
+++ b/ion/src/simulator/linux/Makefile
@@ -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, \