Commit c739925f authored by cutealien's avatar cutealien

Merge revisions 4188-4208 from release branch 1.7 into trunk:

- Update changes.txt 
- Change include order to get example 21 compiling on MinGW.
- Fix linker path in example 16 for C::B project file (linker path was in include path section). 
- Link with opengl32 and gdi32 in Example 14 in C::B. 
- Remove --no-export-all-symbols which got recently added to the windows build as that flag is not known by gcc on Windows. 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4209 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a02c523f
...@@ -326,6 +326,31 @@ The following names can be queried for the given types: ...@@ -326,6 +326,31 @@ The following names can be queried for the given types:
- WM_SYSCOMMAND - SC_KEYMENU message is now ignored (F10 and ALT in Win32 windowed mode) - WM_SYSCOMMAND - SC_KEYMENU message is now ignored (F10 and ALT in Win32 windowed mode)
-----------------------------
Changes in 1.7.4
- Change include order to get example 21 compiling on MinGW.
- Irrlicht.dll has correct name now again (was named libIrrlicht.dll in c::b). This fixes bugreport 3518765 reported by tetho.
- Fix linker path in example 16 for C::B project file (linker path was in include path section).
- Link with opengl32 and gdi32 in Example 14 in C::B.
- Remove --no-export-all-symbols which got recently added to the windows build as that flag is not known by gcc on Windows.
- Fix bug in example 23 where Width and Height got mixed up. Thanks @Lazier for reporting.
- Fix for R5G6B5 converter submitted by XMight
- Fix conversion warning under mingw, found by Randajad
- Set EMF_NORMALIZE_NORMALS correct for syndey model in Demo (thanks @ Midnight for reporting).
- SceneNodeAnimatorFlyCircle fixes serialization of RadiusEllipsoid (was writing Radius). Thx @ wing64 for reporting.
- Yield on Linux now uses nanosleep with 1ns as 0 isn't guaranteed to yield (thx @ hendu for finding + fix)
----------------------------- -----------------------------
Changes in 1.7.3 (20.02.2012) Changes in 1.7.3 (20.02.2012)
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="opengl32" />
<Add library="gdi32" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
......
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
<Compiler> <Compiler>
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
</Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
......
...@@ -19,9 +19,10 @@ ftp://ftp.idsoftware.com/idstuff/quake3/win32/q3ademo.exe ...@@ -19,9 +19,10 @@ ftp://ftp.idsoftware.com/idstuff/quake3/win32/q3ademo.exe
Copyright 2006-2011 Burningwater, Thomas Alten Copyright 2006-2011 Burningwater, Thomas Alten
*/ */
#include "driverChoice.h"
#include <irrlicht.h>
#include "q3factory.h" #include "q3factory.h"
#include "sound.h" #include "sound.h"
#include "driverChoice.h"
/* /*
Game Data is used to hold Data which is needed to drive the game Game Data is used to hold Data which is needed to drive the game
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
Defines the Entities for Quake3 Defines the Entities for Quake3
*/ */
#include <irrlicht.h>
#include "q3factory.h" #include "q3factory.h"
#include "sound.h" #include "sound.h"
......
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
#ifndef __QUAKE3_FACTORY__H_INCLUDED__ #ifndef __QUAKE3_FACTORY__H_INCLUDED__
#define __QUAKE3_FACTORY__H_INCLUDED__ #define __QUAKE3_FACTORY__H_INCLUDED__
#include <irrlicht.h>
using namespace irr; using namespace irr;
using namespace scene; using namespace scene;
using namespace gui; using namespace gui;
......
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
#define __E_DRIVER_CHOICE_H_INCLUDED__ #define __E_DRIVER_CHOICE_H_INCLUDED__
#include <iostream> #include <iostream>
#include <cstdio>
#include "EDriverTypes.h" #include "EDriverTypes.h"
#include "irrTypes.h"
#include "IrrlichtDevice.h"
namespace irr namespace irr
{ {
......
...@@ -84,7 +84,6 @@ STATIC_LIB = libIrrlicht.a ...@@ -84,7 +84,6 @@ STATIC_LIB = libIrrlicht.a
LIB_PATH = ../../lib/$(SYSTEM) LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib INSTALL_DIR = /usr/local/lib
sharedlib install: SHARED_LIB = libIrrlicht.so sharedlib install: SHARED_LIB = libIrrlicht.so
#staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
...@@ -101,7 +100,7 @@ sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ...@@ -101,7 +100,7 @@ sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
#Windows specific options #Windows specific options
IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -Wl,--no-export-all-symbols -Wl,--add-stdcall-alias sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -Wl,--add-stdcall-alias
sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment