dm 7 years ago
parent
commit
b03880175d

+ 1 - 0
README.md

@@ -2,3 +2,4 @@
 
 for ubuntu 
 sudo apt-get install libfreetype6-dev
+sudo apt-get install gcc-multilib g++-multilib

+ 1 - 1
examples/HelloFreeType/proj.android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 

+ 1 - 1
examples/HelloFreeType/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Sep 27 01:04:08 YEKT 2018
+#Wed Sep 26 23:45:11 YEKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

+ 1 - 1
examples/HelloFreeType/proj.cmake/CMakeLists.txt

@@ -25,6 +25,6 @@ endif(WIN32)
 
 if (EMSCRIPTEN)
 	SET(CMAKE_EXECUTABLE_SUFFIX ".html")	
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_EXIT_RUNTIME=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648 -s FORCE_FILESYSTEM=1")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_EXIT_RUNTIME=1 -s WASM=0 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648 -s FORCE_FILESYSTEM=1")
 	em_link_pre_js(HelloFreeType  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
 endif(EMSCRIPTEN)