random-mirrors
/
librw
mirror of https://github.com/aap/librw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed on windows.

This commit is contained in:
aap 2015-01-20 21:49:57 +01:00
parent 62c6fe006e
commit a528142254
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/image.cpp
View File

@ -297,8 +297,10 @@ Image::getFilename(const char *name)
// TGA I/O // TGA I/O
// //
//#pragma pack(push) #ifndef RW_PS2
//#pragma pack(1) #pragma pack(push)
#pragma pack(1)
#endif
struct __attribute__((__packed__)) TGAHeader struct __attribute__((__packed__)) TGAHeader
{ {
int8 IDlen; int8 IDlen;
@ -312,7 +314,9 @@ struct __attribute__((__packed__)) TGAHeader
uint8 depth; uint8 depth;
uint8 descriptor; uint8 descriptor;
}; };
//#pragma pack(push) #ifndef RW_PS2
#pragma pack(push)
#endif
Image* Image*
readTGA(const char *afilename) readTGA(const char *afilename)

2
tests/gl/Makefile
View File

@ -10,9 +10,11 @@ rwtest: $(OBJ) $(RWDIR)/librw-opengl.a /usr/local/lib/libglfw3.a
$(CXX) $^ $(LDLIBS) -o $@ $(CXX) $^ $(LDLIBS) -o $@
$(BUILDDIR)/%.o: %.cpp $(BUILDDIR)/%.o: %.cpp
@mkdir -p $(@D)
$(CXX) $(CFLAGS) -c $< -o $@ $(CXX) $(CFLAGS) -c $< -o $@
$(BUILDDIR)/%.d: %.cpp $(BUILDDIR)/%.d: %.cpp
@mkdir -p $(@D)
$(CXX) -MM -MT '$(patsubst %.cpp,$(BUILDDIR)%.o,$<)' $(CFLAGS) $< > $@ $(CXX) -MM -MT '$(patsubst %.cpp,$(BUILDDIR)%.o,$<)' $(CFLAGS) $< > $@
clean: clean:

4
tests/gl/Makefile.mingw
View File

@ -6,13 +6,15 @@ RWDIR=$(HOME)/src/librw
LDLIBS=-static -lglfw3 -lglew32 -lopengl32 -lgdi32 LDLIBS=-static -lglfw3 -lglew32 -lopengl32 -lgdi32
CFLAGS=-g -I$(RWDIR) -Wall -Wextra -DGLEW_STATIC CFLAGS=-g -I$(RWDIR) -Wall -Wextra -DGLEW_STATIC
rwtest: $(OBJ) $(RWDIR)/librw.a rwtest: $(OBJ) $(RWDIR)/librw-opengl.a
$(CXX) $^ $(LDLIBS) -o $@ $(CXX) $^ $(LDLIBS) -o $@
$(BUILDDIR)/%.o: %.cpp $(BUILDDIR)/%.o: %.cpp
@mkdir -p $(@D)
$(CXX) $(CFLAGS) -c $< -o $@ $(CXX) $(CFLAGS) -c $< -o $@
$(BUILDDIR)/%.d: %.cpp $(BUILDDIR)/%.d: %.cpp
@mkdir -p $(@D)
$(CXX) -MM -MT '$(patsubst %.cpp,$(BUILDDIR)%.o,$<)' $(CFLAGS) $< > $@ $(CXX) -MM -MT '$(patsubst %.cpp,$(BUILDDIR)%.o,$<)' $(CFLAGS) $< > $@
dep: $(DEP) dep: $(DEP)

7
tests/gl/main.cpp
View File

@ -183,7 +183,9 @@ init(void)
Rw::CurrentTexDictionary = new Rw::TexDictionary; Rw::CurrentTexDictionary = new Rw::TexDictionary;
// Rw::Image::setSearchPath("/home/aap/gamedata/ps2/gtasa/models/gta3_archive/txd_extracted/"); // Rw::Image::setSearchPath("/home/aap/gamedata/ps2/gtasa/models/gta3_archive/txd_extracted/");
// Rw::Image::setSearchPath("/home/aap/gamedata/ps2/gtavc/MODELS/gta3_archive/txd_extracted/"); // Rw::Image::setSearchPath("/home/aap/gamedata/ps2/gtavc/MODELS/gta3_archive/txd_extracted/");
Rw::Image::setSearchPath("/home/aap/gamedata/ps2/gtavc/MODELS/gta3_archive/txd_extracted/;/home/aap/gamedata/ps2/gtasa/models/gta3_archive/txd_extracted/"); Rw::Image::setSearchPath(
"/home/aap/gamedata/ps2/gtavc/MODELS/gta3_archive/txd_extracted/;/home/aap/gamedata/ps2/gtasa/models/gta3_archive/txd_extracted/");
//"D:\\rockstargames\\ps2\\gtavc\\MODELS\\gta3_archive\\txd_extracted\\;D:\\rockstargames\\ps2\\gtasa\\models\\gta3_archive\\txd_extracted\\");
Rw::Gl::RegisterNativeRaster(); Rw::Gl::RegisterNativeRaster();
Rw::RegisterMaterialRightsPlugin(); Rw::RegisterMaterialRightsPlugin();
Rw::RegisterMatFXPlugin(); Rw::RegisterMatFXPlugin();
@ -199,7 +201,8 @@ init(void)
Rw::RegisterMeshPlugin(); Rw::RegisterMeshPlugin();
Rw::StreamFile in; Rw::StreamFile in;
in.open(filename, "rb"); if(in.open(filename, "rb") == NULL)
printf("couldn't open file\n");
Rw::FindChunk(&in, Rw::ID_CLUMP, NULL, NULL); Rw::FindChunk(&in, Rw::ID_CLUMP, NULL, NULL);
clump = Rw::Clump::streamRead(&in); clump = Rw::Clump::streamRead(&in);
assert(clump); assert(clump);