ofZach · michaelbaisch · Jan 10, 2018 · Jan 10, 2018 · Jan 15, 2018 · Jan 15, 2018
diff --git a/.gitignore b/.gitignore
@@ -96,3 +96,5 @@ Desktop.ini
 #CEF specific
 *.pak
 *.bin
+
+libs/
diff --git a/addon_config.mk b/addon_config.mk
@@ -0,0 +1,76 @@
+# All variables and this file are optional, if they are not present the PG and the
+# makefiles will try to parse the correct values from the file system.
+#
+# Variables that specify exclusions can use % as a wildcard to specify that anything in
+# that position will match. A partial path can also be specified to, for example, exclude
+# a whole folder from the parsed paths from the file system
+#
+# Variables can be specified using = or +=
+# = will clear the contents of that variable both specified from the file or the ones parsed
+# from the file system
+# += will add the values to the previous ones in the file or the ones parsed from the file 
+# system
+# 
+# The PG can be used to detect errors in this file, just create a new project with this addon 
+# and the PG will write to the console the kind of error and in which line it is
+
+meta:
+	ADDON_NAME = ofxCef
+	ADDON_DESCRIPTION = CEF for OF
+	ADDON_AUTHOR = 
+	ADDON_TAGS = "CEF" "Chromium Embedded Framework"
+	ADDON_URL = https://github.com/ofZach/ofxCef
+
+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 =
+	ADDON_INCLUDES_EXCLUDE = libs
+	ADDON_INCLUDES_EXCLUDE += libs/cef/include/%
+	ADDON_INCLUDES_EXCLUDE += libs/cef/lib
+	ADDON_INCLUDES_EXCLUDE += libs/cef/lib/%
+
+	# 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 = -rpath @loader_path/../../../../../../../addons/ofxHapPlayer/libs
+
+	# 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 =
+
+	# 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 =
+
+	ADDON_SOURCES_EXCLUDE = src/process_helper_mac.cpp
+
+vs:
+	ADDON_LIBS_EXCLUDE = "libs/cef/export/vs/x64"
+	ADDON_LIBS_EXCLUDE = "libs/cef/export/vs/x64/%"
+	ADDON_DLLS_TO_COPY = "libs/cef/export/vs/x64/*" # Not working with of 0.9.8 or earlier
+
+osx:
+	ADDON_FRAMEWORKS = "../../../addons/ofxCef/libs/cef/lib/osx/Chromium Embedded Framework.framework"
+	ADDON_OBJC_SOURCES = src/*.cpp # Not working with of 0.9.8 or earlier
diff --git a/example_ofxCEF/Makefile → cef_helper_mac/Makefile b/example_ofxCEF/Makefile → cef_helper_mac/Makefile
@@ -6,7 +6,7 @@ endif
 
 # make sure the the OF_ROOT location is defined
 ifndef OF_ROOT
-    OF_ROOT=../../..
+    OF_ROOT=$(realpath ../../..)
 endif
 
 # call the project makefile!

diff --git a/example_ofxCEF/Project.xcconfig → cef_helper_mac/Project.xcconfig b/example_ofxCEF/Project.xcconfig → cef_helper_mac/Project.xcconfig
@@ -13,5 +13,5 @@ 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) 
+OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
 HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
diff --git a/cef_helper_mac/addons.make b/cef_helper_mac/addons.make
@@ -0,0 +1 @@
+ofxCef
diff --git a/...ple_ofxCEF/cefHelper/cefHelper-Info.plist → cef_helper_mac/cef_helper_mac-Info.plist b/...ple_ofxCEF/cefHelper/cefHelper-Info.plist → cef_helper_mac/cef_helper_mac-Info.plist
@@ -3,32 +3,20 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>d.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>cc.openFrameworks.ofapp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<true/>
+	<string>1.0</string>
+	<key>CFBundleIconFile</key>
+	<string>${ICON}</string>
 </dict>
 </plist>
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,3 +96,5 @@ Desktop.ini @@
     #CEF specific
     *.pak
     *.bin
+    libs/