Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions example-ShaderLiveCoding/Makefile
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ endif

# make sure the the OF_ROOT location is defined
ifndef OF_ROOT
OF_ROOT=../../..
OF_ROOT=$(realpath ../../..)
endif

# call the project makefile!
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/config.project.make
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
10 changes: 9 additions & 1 deletion example-ShaderLiveCoding/Project.xcconfig
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,13 @@ OF_PATH = ../../..
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"

OTHER_LDFLAGS = $(OF_CORE_LIBS)
//ICONS - NEW IN 0072
ICON_NAME_DEBUG = icon-debug.icns
ICON_NAME_RELEASE = icon.icns
ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/

//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
//ICON_FILE_PATH = bin/data/

OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
608 changes: 0 additions & 608 deletions example-ShaderLiveCoding/ShaderLiveCoding.xcodeproj/project.pbxproj

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion example-ShaderLiveCoding/addons.make
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1 +1 @@

ofxAutoReloadedShader
Empty file modified example-ShaderLiveCoding/bin/data/.gitkeep
100755 → 100644
Empty file.
84 changes: 52 additions & 32 deletions example-ShaderLiveCoding/config.make
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
################################################################################
# CONFIGURE PROJECT MAKEFILE
# CONFIGURE PROJECT MAKEFILE (optional)
# This file is where we make project specific configurations.
################################################################################

OF_ROOT=../../..

################################################################################
# Custom Application Name
# Will default to the project's folder name if not defined.
# OF ROOT
# The location of your root openFrameworks installation
# (default) OF_ROOT = ../../..
################################################################################

#APPNAME=myappname
# OF_ROOT = ../../..

################################################################################
# PROJECT ROOT
# If not defined, the project root is assumed to be "this" directory (i.e. ./)
# The location of the project - a starting place for searching for files
# (default) PROJECT_ROOT = . (this directory)
#
################################################################################

PROJECT_ROOT = .
# PROJECT_ROOT = .

################################################################################
# PROJECT SPECIFIC CHECKS
Expand All @@ -28,15 +27,16 @@ PROJECT_ROOT = .
################################################################################
# None

# ################################################################################
# # PROJECT EXTERNAL SOURCE PATHS
# # These are fully qualified paths that are not within the PROJECT_ROOT folder.
# # Like source folders in the PROJECT_ROOT, these paths are subject to
# # exlclusion via the PROJECT_EXLCUSIONS list.
# #
# # Note: Leave a leading space when adding list items with the += operator
# ################################################################################

################################################################################
# PROJECT EXTERNAL SOURCE PATHS
# These are fully qualified paths that are not within the PROJECT_ROOT folder.
# Like source folders in the PROJECT_ROOT, these paths are subject to
# exlclusion via the PROJECT_EXLCUSIONS list.
#
# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank)
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_EXTERNAL_SOURCE_PATHS =

################################################################################
Expand All @@ -51,18 +51,24 @@ PROJECT_ROOT = .
# GNU make only allows one wildcard for matching. The second wildcard (%) is
# treated literally.
#
# (default) PROJECT_EXCLUSIONS = (blank)
#
# Will automatically exclude the following:
#
# $(PROJECT_ROOT)/bin%
# $(PROJECT_ROOT)/obj%
# $(PROJECT_ROOT)/%.xcodeproj
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################

PROJECT_EXCLUSIONS =
PROJECT_EXCLUSIONS += $(PROJECT_ROOT)/bin%
PROJECT_EXCLUSIONS += $(PROJECT_ROOT)/obj%
PROJECT_EXCLUSIONS += $(PROJECT_ROOT)/%.xcodeproj
# PROJECT_EXCLUSIONS =

################################################################################
# PROJECT LINKER FLAGS
# These flags will be sent to the linker when compiling the executable.
#
# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################

Expand All @@ -71,17 +77,18 @@ PROJECT_EXCLUSIONS += $(PROJECT_ROOT)/%.xcodeproj
# add a runtime path to search for those shared libraries, since they aren't
# incorporated directly into the final executable application binary.
# TODO: should this be a default setting?
PROJECT_LDFLAGS=-Wl,-rpath=./libs
# PROJECT_LDFLAGS=-Wl,-rpath=./libs

################################################################################
# PROJECT DEFINES
# Create a space-delimited list of DEFINES. The list will be converted into
# CFLAGS with the "-D" flag later in the makefile.
#
# (default) PROJECT_DEFINES = (blank)
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################

PROJECT_DEFINES =
# PROJECT_DEFINES =

################################################################################
# PROJECT CFLAGS
Expand All @@ -90,14 +97,15 @@ PROJECT_DEFINES =
# defined in your platform specific core configuration files. These flags are
# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below.
#
# (default) PROJECT_CFLAGS = (blank)
#
# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in
# your platform specific configuration file will be applied by default and
# further flags here may not be needed.
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################

PROJECT_CFLAGS =
# PROJECT_CFLAGS =

################################################################################
# PROJECT OPTIMIZATION CFLAGS
Expand All @@ -107,16 +115,28 @@ PROJECT_CFLAGS =
#
# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets.
#
# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank)
#
# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets.
#
# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank)
#
# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the
# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration
# file will be applied by default and further optimization flags here may not
# be needed.
#
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_OPTIMIZATION_CFLAGS_RELEASE =
# PROJECT_OPTIMIZATION_CFLAGS_DEBUG =

PROJECT_CFLAGS_RELEASE =
PROJECT_CFLAGS_DEBUG =

################################################################################
# PROJECT COMPILERS
# Custom compilers can be set for CC and CXX
# (default) PROJECT_CXX = (blank)
# (default) PROJECT_CC = (blank)
# Note: Leave a leading space when adding list items with the += operator
################################################################################
# PROJECT_CXX =
# PROJECT_CC =
Loading