From 10f4b956e513b774f4570942618f2a616d9eb24d Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Thu, 10 Oct 2019 15:59:17 +0200 Subject: [PATCH 01/10] Update addon_config.mk to enable msys2 build remove vs specifics as they are common, add ADDON_LDFLAGS dependency on libopenvr_api --- addon_config.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index c152af9..e271b4b 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -37,7 +37,7 @@ common: # any special flag that should be passed to the linker when using this # addon, also used for system libraries with -lname - # ADDON_LDFLAGS = + ADDON_LDFLAGS = -lopenvr_api # linux only, any library that should be included in the project using # pkg-config @@ -60,7 +60,6 @@ common: # a specific platform # ADDON_LIBS_EXCLUDE = -vs: ADDON_INCLUDES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin From 2696d633a9bc728c151c914f795eca7e9d990719 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Thu, 17 Oct 2019 23:18:49 +0200 Subject: [PATCH 02/10] more flags for osx and linux builds --- addon_config.mk | 56 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index e271b4b..090e0f2 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -29,15 +29,16 @@ common: # include search paths, this will be usually parsed from the file system # but if the addon or addon libraries need special search paths they can be # specified here separated by spaces or one per line using += - # ADDON_INCLUDES = + ADDON_INCLUDES = libs/OpenVR/headers src/ libs/OpenVR/src/ libs/OpenVR/src/vrcommon/ + # any special flag that should be passed to the compiler when using this # addon - # ADDON_CFLAGS = + ADDON_CFLAGS = -DPOSIX -DOSX # any special flag that should be passed to the linker when using this # addon, also used for system libraries with -lname - ADDON_LDFLAGS = -lopenvr_api + #ADDON_LDFLAGS = -lopenvr_api # linux only, any library that should be included in the project using # pkg-config @@ -60,19 +61,38 @@ common: # a specific platform # ADDON_LIBS_EXCLUDE = - ADDON_INCLUDES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package\% + ADDON_INCLUDES_EXCLUDE = libs/OpenVR/bin/ + ADDON_INCLUDES_EXCLUDE += libs/OpenVR/bin/% + ADDON_INCLUDES_EXCLUDE += libs/OpenVR/lib/% + ADDON_INCLUDES_EXCLUDE += libs/OpenVR/samples/% + ADDON_INCLUDES_EXCLUDE += libs/OpenVR/unity_package/% - ADDON_SOURCES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples - ADDON_SOURCES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% - + ADDON_LIBS_EXCLUDE = libs/OpenVR/samples/% + ADDON_LIBS_EXCLUDE += libs/OpenVR/unity_package/% + + ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% + ADDON_SOURCES_EXCLUDE += MX/% + +vs: + ADDON_INCLUDES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package\% + + ADDON_SOURCES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples + ADDON_SOURCES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% + +linux64: +# ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% +# ADDON_SOURCES_EXCLUDE += libs/OpenVR/unity_package/% + ADDON_CFLAGS = -DPOSIX -DLINUX +linux: + ADDON_CFLAGS = -DPOSIX -DLINUX From 2fc840d61a42fc7d98275eba03c5fdf9247fa767 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Sun, 20 Oct 2019 21:28:09 +0200 Subject: [PATCH 03/10] more build flags for msys and osx --- addon_config.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index 090e0f2..bddafc8 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -34,7 +34,7 @@ common: # any special flag that should be passed to the compiler when using this # addon - ADDON_CFLAGS = -DPOSIX -DOSX + #ADDON_CFLAGS = -DPOSIX -DOSX # any special flag that should be passed to the linker when using this # addon, also used for system libraries with -lname @@ -93,6 +93,12 @@ vs: linux64: # ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% # ADDON_SOURCES_EXCLUDE += libs/OpenVR/unity_package/% - ADDON_CFLAGS = -DPOSIX -DLINUX + ADDON_CFLAGS = -DPOSIX -DLINUX -DLINUX64 linux: ADDON_CFLAGS = -DPOSIX -DLINUX + +msys2: + ADDON_CFLAGS = -DVR_API_PUBLIC + +osx: + ADDON_CFLAGS = -DPOSIX -DOSX From 01930f41e6138cf9e16c292c08e4d822f9c24098 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Sun, 20 Oct 2019 22:34:02 +0200 Subject: [PATCH 04/10] change order --- addon_config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index bddafc8..ce76d90 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -29,7 +29,7 @@ common: # include search paths, this will be usually parsed from the file system # but if the addon or addon libraries need special search paths they can be # specified here separated by spaces or one per line using += - ADDON_INCLUDES = libs/OpenVR/headers src/ libs/OpenVR/src/ libs/OpenVR/src/vrcommon/ + ADDON_INCLUDES = libs/OpenVR/headers libs/OpenVR/src/ libs/OpenVR/src/vrcommon/ src/ # any special flag that should be passed to the compiler when using this @@ -98,7 +98,7 @@ linux: ADDON_CFLAGS = -DPOSIX -DLINUX msys2: - ADDON_CFLAGS = -DVR_API_PUBLIC + #ADDON_CFLAGS = osx: ADDON_CFLAGS = -DPOSIX -DOSX From 683b9a9fe66f846c11dd7f9d4fc7101d739a7cec Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Mon, 21 Oct 2019 09:16:46 +0200 Subject: [PATCH 05/10] change order, again --- addon_config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addon_config.mk b/addon_config.mk index ce76d90..c26535e 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -29,7 +29,7 @@ common: # include search paths, this will be usually parsed from the file system # but if the addon or addon libraries need special search paths they can be # specified here separated by spaces or one per line using += - ADDON_INCLUDES = libs/OpenVR/headers libs/OpenVR/src/ libs/OpenVR/src/vrcommon/ src/ + ADDON_INCLUDES = src/ libs/OpenVR/headers libs/OpenVR/src/ libs/OpenVR/src/vrcommon/ # any special flag that should be passed to the compiler when using this @@ -69,6 +69,7 @@ common: ADDON_LIBS_EXCLUDE = libs/OpenVR/samples/% ADDON_LIBS_EXCLUDE += libs/OpenVR/unity_package/% + ADDON_LIBS_EXCLUDE += libs/OpenVR/bin/% ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% ADDON_SOURCES_EXCLUDE += MX/% From 60825be0949ac6ff1d7273b5184a6b7a8cd529d7 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Mon, 21 Oct 2019 09:57:49 +0200 Subject: [PATCH 06/10] unexclude openvr bin folder --- addon_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon_config.mk b/addon_config.mk index c26535e..7b7c00e 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -69,7 +69,7 @@ common: ADDON_LIBS_EXCLUDE = libs/OpenVR/samples/% ADDON_LIBS_EXCLUDE += libs/OpenVR/unity_package/% - ADDON_LIBS_EXCLUDE += libs/OpenVR/bin/% + #ADDON_LIBS_EXCLUDE += libs/OpenVR/bin/% ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% ADDON_SOURCES_EXCLUDE += MX/% From 2dfd23f879d75f6f58cceacd394b4045246eb964 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Mon, 21 Oct 2019 10:38:18 +0200 Subject: [PATCH 07/10] adding dll as ldflag --- addon_config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/addon_config.mk b/addon_config.mk index 7b7c00e..0980bfe 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -100,6 +100,7 @@ linux: msys2: #ADDON_CFLAGS = + ADDON_LDFLAGS = -L ../../../libs/OpenVR/bin/win32/ -lopenvr_api osx: ADDON_CFLAGS = -DPOSIX -DOSX From 73f3c76a15535b7d6dcec419f4be7b823a6517c6 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Mon, 21 Oct 2019 11:10:02 +0200 Subject: [PATCH 08/10] absolute path for DLL path --- addon_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon_config.mk b/addon_config.mk index 0980bfe..c262254 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -100,7 +100,7 @@ linux: msys2: #ADDON_CFLAGS = - ADDON_LDFLAGS = -L ../../../libs/OpenVR/bin/win32/ -lopenvr_api + ADDON_LDFLAGS = -L${OF_ROOT}/addons/ofxOpenVRTracker/libs/OpenVR/bin/win32/ -lopenvr_api osx: ADDON_CFLAGS = -DPOSIX -DOSX From d92201dfaa8efd37d9e8fb0fd8c4da747ea693e5 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Wed, 27 May 2020 09:09:43 +0200 Subject: [PATCH 09/10] spaces to tabs --- addon_config.mk | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index c262254..6c953c0 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -67,36 +67,36 @@ common: ADDON_INCLUDES_EXCLUDE += libs/OpenVR/samples/% ADDON_INCLUDES_EXCLUDE += libs/OpenVR/unity_package/% - ADDON_LIBS_EXCLUDE = libs/OpenVR/samples/% - ADDON_LIBS_EXCLUDE += libs/OpenVR/unity_package/% - #ADDON_LIBS_EXCLUDE += libs/OpenVR/bin/% + ADDON_LIBS_EXCLUDE = libs/OpenVR/samples/% + ADDON_LIBS_EXCLUDE += libs/OpenVR/unity_package/% + #ADDON_LIBS_EXCLUDE += libs/OpenVR/bin/% ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% - ADDON_SOURCES_EXCLUDE += MX/% + ADDON_SOURCES_EXCLUDE += MX/% vs: - ADDON_INCLUDES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package - ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package\% + ADDON_INCLUDES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\bin\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\lib\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package + ADDON_INCLUDES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\unity_package\% - ADDON_SOURCES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples - ADDON_SOURCES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% + ADDON_SOURCES_EXCLUDE = ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples + ADDON_SOURCES_EXCLUDE += ..\..\..\addons\ofxOpenVR\libs\OpenVR\samples\% linux64: # ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% # ADDON_SOURCES_EXCLUDE += libs/OpenVR/unity_package/% ADDON_CFLAGS = -DPOSIX -DLINUX -DLINUX64 linux: - ADDON_CFLAGS = -DPOSIX -DLINUX + ADDON_CFLAGS = -DPOSIX -DLINUX msys2: #ADDON_CFLAGS = From 1c063ecdbdc1b041f33220700bde7eb92dc42330 Mon Sep 17 00:00:00 2001 From: Arnaud Loonstra Date: Wed, 27 May 2020 09:51:59 +0200 Subject: [PATCH 10/10] spaces left behind to tab --- addon_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon_config.mk b/addon_config.mk index 6c953c0..d8fb3c6 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -94,7 +94,7 @@ vs: linux64: # ADDON_SOURCES_EXCLUDE = libs/OpenVR/samples/% # ADDON_SOURCES_EXCLUDE += libs/OpenVR/unity_package/% - ADDON_CFLAGS = -DPOSIX -DLINUX -DLINUX64 + ADDON_CFLAGS = -DPOSIX -DLINUX -DLINUX64 linux: ADDON_CFLAGS = -DPOSIX -DLINUX