From 296330e05cb1726cdd9a3aefa73d2726a7ba687f Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Wed, 10 Jan 2018 17:51:44 +0100 Subject: [PATCH] Move back to single addons.make file primarily for the RPi --- example/addons.make | 2 +- example/addons.make.rpi | 4 ---- example_camera/addons.make | 3 ++- example_camera/addons.make.rpi | 4 ---- example_gamepad/addons.make | 3 ++- example_gamepad/addons.make.rpi | 4 ---- example_shortcuts/addons.make | 3 ++- example_shortcuts/addons.make.rpi | 4 ---- example_simpler/addons.make | 1 + example_simpler/addons.make.rpi | 4 ---- 10 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 example/addons.make.rpi delete mode 100644 example_camera/addons.make.rpi delete mode 100644 example_gamepad/addons.make.rpi delete mode 100644 example_shortcuts/addons.make.rpi delete mode 100644 example_simpler/addons.make.rpi diff --git a/example/addons.make b/example/addons.make index 0bf6afb..963941c 100644 --- a/example/addons.make +++ b/example/addons.make @@ -1,4 +1,4 @@ ofxGui ofxPiMapper ofxXmlSettings -` +ofxOMXPlayer diff --git a/example/addons.make.rpi b/example/addons.make.rpi deleted file mode 100644 index 963941c..0000000 --- a/example/addons.make.rpi +++ /dev/null @@ -1,4 +0,0 @@ -ofxGui -ofxPiMapper -ofxXmlSettings -ofxOMXPlayer diff --git a/example_camera/addons.make b/example_camera/addons.make index 0d1404c..963941c 100644 --- a/example_camera/addons.make +++ b/example_camera/addons.make @@ -1,3 +1,4 @@ +ofxGui ofxPiMapper ofxXmlSettings -ofxGui +ofxOMXPlayer diff --git a/example_camera/addons.make.rpi b/example_camera/addons.make.rpi deleted file mode 100644 index 963941c..0000000 --- a/example_camera/addons.make.rpi +++ /dev/null @@ -1,4 +0,0 @@ -ofxGui -ofxPiMapper -ofxXmlSettings -ofxOMXPlayer diff --git a/example_gamepad/addons.make b/example_gamepad/addons.make index 0d1404c..963941c 100644 --- a/example_gamepad/addons.make +++ b/example_gamepad/addons.make @@ -1,3 +1,4 @@ +ofxGui ofxPiMapper ofxXmlSettings -ofxGui +ofxOMXPlayer diff --git a/example_gamepad/addons.make.rpi b/example_gamepad/addons.make.rpi deleted file mode 100644 index 963941c..0000000 --- a/example_gamepad/addons.make.rpi +++ /dev/null @@ -1,4 +0,0 @@ -ofxGui -ofxPiMapper -ofxXmlSettings -ofxOMXPlayer diff --git a/example_shortcuts/addons.make b/example_shortcuts/addons.make index 0d1404c..963941c 100644 --- a/example_shortcuts/addons.make +++ b/example_shortcuts/addons.make @@ -1,3 +1,4 @@ +ofxGui ofxPiMapper ofxXmlSettings -ofxGui +ofxOMXPlayer diff --git a/example_shortcuts/addons.make.rpi b/example_shortcuts/addons.make.rpi deleted file mode 100644 index 963941c..0000000 --- a/example_shortcuts/addons.make.rpi +++ /dev/null @@ -1,4 +0,0 @@ -ofxGui -ofxPiMapper -ofxXmlSettings -ofxOMXPlayer diff --git a/example_simpler/addons.make b/example_simpler/addons.make index e72d2dd..963941c 100644 --- a/example_simpler/addons.make +++ b/example_simpler/addons.make @@ -1,3 +1,4 @@ ofxGui ofxPiMapper ofxXmlSettings +ofxOMXPlayer diff --git a/example_simpler/addons.make.rpi b/example_simpler/addons.make.rpi deleted file mode 100644 index 963941c..0000000 --- a/example_simpler/addons.make.rpi +++ /dev/null @@ -1,4 +0,0 @@ -ofxGui -ofxPiMapper -ofxXmlSettings -ofxOMXPlayer