fixing emsc

examples/HelloWorld/proj.cmake/CMakeLists.txt

@@ -21,11 +21,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")
-	
-
-	set_target_properties(HelloWorld PROPERTIES LINK_FLAGS "${linkFlags}")
-
 	em_link_pre_js(HelloWorld  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
 endif(EMSCRIPTEN)

oxygine/src/core/ZipFileSystem.cpp

@@ -336,8 +336,8 @@ namespace oxygine
         {
         public:
             file::handle _h;
-            long _pos;
-            long _size;
+            z_off_t _pos;
+            z_off_t _size;
             long _cpos;
 
             fileHandleZipStreaming(const file_entry* entry, const Zips& z): _cpos(0)

tools/templates/proj.cmake/CMakeLists.txt

@@ -6,7 +6,8 @@ add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OXYGINE_CXX_FLAGS}")
+
 add_executable(${PROJECT} ${SRC} ${INCLUDE})
 target_link_libraries(${PROJECT} ${OXYGINE_CORE_LIBS})
 
@@ -19,10 +20,7 @@ endif(WIN32)
 
 
 if (EMSCRIPTEN)
-	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
-	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-	set_target_properties(${PROJECT} PROPERTIES LINK_FLAGS "${linkFlags}")
-
+	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")
 	em_link_pre_js(${PROJECT}  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
 endif(EMSCRIPTEN)