Update emscripten example Makefile.
Using c++11 for emscripten. Some minor link fixes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5549 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
3a1a4a78ea
commit
cac82280ee
|
@ -26,13 +26,22 @@ else
|
|||
endif
|
||||
CXXFLAGS += -O3
|
||||
endif
|
||||
ifdef EMSCRIPTEN
|
||||
CXXFLAGS += -std=gnu++11 -U__STRICT_ANSI__
|
||||
endif
|
||||
|
||||
#default target is Linux
|
||||
all: all_linux
|
||||
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 -lGLESv1_CM -lGLESv2 -lXxf86vm -lXext -lX11 -lXcursor
|
||||
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
|
||||
|
@ -48,6 +57,8 @@ static_win32: LDFLAGS += -lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid
|
|||
# name of the binary - only valid for targets which set SYSTEM
|
||||
DESTPATH = $(BinPath)/$(Target)$(SUF)
|
||||
|
||||
emscripten: all_emscripten
|
||||
|
||||
all_linux all_win32 all_emscripten static_win32:
|
||||
$(warning Building...)
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS)
|
||||
|
|
Loading…
Reference in New Issue