diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | contrib/cmake/FindMiles.cmake | 6 | ||||
| -rw-r--r-- | contrib/cmake/FindUMUNDO.cmake | 2 | ||||
| -rwxr-xr-x | package/linux-i686/gnu/bin/mmi-browser | bin | 29392347 -> 0 bytes | |||
| -rw-r--r-- | test/samples/uscxml/test-umundo-map-demo.scxml | 8 |
6 files changed, 17 insertions, 16 deletions
@@ -8,4 +8,6 @@ contrib/prebuilt/linux* contrib/prebuilt/windows* contrib/prebuilt/ios* contrib/prebuilt/android* - +package/linux* +package/darwin* +package/windows* diff --git a/CMakeLists.txt b/CMakeLists.txt index 42baf75..ce083b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,6 +208,8 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") add_definitions("-DUMUNDO_STATIC") add_definitions("-D_SCL_SECURE_NO_WARNINGS") add_definitions("-D_CRT_SECURE_NO_WARNINGS") + add_definitions("/bigobj") + # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB") # SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRTD.lib") elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") @@ -377,12 +379,13 @@ if (MILES_FOUND) file(GLOB_RECURSE MILES_INVOKER src/uscxml/invoker/modality/miles/*.cpp src/uscxml/invoker/modality/miles/*.h) list (APPEND USCXML_FILES ${MILES_INVOKER}) list (APPEND USCXML_LIBS ${MILES_LIBRARIES}) -endif() -# openal -find_package(OpenAL REQUIRED) -include_directories(${OPENAL_INCLUDE_DIR}) -list(APPEND USCXML_LIBS ${OPENAL_LIBRARY}) + # openal is only needed for miles + find_package(OpenAL REQUIRED) + include_directories(${OPENAL_INCLUDE_DIR}) + list(APPEND USCXML_LIBS ${OPENAL_LIBRARY}) + +endif() # # protobuf # find_package(Protobuf REQUIRED) diff --git a/contrib/cmake/FindMiles.cmake b/contrib/cmake/FindMiles.cmake index 48649bc..d868794 100644 --- a/contrib/cmake/FindMiles.cmake +++ b/contrib/cmake/FindMiles.cmake @@ -102,11 +102,7 @@ foreach (_MILES_COMPONENT ${_MILES_COMPONENTS_TO_PROCESS}) if (${_CURR_COMPONENT}_DEBUG) list(APPEND MILES_LIBRARIES debug ${${_CURR_COMPONENT}_DEBUG}) endif() - endif() - - if (NOT ${_CURR_COMPONENT} AND NOT ${_CURR_COMPONENT}_DEBUG) - message(FATAL_ERROR "Could not find miles component ${_MILES_COMPONENT}") - endif() + endif() endforeach() diff --git a/contrib/cmake/FindUMUNDO.cmake b/contrib/cmake/FindUMUNDO.cmake index 2bf9701..65e5463 100644 --- a/contrib/cmake/FindUMUNDO.cmake +++ b/contrib/cmake/FindUMUNDO.cmake @@ -116,7 +116,7 @@ foreach (_UMUNDO_COMPONENT ${_UMUNDO_COMPONENTS_TO_PROCESS}) endif() if (NOT ${_CURR_COMPONENT} AND NOT ${_CURR_COMPONENT}_DEBUG) - message(FATAL_ERROR "Could not find umundo component ${_UMUNDO_COMPONENT}") + message(STATUS "Could not find umundo component ${_UMUNDO_COMPONENT}") endif() endforeach() diff --git a/package/linux-i686/gnu/bin/mmi-browser b/package/linux-i686/gnu/bin/mmi-browser Binary files differdeleted file mode 100755 index 23066e0..0000000 --- a/package/linux-i686/gnu/bin/mmi-browser +++ /dev/null diff --git a/test/samples/uscxml/test-umundo-map-demo.scxml b/test/samples/uscxml/test-umundo-map-demo.scxml index 8ee91f1..0f66587 100644 --- a/test/samples/uscxml/test-umundo-map-demo.scxml +++ b/test/samples/uscxml/test-umundo-map-demo.scxml @@ -51,19 +51,19 @@ <!-- this is the state where we wait for events --> <state id="idle"> - <!-- onentry> + <onentry> <log expr="'== Idleing ====='" /> - </onentry --> + </onentry> <transition target="dump" event="*" /> </state> <state id="dump"> - <!-- onentry> + <onentry> <log expr="'== Dumping Event ====='" /> <script> dump(_event); </script> - </onentry --> + </onentry> <transition target="idle" /> </state> |