Skip to content
This repository
Browse code

Merge pull request #12 from fishkingsin/raspberrypi-develop

added linuxarmv6l(raspberrypi) binary and example
  • Loading branch information...
commit b14b5b355c5b96affbf66d7868ceccf7147a4911 2 parents 53d3481 + 78ca1f7
Brett Renfer robotconscience authored
1  .gitignore
@@ -46,7 +46,6 @@ obj/
46 46
47 47 #eclipse build folders
48 48 #Mac OS X
49   -xcuserdata
50 49 project.xcworkspace
51 50 .DS_Store
52 51 *.pyc
56 README.md
Source Rendered
@@ -4,6 +4,58 @@ ofxLibwebsockets
4 4 * implements both client and server functionality of libwebsockets
5 5 * based on Paul Reimer's work on ofxWebUI (https://github.com/paulreimer/ofxWebUI) and jason vancleave's ofxLibWebSockets (https://github.com/jvcleave/ofxLibWebSockets)
6 6
  7 +ADDING TO PROJECTS
  8 +------------
  9 +* OS X
  10 + * Via OF Project Generator:
  11 + 1. Delete ofxLibwebsockets/libs/libwebsockets/include/win32port
  12 + 2. Add ofxLibwebsockets to your addons via the projectGenerator
  13 + 3. That's it!
  14 + * Adding to a new/existing project:
  15 + * Include ofxLibwebsockets' xcconfig file via your project's Project.xcconfig file:
  16 + 1. Define where it lives:
  17 + ```OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"```
  18 + 2. Include ofxLibwebsockets xcconfig
  19 + ```#include "../../../addons/ofxLibwebsockets/ofxLibwebsockets.xcconfig"```
  20 + 2. Add to existing vars in Project.xcconfig:
  21 +
  22 + ```
  23 + OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  24 + HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_LWS_INCLUDES)
  25 + LIBRARY_SEARCH_PATHS = $(inherited) $(OFX_LWS_SEARCH)
  26 + ```
  27 +
  28 +* Windows
  29 + * Adding to new/existing project:
  30 + 1. Add the ofxLibwebsockets source files to the C++ Linker
  31 + * right click on project in the solution explorer, click "Properties", Go down to C++ > General
  32 + * click the arrow at the right of "Additional include directories" and select "edit"
  33 + * add the ofxLibwebsockets source files:
  34 +
  35 + ```
  36 + ..\..\..\addons\ofxLibwebsockets\libs\jsonpp
  37 + ..\..\..\addons\ofxLibwebsockets\libs\jsonpp\json
  38 + ..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include
  39 + ..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port
  40 + ..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include
  41 + ..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src
  42 + ..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl
  43 + ..\..\..\addons\ofxLibwebsockets\src
  44 +```
  45 +
  46 +
  47 + 2. Add the ofxLibwebsockets paths to the "Additional Library Directories":
  48 + * right click on project in the solution explorer, click "Properties", Go down to Linker > General
  49 + * click the arrow at the right of "Additional Library Directories" and select "edit"
  50 + * add ```..\..\..\addons/ofxLibwebsockets\libs\libwebsockets\libs\libwebsockets\lib\win32``` and ```..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\libs\openssl\lib\win32```
  51 + 3. Now go down to Linker > Input; open the editor "Additional dependencies" the same way
  52 + * In your debug scheme, add libwebsocketswin32d.lib, libeay32.lib, and ssleay32.lib
  53 + * In your release scheme, add libwebsocketswin32.lib, libeay32.lib, and ssleay32.lib
  54 +
  55 +* Linux
  56 + * Delete the entire directory at ofxLibwebsockets/libs/libwebsockets/include/win32port
  57 + * 64-bit static version of libwebsockets is included; please let us know if you can contribute a 32 bit version!
  58 +
7 59 STATUS
8 60 ------------
9 61 * Server example currently works with Chrome, and Safari (need to test FF)
@@ -14,6 +66,4 @@ TO-DO
14 66 ------------
15 67 * Add functionality to examples
16 68 * More fun examples
17   -* Try to add binary sending/receiving
18   -* More testing of JSON parsing with jsoncpp (seems to be working)
19   -* Compile for linux
  69 +* Compile for 32-bit linux
80 addon_config.mk
... ... @@ -0,0 +1,80 @@
  1 +meta:
  2 + ADDON_NAME = ofxLibwebsockets
  3 + ADDON_DESCRIPTION = Addon for websocket library
  4 + ADDON_AUTHOR = James Kong
  5 + ADDON_TAGS = "websocket" "libwebsocket" "networking"
  6 + ADDON_URL =
  7 +
  8 +common:
  9 + # dependencies with other addons, a list of them separated by spaces
  10 + # or use += in several lines
  11 + ADDON_DEPENDENCIES =
  12 +
  13 + # include search paths, this will be usually parsed from the file system
  14 + # but if the addon or addon libraries need special search paths they can be
  15 + # specified here separated by spaces or one per line using +=
  16 + ADDON_INCLUDES = libs/openssl/openssl
  17 + ADDON_INCLUDES += src
  18 + ADDON_INCLUDES += libs/ofxLibwebsockets/include
  19 + ADDON_INCLUDES += libs/libwebsockets/include/
  20 + ADDON_INCLUDES += libs/jsoncpp/json
  21 +
  22 + ADDON_INCLUDES += libs/ofxLibwebsockets/src
  23 + ADDON_INCLUDES += libs/ofxLibwebsockets/include/ofxLibwebsockets
  24 + # any special flag that should be passed to the compiler when using this
  25 + # addon
  26 + ADDON_CFLAGS =
  27 +
  28 + # any special flag that should be passed to the linker when using this
  29 + # addon, also used for system libraries with -lname
  30 + ADDON_LDFLAGS =
  31 +
  32 + # linux only, any library that should be included in the project using
  33 + # pkg-config
  34 + ADDON_PKG_CONFIG_LIBRARIES =
  35 +
  36 + # osx/iOS only, any framework that should be included in the project
  37 + ADDON_FRAMEWORKS =
  38 +
  39 + # source files, these will be usually parsed from the file system looking
  40 + # in the src folders in libs and the root of the addon. if your addon needs
  41 + # to include files in different places or a different set of files per platform
  42 + # they can be specified here
  43 + ADDON_SOURCES = libs/jsoncpp/jsoncpp.cpp
  44 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Server.cpp
  45 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Reactor.cpp
  46 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Protocol.cpp
  47 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Events.cpp
  48 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Connection.cpp
  49 + ADDON_SOURCES += libs/ofxLibwebsockets/src/Client.cpp
  50 +
  51 + # some addons need resources to be copied to the bin/data folder of the project
  52 + # specify here any files that need to be copied, you can use wildcards like * and ?
  53 + ADDON_DATA =
  54 +
  55 + # when parsing the file system looking for libraries exclude this for all or
  56 + # a specific platform
  57 + ADDON_LIBS_EXCLUDE =
  58 +
  59 +linux64:
  60 + # binary libraries, these will be usually parsed from the file system but some
  61 + # libraries need to passed to the linker in a specific order
  62 + #nothing yet
  63 +
  64 +linux:
  65 + #nothing yet
  66 +
  67 +win_cb:
  68 + #nothing yet
  69 +linuxarmv6l:
  70 + ADDON_LDFLAGS = -lssl
  71 +
  72 + ADDON_LIBS = libs/libwebsockets/lib/linuxarmv6l/libwebsockets.a
  73 +linuxarmv7l:
  74 + #nothing yet
  75 +
  76 +android/armeabi:
  77 + #nothing yet
  78 +
  79 +android/armeabi-v7a:
  80 + #nothing yet
18 example-client-hello world/Project.xcconfig
@@ -5,14 +5,14 @@ OF_PATH = ../../..
5 5 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6 6 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7 7
8   -LIB_SSL = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a"
9   -LIB_CRYPTO = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a"
10   -SSL_INC = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/"
11   -LWS = "$(OF_PATH)/addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a"
12   -OFX_LWS_INCLUDE = "$(OF_PATH)/addons/ofxLibwebsockets/libs/ofxLibwebsockets/include"
  8 +// INCLUDE OFX_LIBWEBSOCKETS
  9 +// 1: DEFINE WHERE IT LIVES; only change this if you have installed elsewhere or changed the name!
  10 +OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"
13 11
14   -LIBWEBSOCKETS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LWS)
15   -LIBWEBSOCKETS_INCLUDES= $(SSL_INC)
  12 +// 2: INCLUDE OFX_LIBWEBSOCKETS XCCONFIG (make sure you change the path if you've installed elsewhere!)
  13 +#include "../../../addons/ofxLibwebsockets/ofxLibwebsockets.xcconfig"
16 14
17   -OTHER_LDFLAGS = $(OF_CORE_LIBS) $(LIBWEBSOCKETS_LIBS)
18   -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(SSL_INC) $(OFX_LWS_INCLUDE)
  15 +// 3: ADD TO OR REPLACE EXISTING VARS
  16 +
  17 +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +HEADER_SEARCH_PATHS = $(OF_CORE_HE
13 example-server-binary/Makefile
... ... @@ -0,0 +1,13 @@
  1 +# Attempt to load a config.make file.
  2 +# If none is found, project defaults in config.project.make will be used.
  3 +ifneq ($(wildcard config.make),)
  4 + include config.make
  5 +endif
  6 +
  7 +# make sure the the OF_ROOT location is defined
  8 +ifndef OF_ROOT
  9 + OF_ROOT=../../..
  10 +endif
  11 +
  12 +# call the project makefile!
  13 +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
18 example-server-binary/Project.xcconfig
@@ -5,14 +5,14 @@ OF_PATH = ../../..
5 5 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6 6 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7 7
8   -LIB_SSL = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a"
9   -LIB_CRYPTO = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a"
10   -SSL_INC = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/"
11   -LWS = "$(OF_PATH)/addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a"
12   -OFX_LWS_INCLUDE = "$(OF_PATH)/addons/ofxLibwebsockets/libs/ofxLibwebsockets/include"
  8 +// INCLUDE OFX_LIBWEBSOCKETS
  9 +// 1: DEFINE WHERE IT LIVES; only change this if you have installed elsewhere or changed the name!
  10 +OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"
13 11
14   -LIBWEBSOCKETS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LWS)
15   -LIBWEBSOCKETS_INCLUDES= $(SSL_INC)
  12 +// 2: INCLUDE OFX_LIBWEBSOCKETS XCCONFIG (make sure you change the path if you've installed elsewhere!)
  13 +#include "../../../addons/ofxLibwebsockets/ofxLibwebsockets.xcconfig"
16 14
17   -OTHER_LDFLAGS = $(OF_CORE_LIBS) $(LIBWEBSOCKETS_LIBS)
18   -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(SSL_INC) $(OFX_LWS_INCLUDE)
  15 +// 3: ADD TO OR REPLACE EXISTING VARS
  16 +
  17 +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +HEADER_SEARCH_PATHS = $(OF_CORE_HE
0  example-server-binary/bin/libs/.gitkeep
No changes.
17 example-server-binary/bin/readMe.txt
... ... @@ -0,0 +1,17 @@
  1 +
  2 +OF linux:
  3 +
  4 +this folder contains necessary components that need to be exported with the application:
  5 +
  6 +libs
  7 +------ contains .so (shared objects) that the app needs to run against
  8 +------ this allows OF linux apps to be released in a very portable way
  9 +------ users of the apps shouldn't need to install anything besides glut
  10 +------ (which should be installed in most cases)
  11 +
  12 +clickToLaunchApp.sh
  13 +------ a shell script which runs the exe and set this variable:
  14 +------ LD_LIBRARY_PATH, so that the app looks locally for the .so
  15 +------ (shared objects) to run
  16 +
  17 +
9 example-server-binary/src/main.cpp
... ... @@ -1,13 +1,16 @@
1 1 #include "ofMain.h"
2 2 #include "testApp.h"
  3 +#ifndef TARGET_LINUX_ARM
3 4 #include "ofAppGlutWindow.h"
4   -
  5 +#endif
5 6 //========================================================================
6 7 int main( ){
7   -
  8 +#ifndef TARGET_LINUX_ARM
8 9 ofAppGlutWindow window;
9 10 ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context
10   -
  11 +#else
  12 + ofSetupOpenGL(1024,768, OF_WINDOW); // <-------- setup the GL context
  13 +#endif
11 14 // this kicks off the running of my app
12 15 // can be OF_WINDOW or OF_FULLSCREEN
13 16 // pass in width and height too:
18 example-server-binaryvideo/Project.xcconfig
@@ -5,14 +5,14 @@ OF_PATH = ../../..
5 5 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6 6 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7 7
8   -LIB_SSL = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a"
9   -LIB_CRYPTO = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a"
10   -SSL_INC = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/"
11   -LWS = "$(OF_PATH)/addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a"
12   -OFX_LWS_INCLUDE = "$(OF_PATH)/addons/ofxLibwebsockets/libs/ofxLibwebsockets/include"
  8 +// INCLUDE OFX_LIBWEBSOCKETS
  9 +// 1: DEFINE WHERE IT LIVES; only change this if you have installed elsewhere or changed the name!
  10 +OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"
13 11
14   -LIBWEBSOCKETS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LWS)
15   -LIBWEBSOCKETS_INCLUDES= $(SSL_INC)
  12 +// 2: INCLUDE OFX_LIBWEBSOCKETS XCCONFIG (make sure you change the path if you've installed elsewhere!)
  13 +#include "../../../addons/ofxLibwebsockets/ofxLibwebsockets.xcconfig"
16 14
17   -OTHER_LDFLAGS = $(OF_CORE_LIBS) $(LIBWEBSOCKETS_LIBS)
18   -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(SSL_INC) $(OFX_LWS_INCLUDE)
  15 +// 3: ADD TO OR REPLACE EXISTING VARS
  16 +
  17 +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +HEADER_SEARCH_PATHS = $(OF_CORE_HE
19 example-server-echo/Project.xcconfig
@@ -5,14 +5,15 @@ OF_PATH = ../../..
5 5 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6 6 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7 7
8   -LIB_SSL = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a"
9   -LIB_CRYPTO = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a"
10   -SSL_INC = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/"
11   -LWS = "$(OF_PATH)/addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a"
12   -OFX_LWS_INCLUDE = "$(OF_PATH)/addons/ofxLibwebsockets/libs/ofxLibwebsockets/include"
  8 +// INCLUDE OFX_LIBWEBSOCKETS
  9 +// 1: DEFINE WHERE IT LIVES; only change this if you have installed elsewhere or changed the name!
  10 +OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"
13 11
14   -LIBWEBSOCKETS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LWS)
15   -LIBWEBSOCKETS_INCLUDES= $(SSL_INC)
  12 +// 2: INCLUDE OFX_LIBWEBSOCKETS XCCONFIG
  13 +#include "$(OFX_LWS_PATH)/ofxLibwebsockets.xcconfig"
16 14
17   -OTHER_LDFLAGS = $(OF_CORE_LIBS) $(LIBWEBSOCKETS_LIBS)
18   -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(SSL_INC) $(OFX_LWS_INCLUDE)
  15 +// 3: ADD TO OR REPLACE EXISTING VARS
  16 +
  17 +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_LWS_INCLUDES)
  19 +LIBRARY_SEARCH_PATHS = $(inherited) $(OFX_LWS_SEARCH)
19 example-server-sharedCanvas/Project.xcconfig
@@ -5,14 +5,15 @@ OF_PATH = ../../..
5 5 //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
6 6 #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
7 7
8   -LIB_SSL = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a"
9   -LIB_CRYPTO = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a"
10   -SSL_INC = "$(OF_PATH)/addons/ofxLibwebsockets/libs/openssl/"
11   -LWS = "$(OF_PATH)/addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a"
12   -OFX_LWS_INCLUDE = "$(OF_PATH)/addons/ofxLibwebsockets/libs/ofxLibwebsockets/include"
  8 +// INCLUDE OFX_LIBWEBSOCKETS
  9 +// 1: DEFINE WHERE IT LIVES; only change this if you have installed elsewhere or changed the name!
  10 +OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"
13 11
14   -LIBWEBSOCKETS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LWS)
15   -LIBWEBSOCKETS_INCLUDES= $(SSL_INC)
  12 +// 2: INCLUDE OFX_LIBWEBSOCKETS XCCONFIG (make sure you change the path if you've installed elsewhere!)
  13 +#include "../../../addons/ofxLibwebsockets/ofxLibwebsockets.xcconfig"
16 14
17   -OTHER_LDFLAGS = $(OF_CORE_LIBS) $(LIBWEBSOCKETS_LIBS)
18   -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(SSL_INC) $(OFX_LWS_INCLUDE)
  15 +// 3: ADD TO OR REPLACE EXISTING VARS
  16 +
  17 +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_LWS_INCLUDES)
  19 +LIBRARY_SEARCH_PATHS = $(inherited) $(OFX_LWS_SEARCH)
192 example-server-sharedCanvas/SharedCanvas.xcodeproj/project.pbxproj
@@ -592,40 +592,13 @@
592 592 GCC_WARN_UNINITIALIZED_AUTOS = NO;
593 593 GCC_WARN_UNUSED_VALUE = NO;
594 594 GCC_WARN_UNUSED_VARIABLE = NO;
595   - HEADER_SEARCH_PATHS = (
596   - "$(OF_CORE_HEADERS)",
597   - src,
598   - ../../../addons/ofxLibwebsockets/libs,
599   - ../../../addons/ofxLibwebsockets/libs/jsoncpp,
600   - ../../../addons/ofxLibwebsockets/libs/jsoncpp/json,
601   - ../../../addons/ofxLibwebsockets/libs/libwebsockets,
602   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/data,
603   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/include,
604   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib,
605   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx,
606   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32,
607   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets,
608   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include,
609   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include/ofxLibwebsockets,
610   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src,
611   - ../../../addons/ofxLibwebsockets/libs/openssl,
612   - ../../../addons/ofxLibwebsockets/libs/openssl/lib,
613   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx,
614   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/win32,
615   - ../../../addons/ofxLibwebsockets/libs/openssl/openssl,
616   - ../../../addons/ofxLibwebsockets/src,
617   - );
  595 + HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
618 596 OTHER_CPLUSPLUSFLAGS = (
619 597 "-D__MACOSX_CORE__",
620 598 "-lpthread",
621 599 "-mtune=native",
622 600 );
623   - OTHER_LDFLAGS = (
624   - "$(OF_CORE_LIBS)",
625   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a,
626   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a,
627   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a,
628   - );
  601 + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
629 602 };
630 603 name = Debug;
631 604 };
@@ -650,40 +623,13 @@
650 623 GCC_WARN_UNINITIALIZED_AUTOS = NO;
651 624 GCC_WARN_UNUSED_VALUE = NO;
652 625 GCC_WARN_UNUSED_VARIABLE = NO;
653   - HEADER_SEARCH_PATHS = (
654   - "$(OF_CORE_HEADERS)",
655   - src,
656   - ../../../addons/ofxLibwebsockets/libs,
657   - ../../../addons/ofxLibwebsockets/libs/jsoncpp,
658   - ../../../addons/ofxLibwebsockets/libs/jsoncpp/json,
659   - ../../../addons/ofxLibwebsockets/libs/libwebsockets,
660   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/data,
661   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/include,
662   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib,
663   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx,
664   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32,
665   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets,
666   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include,
667   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include/ofxLibwebsockets,
668   - ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src,
669   - ../../../addons/ofxLibwebsockets/libs/openssl,
670   - ../../../addons/ofxLibwebsockets/libs/openssl/lib,
671   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx,
672   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/win32,
673   - ../../../addons/ofxLibwebsockets/libs/openssl/openssl,
674   - ../../../addons/ofxLibwebsockets/src,
675   - );
  626 + HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
676 627 OTHER_CPLUSPLUSFLAGS = (
677 628 "-D__MACOSX_CORE__",
678 629 "-lpthread",
679 630 "-mtune=native",
680 631 );
681   - OTHER_LDFLAGS = (
682   - "$(OF_CORE_LIBS)",
683   - ../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a,
684   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a,
685   - ../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a,
686   - );
  632 + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
687 633 };
688 634 name = Release;
689 635 };
@@ -704,70 +650,7 @@
704 650 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
705 651 INFOPLIST_FILE = "openFrameworks-Info.plist";
706 652 INSTALL_PATH = "$(HOME)/Applications";
707   - LIBRARY_SEARCH_PATHS = (
708   - "$(inherited)",
709   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
710   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
711   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
712   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
713   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
714   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)",
715   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
716   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
717   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
718   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
719   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
720   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
721   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
722   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
723   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
724   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
725   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
726   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
727   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
728   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
729   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
730   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
731   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
732   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
733   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
734   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)",
735   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)",
736   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)",
737   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)",
738   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)",
739   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)",
740   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)",
741   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)",
742   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)",
743   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)",
744   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)",
745   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)",
746   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)",
747   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)",
748   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)",
749   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)",
750   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)",
751   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)",
752   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)",
753   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)",
754   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)",
755   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)",
756   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)",
757   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)",
758   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)",
759   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)",
760   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)",
761   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)",
762   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)",
763   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)",
764   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)",
765   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)",
766   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)",
767   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)",
768   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)",
769   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)",
770   - );
  653 + LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)";
771 654 PREBINDING = NO;
772 655 PRODUCT_NAME = SharedCanvasDebug;
773 656 WRAPPER_EXTENSION = app;
@@ -790,70 +673,7 @@
790 673 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
791 674 INFOPLIST_FILE = "openFrameworks-Info.plist";
792 675 INSTALL_PATH = "$(HOME)/Applications";
793   - LIBRARY_SEARCH_PATHS = (
794   - "$(inherited)",
795   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
796   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
797   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
798   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
799   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
800   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)",
801   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
802   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
803   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
804   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
805   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
806   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
807   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
808   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
809   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
810   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
811   - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
812   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
813   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
814   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
815   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
816   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
817   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
818   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
819   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
820   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
821   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_17)",
822   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_18)",
823   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_19)",
824   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_20)",
825   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_21)",
826   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_22)",
827   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_23)",
828   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_24)",
829   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_25)",
830   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_26)",
831   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_27)",
832   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_28)",
833   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_29)",
834   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_30)",
835   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_31)",
836   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_32)",
837   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_33)",
838   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_34)",
839   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_35)",
840   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_36)",
841   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_37)",
842   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_38)",
843   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_39)",
844   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_40)",
845   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_41)",
846   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_42)",
847   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_43)",
848   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_44)",
849   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_45)",
850   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_46)",
851   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_47)",
852   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_48)",
853   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)",
854   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)",
855   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)",
856   - );
  676 + LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)";
857 677 PREBINDING = NO;
858 678 PRODUCT_NAME = SharedCanvas;
859 679 WRAPPER_EXTENSION = app;
3  libs/libwebsockets/include/libwebsockets.h
@@ -35,9 +35,6 @@ extern "C" {
35 35 #include <winsock2.h>
36 36 #include <ws2tcpip.h>
37 37 #include <stddef.h>
38   -#include "../win32port/win32helpers/websock-w32.h"
39   -
40   -#include "../win32port/win32helpers/gettimeofday.h"
41 38
42 39 #define strcasecmp stricmp
43 40
BIN  libs/libwebsockets/lib/linux64/libwebsockets.a
Binary file not shown
BIN  libs/libwebsockets/lib/linuxarmv6l/libwebsockets.a
Binary file not shown
BIN  libs/libwebsockets/lib/win32/libwebsocketswin32.lib
Binary file not shown
52 libs/ofxLibwebsockets/include/ofxLibwebsockets/Util.h
@@ -9,6 +9,7 @@
9 9 #pragma once
10 10
11 11 #include <libwebsockets.h>
  12 +
12 13 #include "ofxLibwebsockets/Connection.h"
13 14 #include "ofxLibwebsockets/Reactor.h"
14 15 #include "ofxLibwebsockets/Client.h"
@@ -18,8 +19,9 @@ namespace ofxLibwebsockets {
18 19
19 20 class Client;
20 21 class Server;
21   -
22   - static string getCallbackReason( int reason );
  22 +
  23 + static string getServerCallbackReason( int reason );
  24 + static string getClientCallbackReason( int reason );
23 25 static void dump_handshake_info(struct lws_tokens *lwst);
24 26
25 27 // CLIENT CALLBACK
@@ -44,9 +46,9 @@ namespace ofxLibwebsockets {
44 46 }
45 47 }
46 48
47   - ofLog( OF_LOG_VERBOSE, getCallbackReason(reason) );
  49 + ofLog( OF_LOG_VERBOSE, getClientCallbackReason(reason) );
48 50
49   - if (reason == LWS_CALLBACK_CLIENT_ESTABLISHED){
  51 + if (reason == LWS_CALLBACK_CLIENT_ESTABLISHED ){
50 52 } else if (reason == LWS_CALLBACK_CLOSED){
51 53 }
52 54
@@ -67,11 +69,13 @@ namespace ofxLibwebsockets {
67 69 } else {
68 70 return 0;
69 71 }
70   - case LWS_CALLBACK_CLIENT_ESTABLISHED:
  72 +
71 73 case LWS_CALLBACK_CLIENT_WRITEABLE:
  74 + case LWS_CALLBACK_CLIENT_ESTABLISHED:
72 75 case LWS_CALLBACK_CLOSED:
73 76 case LWS_CALLBACK_CLIENT_RECEIVE:
74   - if (reactor != NULL){
  77 + case LWS_CALLBACK_CLIENT_RECEIVE_PONG:
  78 + if ( reactor != NULL ){
75 79 //conn = *(Connection**)user;
76 80 if (conn && conn->ws != ws) conn->ws = ws;
77 81 return reactor->_notify(conn, reason, (char*)data, len);
@@ -112,7 +116,7 @@ namespace ofxLibwebsockets {
112 116 }
113 117 }
114 118
115   - ofLog( OF_LOG_VERBOSE, getCallbackReason(reason) );
  119 + ofLog( OF_LOG_VERBOSE, getServerCallbackReason(reason) );
116 120
117 121 if (reason == LWS_CALLBACK_ESTABLISHED){
118 122 if ( reactor != NULL ){
@@ -200,7 +204,39 @@ namespace ofxLibwebsockets {
200 204 }
201 205 }
202 206
203   - static string getCallbackReason( int reason ){
  207 +
  208 + static string getClientCallbackReason( int reason ){
  209 + switch (reason){
  210 + case 0 : return "LWS_CALLBACK_ESTABLISHED";
  211 + case 1 : return "LWS_CALLBACK_CLIENT_CONNECTION_ERROR";
  212 + case 2 : return "LWS_CALLBACK_CLIENT_ESTABLISHED";
  213 + case 3 : return "LWS_CALLBACK_CLOSED";
  214 + case 4 : return "LWS_CALLBACK_RECEIVE";
  215 + case 5 : return "LWS_CALLBACK_CLIENT_RECEIVE";
  216 + case 6 : return "LWS_CALLBACK_CLIENT_RECEIVE_PONG";
  217 + case 7 : return "LWS_CALLBACK_CLIENT_WRITEABLE";
  218 + case 8 : return "LWS_CALLBACK_SERVER_WRITEABLE";
  219 + case 9 : return "LWS_CALLBACK_HTTP";
  220 + case 10 : return "LWS_CALLBACK_HTTP_FILE_COMPLETION";
  221 + case 11 : return "LWS_CALLBACK_BROADCAST";
  222 + case 12 : return "LWS_CALLBACK_FILTER_NETWORK_CONNECTION";
  223 + case 13 : return "LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION";
  224 + case 14 : return "LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS";
  225 + case 15 : return "LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS";
  226 + case 16 : return "LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION";
  227 + case 17 : return "LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER";
  228 + case 18 : return "LWS_CALLBACK_CONFIRM_EXTENSION_OKAY";
  229 + case 19 : return "LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED";
  230 + case 20 : return "LWS_CALLBACK_ADD_POLL_FD";
  231 + case 21 : return "LWS_CALLBACK_DEL_POLL_FD";
  232 + case 22 : return "LWS_CALLBACK_SET_MODE_POLL_FD";
  233 + case 23 : return "LWS_CALLBACK_CLEAR_MODE_POLL_FD";
  234 + case 24 : return "LWS_CALLBACK_CLEAR_MODE_POLL_FD";
  235 + default: return "Unknown callback reason";
  236 + }
  237 + }
  238 +
  239 + static string getServerCallbackReason( int reason ){
204 240 switch (reason){
205 241 case 0 : return "LWS_CALLBACK_ESTABLISHED";
206 242 case 1 : return "LWS_CALLBACK_CLIENT_ESTABLISHED";
2  libs/ofxLibwebsockets/src/Connection.cpp
@@ -28,12 +28,12 @@ namespace ofxLibwebsockets {
28 28 buf = (unsigned char*)calloc(LWS_SEND_BUFFER_PRE_PADDING+bufsize+LWS_SEND_BUFFER_POST_PADDING, sizeof(unsigned char));
29 29 binaryBuf = (unsigned char*)calloc(LWS_SEND_BUFFER_PRE_PADDING+bufsize+LWS_SEND_BUFFER_POST_PADDING, sizeof(unsigned char));
30 30 }
31   -
32 31 }
33 32
34 33 //--------------------------------------------------------------
35 34 Connection::~Connection(){
36 35 free(buf);
  36 + free(binaryBuf);
37 37 }
38 38 //--------------------------------------------------------------
39 39 void Connection::close() {
19 ofxLibwebsockets.xcconfig
... ... @@ -0,0 +1,19 @@
  1 +//Similar to CoreOF.xcconfig, you need to define OFX_LWS_PATH
  2 +//like this:
  3 +//OFX_LWS_PATH = "$(OF_PATH)/addons"
  4 +
  5 +LIB_SSL = "$(OFX_LWS_PATH)/libs/openssl/lib/osx/libssl.a"
  6 +LIB_CRYPTO = "$(OFX_LWS_PATH)/libs/openssl/lib/osx/libcrypto.a"
  7 +LIB_LIBWEBSOCKETS = "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx/libwebsockets.a"
  8 +SSL_INC = "$(OFX_LWS_PATH)/libs/openssl/"
  9 +LWS_INC = "$(OFX_LWS_PATH)/libs/libwebsockets/include"
  10 +OFX_LWS_INC = "$(OFX_LWS_PATH)/libs/ofxLibwebsockets/include" "$(OFX_LWS_PATH)/libs/ofxLibwebsockets/src"
  11 +
  12 +OFX_LWS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LIB_LIBWEBSOCKETS)
  13 +OFX_LWS_INCLUDES= $(SSL_INC) $(LWS_INC) $(OFX_LWS_INC)
  14 +OFX_LWS_SEARCH = "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx" "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx"
  15 +
  16 +// replace or add to your existing Project.xcconfig:
  17 +//OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
  18 +//HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_LWS_INCLUDES)
  19 +//LIBRARY_SEARCH_PATHS = $(inherited) $(OFX_LWS_SEARCH)

0 comments on commit b14b5b3

Ross Cairns

These files seem to be chopped!

Ross Cairns

But it doesn't appear to make any difference :)

Please sign in to comment.
Something went wrong with that request. Please try again.