Merging r5975 through r6036 from trunk to ogl-es branch.

GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475

examples/01.HelloWorld_emscripten/Makefile

@@ -0,0 +1,98 @@
+# Makefile for Irrlicht Examples
+# It's usually sufficient to change just the target name and source file list
+# and be sure that CXX is set to a valid compiler
+
+# Name of the executable created (.exe will be added automatically if necessary)
+Target := 01.HelloEmscripten
+# List of source files, separated by spaces
+Sources := main.cpp
+# Path to Irrlicht directory, should contain include/ and lib/
+IrrlichtHome := ../..
+# Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+BinPath = ../../bin/$(SYSTEM)
+
+all_emscripten: EMSCRIPTEN=1
+
+# general compiler settings (might need to be set when compiling the lib, too)
+CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+ifndef NDEBUG
+  ifdef EMSCRIPTEN
+    LDFLAGS += -s DEMANGLE_SUPPORT=1
+  endif
+  CXXFLAGS += -g -Wall
+else
+  ifdef EMSCRIPTEN
+    LDFLAGS += -O3
+  endif
+  CXXFLAGS += -O3
+endif
+ifdef EMSCRIPTEN
+  CXXFLAGS += -std=gnu++11 -U__STRICT_ANSI__
+endif
+
+ifdef EMSCRIPTEN
+  all: all_emscripten
+else
+  all: all_linux
+endif
+
+# target specific settings
+all_linux all_emscripten all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lEGL
+ifndef EMSCRIPTEN
+  LDFLAGS += -lGLESv1_CM -lGLESv2 -lXxf86vm -lXext -lX11 -lXcursor
+endif
+all_linux clean_linux: SYSTEM=Linux
+all_emscripten clean_emscripten: SYSTEM=emscripten
+all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+all_win32 clean_win32 static_win32: SUF=.exe
+all_emscripten clean_emscripten: SUF=.html
+all_emscripten: CXXFLAGS += -fno-exceptions -fno-rtti -fstrict-aliasing  -std=gnu++11 -U__STRICT_ANSI__
+# Pass on a custom html file.
+#all_emscripten: CXXFLAGS += --shell-file shell_minimal.html
+all_emscripten: LDFLAGS += -lGL -lSDL --preload-file ../../media@/media -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=1
+#If you know the maximum memory (in bytes) which your application need then set it. It can speed things up a lot.
+#all_emscripten: LDFLAGS += -s TOTAL_MEMORY=268435456
+# You need the FULL_ES2 when using EDT_OGLES2 driver
+#all_emscripten: LDFLAGS += -s FULL_ES2=1 
+static_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
+all_win32: LDFLAGS += -lopengl32 -lEGL -lGLESv1_CM -lGLESv2 -lm
+static_win32: LDFLAGS += -lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lopengl32 -lEGL -lGLESv1_CM -lGLESv2
+# name of the binary - only valid for targets which set SYSTEM
+DESTPATH = $(BinPath)/$(Target)$(SUF)
+
+# Enable compiling to WASM and not just asm.js (you have to set it in the engine Makefile as well)
+ifdef EMSCRIPTEN
+  ifdef WASM
+    CXXFLAGS += -s WASM=1
+  endif
+endif
+
+emscripten: all_emscripten
+
+all_linux all_win32 all_emscripten static_win32:
+	$(warning Building...)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS)
+
+clean: clean_linux clean_win32 clean_emscripten
+	$(warning Cleaning...)
+
+clean_linux clean_win32:
+	@$(RM) $(DESTPATH)
+
+clean_emscripten:
+	@$(RM) $(BinPath)/$(Target).data
+	@$(RM) $(BinPath)/$(Target).html*
+	@$(RM) $(BinPath)/$(Target).js
+	
+
+.PHONY: all all_win32 all_emscripten static_win32 clean clean_linux clean_win32 clean_emscripten
+
+#multilib handling
+ifeq ($(HOSTTYPE), x86_64)
+LIBSELECT=64
+endif
+#solaris real-time features
+ifeq ($(HOSTTYPE), sun4)
+LDFLAGS += -lrt
+endif