Changeset 317


Ignore:
Timestamp:
01/30/15 02:51:58 (9 years ago)
Author:
Maciej Komosinski
Message:

SDK compiles under Mac OS

Location:
cpp/frams
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/Makefile-SDK

    r307 r317  
    1010
    1111SDK_BUILD_CONFIG= -include frams/config/sdk_build_config.h
    12 CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(SDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
     12CXXFLAGS= -I$(CURDIR) -std=gnu++11 $(SDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
    1313
    1414#############################################

  • cpp/frams/_demos/neuro_layout_test.cpp

    r286 r317  
    2121
    2222// stl is fun? ;-) ForwardIterator implementation for element coordinates (required by min_element/max_element)
    23 template <int MEMBER> struct NNIter //MEMBER: 0..3=x/y/w/h
     23template <int MEMBER> struct NNIter: public std::iterator<std::forward_iterator_tag,int> //MEMBER: 0..3=x/y/w/h
    2424{
    2525NNLayoutState *nn; int index;

  • cpp/frams/config/sdk_build_config.h

    r288 r317  
    77
    88#include "version.h"
     9
     10#if __APPLE__
     11  #define MACOS
     12#elif __linux
     13  #define LINUX
     14#endif
    915
    1016#define NOCREATUREOBJECT
Note: See TracChangeset for help on using the changeset viewer.