Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DON'T MERGE YET] Update addon_config.mk, remove extraneous info #3

Merged
merged 2 commits into from
Jan 12, 2016
Merged

[DON'T MERGE YET] Update addon_config.mk, remove extraneous info #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eea7fa
Update addon_config.mk, remove extraneous info
mattfelsen Nov 15, 2015
dc2aa09
Remove now-irrelevant flag from addon_config.mk
mattfelsen Jan 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions addon_config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -84,19 +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

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