From 6eea7fafc6c978426742b95836bb4344ffadd211 Mon Sep 17 00:00:00 2001 From: Matt Felsen Date: Sat, 14 Nov 2015 23:46:00 -0500 Subject: [PATCH 1/2] Update addon_config.mk, remove extraneous info --- addon_config.mk | 76 +------------------------------------------------ 1 file changed, 1 insertion(+), 75 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index e864a66..ffd1466 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -6,74 +6,13 @@ meta: ADDON_URL = https://github.com/robotconscience/ofxTurboJpeg common: - # dependencies with other addons, a list of them separated by spaces - # or use += in several lines - ADDON_DEPENDENCIES = - - # 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 = src/ ADDON_INCLUDES += libs/turbo-jpeg/include - # any special flag that should be passed to the compiler when using this - # addon - ADDON_CFLAGS = - - # any special flag that should be passed to the linker when using this - # addon, also used for system libraries with -lname - ADDON_LDFLAGS = - - # linux only, any library that should be included in the project using - # pkg-config - ADDON_PKG_CONFIG_LIBRARIES = - - # osx/iOS only, any framework that should be included in the project - ADDON_FRAMEWORKS = - - # source files, these will be usually parsed from the file system looking - # in the src folders in libs and the root of the addon. if your addon needs - # to include files in different places or a different set of files per platform - # they can be specified here ADDON_SOURCES = src/ofxTurboJpeg.h ADDON_SOURCES += src/ofxTurboJpeg.cpp - # some addons need resources to be copied to the bin/data folder of the project - # specify here any files that need to be copied, you can use wildcards like * and ? - ADDON_DATA = - - # when parsing the file system looking for libraries exclude this for all or - # a specific platform - ADDON_LIBS_EXCLUDE = - -linux64: - # binary libraries, these will be usually parsed from the file system but some - # libraries need to passed to the linker in a specific order - #nothing yet - -linux: - #nothing yet - -win_cb: - #nothing yet - vs: - # source files, these will be usually parsed from the file system looking - # in the src folders in libs and the root of the addon. if your addon needs - # to include files in different places or a different set of files per platform - # they can be specified here - ADDON_SOURCES += - - # 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 += - - - # when parsing the file system looking for include paths exclude this for all or - # a specific platform - ADDON_INCLUDES_EXCLUDE - # These should get automatically set up by the projectGenerator. If you're adding # to a project manually, use the following pattern: # Win32/Debug @@ -85,18 +24,5 @@ vs: # x64/Release # ADDON_LIBS = libs/libwebsockets/lib/vs/x64/Release/turbojpeg-static.lib -linuxarmv6l: - ADDON_LDFLAGS = - ADDON_LIBS = -linuxarmv7l: - #nothing yet - -android/armeabi: - #nothing yet - -android/armeabi-v7a: - #nothing yet - osx: - ADDON_DATA = libs/turbo-jpeg/lib/osx/libturbojpeg.dylib - ADDON_LDFLAGS = ../../../addons/ofxTurboJpeg/libs/turbo-jpeg/lib/osx/libturbojpeg.dylib + ADDON_DLLS_TO_COPY = libs/turbo-jpeg/lib/osx/libturbojpeg.dylib From dc2aa09b900e5ce185fa0ec0ec2e37ae5a840b77 Mon Sep 17 00:00:00 2001 From: Matt Felsen Date: Mon, 11 Jan 2016 23:00:41 -0500 Subject: [PATCH 2/2] Remove now-irrelevant flag from addon_config.mk --- addon_config.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/addon_config.mk b/addon_config.mk index ffd1466..5e9c4dc 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -23,6 +23,3 @@ vs: # ADDON_LIBS = libs/libwebsockets/lib/vs/x64/Debug/turbojpeg-static.lib # x64/Release # ADDON_LIBS = libs/libwebsockets/lib/vs/x64/Release/turbojpeg-static.lib - -osx: - ADDON_DLLS_TO_COPY = libs/turbo-jpeg/lib/osx/libturbojpeg.dylib