adding BOOST_NO_CXX98_FUNCTION_BASE

werckme · Jul 8, 2024 · 965dc25 · 965dc25
1 parent 8d0b3b5
commit 965dc25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,6 +108,7 @@ else()
 endif()
 
 IF(APPLE)
+  add_definitions(-DBOOST_NO_CXX98_FUNCTION_BASE)
   SET(Boost_LIBRARIES ${Boost_LIBRARIES}
       /usr/local/opt/icu4c/lib/libicudata.a 
       /usr/local/opt/icu4c/lib/libicui18n.a 
@@ -208,6 +209,9 @@ file(GLOB WM_LUA_COM
 file(GLOB WM_LUA_MODS
     "${EXAMPLES_FOLDER}/lua/mods/*.lua"
 )
+file(GLOB WM_LUA_DEVICES_INTEGRA7
+    "${EXAMPLES_FOLDER}/lua/devices/integra7/*.lua"
+)
 file(GLOB WM_LUA_VOICINGS
     "${EXAMPLES_FOLDER}/lua/voicings/*.lua"
 )
@@ -233,7 +237,7 @@ if(${INSTALL_AUX})
   install(FILES ${WM_LUA}                    DESTINATION share/werckmeister/lua COMPONENT wmapp)
   install(FILES ${WM_LUA_COM}                DESTINATION share/werckmeister/lua/com COMPONENT wmapp)
   install(FILES ${WM_LUA_MODS}               DESTINATION share/werckmeister/lua/mods COMPONENT wmapp)
-  install(FILES ${WM_LUA_MODS}               DESTINATION share/werckmeister/lua/devices COMPONENT wmapp)
+  install(FILES ${WM_LUA_DEVICES_INTEGRA7}   DESTINATION share/werckmeister/lua/devices/integra7 COMPONENT wmapp)
   install(FILES ${WM_LUA_VOICINGS}           DESTINATION share/werckmeister/lua/voicings COMPONENT wmapp)
   install(FILES ${WM_LUA_VOICINGS_SOVLERS}   DESTINATION share/werckmeister/lua/voicings/solvers COMPONENT wmapp)
   install(FILES ${WM_PITCHMAPS}              DESTINATION share/werckmeister/pitchmaps COMPONENT wmapp)
@@ -247,6 +251,7 @@ if (${USE_EMSCRIPTEN})
     ${WM_LUA} 
     ${WM_LUA_COM}
     ${WM_LUA_MODS}
+    ${WM_LUA_DEVICES_INTEGRA7}
     ${WM_LUA_VOICINGS}
     ${WM_LUA_VOICINGS_SOVLERS}
     ${WM_PITCHMAPS}

diff --git a/src/lua/luaHelper.h b/src/lua/luaHelper.h
@@ -8,7 +8,7 @@ namespace lua
 
     inline const char * getVersion() 
     {
-        static char * versionStr = LUA_VERSION;
+        static const char * versionStr = LUA_VERSION;
         return versionStr;
     }
     inline void getTableValue(lua_State *L, const char *key, int &out)