PNG support.

pull/3/head
Chris Laurel 2001-03-16 21:27:25 +00:00
parent 7f1774054a
commit ca0dae6e31
3 changed files with 6 additions and 2 deletions

View File

@ -124,7 +124,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\celestia.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib opengl32.lib glu32.lib ijl.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\celestia.pdb" /machine:I386 /out:"$(OUTDIR)\celestia.exe"
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib opengl32.lib glu32.lib ijl.lib zlib.lib libpng1.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\celestia.pdb" /machine:I386 /out:"$(OUTDIR)\celestia.exe"
LINK32_OBJS= \
"$(INTDIR)\3dsmesh.obj" \
"$(INTDIR)\3dsmodel.obj" \
@ -273,7 +273,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\celestia.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib opengl32.lib glu32.lib ijl.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\celestia.pdb" /debug /machine:I386 /out:"$(OUTDIR)\celestia.exe" /pdbtype:sept
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib opengl32.lib glu32.lib ijl.lib zlibd.lib libpng1d.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\celestia.pdb" /debug /machine:I386 /out:"$(OUTDIR)\celestia.exe" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\3dsmesh.obj" \
"$(INTDIR)\3dsmodel.obj" \

View File

@ -16,6 +16,7 @@ using namespace std;
static const string JPEGExt(".jpg");
static const string BMPExt(".bmp");
static const string TargaExt(".tga");
static const string PNGExt(".png");
static const string ThreeDSExt(".3ds");
static const string CelestiaTextureExt(".ctx");
static const string CelestiaMeshExt(".cms");
@ -51,6 +52,8 @@ ContentType DetermineFileType(const string& filename)
return Content_BMP;
else if (compareIgnoringCase(TargaExt, ext) == 0)
return Content_Targa;
else if (compareIgnoringCase(PNGExt, ext) == 0)
return Content_PNG;
else if (compareIgnoringCase(ThreeDSExt, ext) == 0)
return Content_3DStudio;
else if (compareIgnoringCase(CelestiaTextureExt, ext) == 0)

View File

@ -16,6 +16,7 @@ enum ContentType {
Content_JPEG,
Content_BMP,
Content_GIF,
Content_PNG,
Content_Targa,
Content_CelestiaTexture,
Content_3DStudio,