Fixed for linux.
This commit is contained in:
parent
a761e30c27
commit
df06ad76e9
6
makefile
6
makefile
@ -5,9 +5,9 @@ include $(ZE)/config
|
|||||||
|
|
||||||
LIB_OUT=$(ZE)/lib/libZEngineS.a
|
LIB_OUT=$(ZE)/lib/libZEngineS.a
|
||||||
|
|
||||||
libZEngineS.a: $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp
|
libZEngineS.a: $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp $(SRC)/external/mt19937ar.cpp
|
||||||
$(CC) $(CFLAGS) -c $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp
|
$(CC) $(CFLAGS) -c $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp $(SRC)/external/mt19937ar.cpp
|
||||||
$(AR) $(LIB_OUT) ZE_Utility.o ZE_ZTimer.o ZE_ZImage.o ZE_ZFont.o ZE_ZMusic.o ZE_ZConfigFile.o ZE_ZSound.o ZE_ZMusic.o ZE_ZError.o ZE_ZRect.o ZE_ZEngine.o SDLGL_Util.o
|
$(AR) $(LIB_OUT) ZE_Utility.o ZE_ZTimer.o ZE_ZImage.o ZE_ZFont.o ZE_ZMusic.o ZE_ZConfigFile.o ZE_ZSound.o ZE_ZMusic.o ZE_ZError.o ZE_ZRect.o ZE_ZEngine.o SDLGL_Util.o mt19937ar.o
|
||||||
|
|
||||||
tests: $(TEST)/ZFontTest.cpp $(TEST)/ZMouseTest.cpp $(TEST)/ZMusicTest.cpp $(TEST)/ZSoundTest.cpp $(TEST)/ZTimerTest.cpp $(TEST)/ZImageTest.cpp $(TEST)/ZRectTest.cpp
|
tests: $(TEST)/ZFontTest.cpp $(TEST)/ZMouseTest.cpp $(TEST)/ZMusicTest.cpp $(TEST)/ZSoundTest.cpp $(TEST)/ZTimerTest.cpp $(TEST)/ZImageTest.cpp $(TEST)/ZRectTest.cpp
|
||||||
$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZFontTest.cpp -o $(TEST)/bin/ZFontTest $(LIBS)
|
$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZFontTest.cpp -o $(TEST)/bin/ZFontTest $(LIBS)
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
File: ZE_ZConfigFile.cpp <br>
|
File: ZE_ZConfigFile.cpp <br>
|
||||||
Description: Implementation source file for ZConfigFile, the ZEngine INI-Style Config File. <br>
|
Description: Implementation source file for ZConfigFile, the ZEngine INI-Style Config File. <br>
|
||||||
Author(s): James Turk <br>
|
Author(s): James Turk <br>
|
||||||
$Id: ZE_ZConfigFile.cpp,v 1.7 2003/04/08 03:30:50 cozman Exp $<br>
|
$Id: ZE_ZConfigFile.cpp,v 1.8 2003/04/28 03:15:18 cozman Exp $<br>
|
||||||
|
|
||||||
\file ZE_ZConfigFile.cpp
|
\file ZE_ZConfigFile.cpp
|
||||||
\brief Source file for ZConfigFile.
|
\brief Source file for ZConfigFile.
|
||||||
@ -209,7 +209,7 @@ float ZConfigFile::GetFloat(string section, string var, float defVal) const
|
|||||||
|
|
||||||
section = '[' + section + ']';
|
section = '[' + section + ']';
|
||||||
|
|
||||||
sprintf(tmp,"%d",defVal);
|
sprintf(tmp,"%f",defVal);
|
||||||
val = GetVariable(section,var,tmp);
|
val = GetVariable(section,var,tmp);
|
||||||
|
|
||||||
if(!atof(val.c_str()) && val[0] !='0') //if it is zero but doesn't start with a zero
|
if(!atof(val.c_str()) && val[0] !='0') //if it is zero but doesn't start with a zero
|
||||||
|
Loading…
Reference in New Issue
Block a user