Commit ce27efa4 authored by hybrid's avatar hybrid

Fixed typos and mingw stuff.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@735 dfc29bdd-3216-0410-991c-e03cc46cb475
parent cfd2ddc9
...@@ -397,7 +397,7 @@ bool CD3D8Texture::hasMipMaps() const ...@@ -397,7 +397,7 @@ bool CD3D8Texture::hasMipMaps() const
bool CD3D8Texture::createMipMaps(u32 level) bool CD3D8Texture::createMipMaps(u32 level)
{ {
if (level==0) if (level==0)
return; return true;
IDirect3DSurface8* upperSurface = 0; IDirect3DSurface8* upperSurface = 0;
IDirect3DSurface8* lowerSurface = 0; IDirect3DSurface8* lowerSurface = 0;
...@@ -423,7 +423,6 @@ bool CD3D8Texture::createMipMaps(u32 level) ...@@ -423,7 +423,6 @@ bool CD3D8Texture::createMipMaps(u32 level)
upperSurface->GetDesc(&upperDesc); upperSurface->GetDesc(&upperDesc);
lowerSurface->GetDesc(&lowerDesc); lowerSurface->GetDesc(&lowerDesc);
D3DLOCKED_RECT upperlr; D3DLOCKED_RECT upperlr;
D3DLOCKED_RECT lowerlr; D3DLOCKED_RECT lowerlr;
......
...@@ -148,11 +148,11 @@ void CD3D9Texture::createRenderTarget() ...@@ -148,11 +148,11 @@ void CD3D9Texture::createRenderTarget()
bool CD3D9Texture::createMipMaps(u32 level) bool CD3D9Texture::createMipMaps(u32 level)
{ {
if (level==0) if (level==0)
return; return true;
if (HardwareMipMaps && Texture) if (HardwareMipMaps && Texture)
{ {
// generate mipmaps in hardware // generate mipmaps in hardware
Texture->GenerateMipSubLevels(); Texture->GenerateMipSubLevels();
return true; return true;
} }
......
...@@ -1541,7 +1541,7 @@ void CSoftwareDriver2::lightVertex ( s4DVertex *dest, const S3DVertex *source ) ...@@ -1541,7 +1541,7 @@ void CSoftwareDriver2::lightVertex ( s4DVertex *dest, const S3DVertex *source )
} }
else else
{ {
pf = powf(dotHV, Material.org.Shininess ); pf = (f32)pow(dotHV, Material.org.Shininess );
} }
// accumulate ambient // accumulate ambient
......
...@@ -79,7 +79,7 @@ staticlib: $(STATIC_LIB) ...@@ -79,7 +79,7 @@ staticlib: $(STATIC_LIB)
cp $^ $(LIB_PATH) cp $^ $(LIB_PATH)
# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
win32: sharedlib_win32 all_win32 win32: sharedlib_win32
sharedlib_win32: $(IRRLICHT_DLL) sharedlib_win32: $(IRRLICHT_DLL)
../../bin/Win32-gcc/Irrlicht.dll: $(LINKOBJ) ../../bin/Win32-gcc/Irrlicht.dll: $(LINKOBJ)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS) -Wl,--out-implib,../../lib/Win32-gcc/$(STATIC_LIB) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS) -Wl,--out-implib,../../lib/Win32-gcc/$(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