Merge branch releases/1.8 versions 4616 to 4684:
- Makefile for the new IrrFontTool links now correctly to libfontconfig git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4685 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
0b89236739
commit
e5febe10a7
|
@ -32,6 +32,11 @@ Changes in 1.9 (not yet released)
|
|||
- Add IColladaMeshWriter::findGeometryNameForNode
|
||||
- Add getters IGUIButton::isDrawBorderEnabled and IGUIButton::isDrawBackgroundEnabled
|
||||
|
||||
--------------------------
|
||||
Changes in 1.8.2
|
||||
|
||||
- Makefile for the new IrrFontTool links now correctly to libfontconfig
|
||||
|
||||
--------------------------
|
||||
Changes in 1.8.1 (17.11.2013)
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ LIBSELECT=64
|
|||
endif
|
||||
|
||||
# target specific settings
|
||||
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXft
|
||||
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXft -lfontconfig
|
||||
all_linux clean_linux: SYSTEM=Linux
|
||||
all_win32: LDFLAGS = -L../../../lib/Win32-gcc -lIrrlicht -lgdi32 -lopengl32 -lglu32 -lm
|
||||
all_win32 clean_win32: SYSTEM=Win32-gcc
|
||||
|
|
Loading…
Reference in New Issue