[Scummvm-cvs-logs] CVS: scummex Makefile.mingw,NONE,1.1 resource.cpp,1.17,1.18 scummex.cpp,1.24,1.25 Makefile.mingw32,1.1.1.1,NONE
Travis Howell
kirben at users.sourceforge.net
Thu Sep 25 17:40:31 CEST 2003
Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv5725
Modified Files:
resource.cpp scummex.cpp
Added Files:
Makefile.mingw
Removed Files:
Makefile.mingw32
Log Message:
Update mingw makefile
--- NEW FILE: Makefile.mingw ---
# Where is scummvm will be installed
SCUMMEXPATH=C:/scummex
SRC=.
### Modify these paths
SDL_CFLAGS=-I$(SRC)/sdl/include
SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL -lSDL_mixer
WX_CFLAGS= -I/usr/local/include `wxmsw-2.4-config --cxxflags`
WX_LIBS=`wxmsw-2.4-config --libs`
CC=g++
OBJECTS= bomp.o codec37.o codec47.o descumm.o descumm6.o file.o image.o mixer.o resource.o resources.o \
scummex.o sound.o wxwindows.o
CFLAGS= $(SDL_CFLAGS) $(WX_CFLAGS) -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
LIBS= $(SDL_LIBS) $(WX_LIBS) -lmingw32
.SUFFIXES: .o .cpp
all: ${OBJECTS}
$(CC) -o scummex ${OBJECTS} ${LIBS}
.cpp.o:
$(CC) ${CFLAGS} -c -o $@ $<
resources.o:
windres --include-dir /usr/local/include image.rc $@
clean:
rm -f scummex.exe *.o
# Some additional targets
install: all
mkdir -p $(SCUMMEXPATH)
mkdir -p $(SCUMMEXPATH)/help
strip scummex.exe -o $(SCUMMEXPATH)/scummex.exe
dist: install
cp help/*.html $(SCUMMEXPATH)/help
cp help/help.* $(SCUMMEXPATH)/help
cp SDL/lib/SDL.dll $(SCUMMEXPATH)
cp SDL/lib/SDL_Mixer.dll $(SCUMMEXPATH)
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- resource.cpp 24 Sep 2003 23:04:06 -0000 1.17
+++ resource.cpp 26 Sep 2003 00:39:50 -0000 1.18
@@ -118,7 +118,7 @@
char name[256];
int numFiles, number = 0;
int bufindex;
- uint blockOffset, blockSize;
+ //uint blockOffset, blockSize;
byte temp[8];
int32 offset;
Index: scummex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- scummex.cpp 25 Sep 2003 07:32:19 -0000 1.24
+++ scummex.cpp 26 Sep 2003 00:39:50 -0000 1.25
@@ -125,7 +125,7 @@
}
void ScummEX::fileView(int blockid) {
- int j, i;
+ int /* j, */ i;
char *text;
char title[256];
char buf[256];
--- Makefile.mingw32 DELETED ---
More information about the Scummvm-git-logs
mailing list