Merge pull request #13 from AlexMerritt/master

codeforboston · Aug 6, 2020 · 06dcc21 · 06dcc21
2 parents 56c5991 + c247481
commit 06dcc21
Show file tree

Hide file tree

Showing 9 changed files with 1,298 additions and 167 deletions.
diff --git a/anypiab/CMakeLists.txt b/anypiab/CMakeLists.txt
@@ -51,7 +51,7 @@ endif()
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 if(NOT DEFINED ANYPIATEST)
-    add_compile_definitions("ANYPIAB")
+    add_definitions(-DANYPIAB)
 endif(NOT DEFINED ANYPIATEST)
 
 # On Linux, the order of these libraries matters!

diff --git a/anypiajs/CMakeLists.txt b/anypiajs/CMakeLists.txt
@@ -42,6 +42,7 @@ set(SOURCES
     "Application.cpp"
     "anypiatestdoc.cpp"
     "anypiabdoc.cpp"
+    "PiaCalOutput.cpp"
 )
 
 find_package(Boost 1.64.0 REQUIRED COMPONENTS date_time)
@@ -61,9 +62,9 @@ set(EXPORTED_FUNCTIONS "-s EXPORTED_FUNCTIONS=\"[\
 
 set(EXPORTED_RUNTIME_METHODS "-s EXTRA_EXPORTED_RUNTIME_METHODS=\"['ccall', 'cwrap']\"")
 
-add_compile_definitions("WEB_ASSEMBLY")
+add_definitions(-DWEB_ASSEMBLY)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS " --bind ${EXPORTED_FUNCTIONS} ${EXPORTED_RUNTIME_METHODS}")
+set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-s USE_BOOST_HEADERS=1" LINK_FLAGS "-s USE_BOOST_HEADERS=1 --bind ${EXPORTED_FUNCTIONS} ${EXPORTED_RUNTIME_METHODS}")
 #set(EMCC_CFLAGS "${EMCC_CFLAGS} ")
 #set(EMCC_CFLAGS "${EMCC_CFLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']")