[Scummvm-cvs-logs] CVS: tools mm_nes_extract.c,1.2,1.3 Makefile,1.17,1.18
Jonathan Gray
khalek at users.sourceforge.net
Wed Sep 10 15:01:03 CEST 2003
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv12082
Modified Files:
mm_nes_extract.c Makefile
Log Message:
fix compilation
Index: mm_nes_extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/mm_nes_extract.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mm_nes_extract.c 10 Sep 2003 15:21:11 -0000 1.2
+++ mm_nes_extract.c 10 Sep 2003 21:53:34 -0000 1.3
@@ -32,7 +32,13 @@
// if not defined, dumps all resources to separate files
#define MAKE_LFLS
-void __cdecl debug (char *Text, ...)
+#ifdef WIN32
+ #define CDECL __cdecl
+#else
+ #define CDECL
+#endif
+
+void CDECL debug (char *Text, ...)
{
va_list marker;
va_start(marker,Text);
@@ -41,7 +47,7 @@
va_end(marker);
}
-void __cdecl error (char *Text, ...)
+void CDECL error (char *Text, ...)
{
va_list marker;
va_start(marker,Text);
@@ -51,7 +57,7 @@
exit(1);
}
-void __cdecl _assert (BOOL condition, char *Text, ...)
+void CDECL _assert (BOOL condition, char *Text, ...)
{
va_list marker;
if (condition)
@@ -748,7 +754,7 @@
{ 52, lfl_52 },
{ 53, lfl_53 },
{ 54, lfl_54 },
- { -1, { NULL } }
+ { -1, NULL }
};
#pragma pack(push,1)
@@ -917,4 +923,6 @@
dump_resource(input,"cost_DD9D-%i.dmp",i,&res_unk_DD9D[i]);
#endif // MAKE_LFLS
debug("All done!");
+
+ return 0;
}
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile 10 Sep 2003 15:18:48 -0000 1.17
+++ Makefile 10 Sep 2003 21:53:34 -0000 1.18
@@ -12,7 +12,7 @@
descumm$(EXEEXT) \
descumm6$(EXEEXT) \
extract$(EXEEXT) \
-# mm_nes_extract$(EXEEXT) \
+ mm_nes_extract$(EXEEXT) \
rescumm$(EXEEXT) \
simon1decr$(EXEEXT) \
simon2mp3$(EXEEXT)
@@ -28,8 +28,8 @@
extract$(EXEEXT): extract.o
$(CC) $(LFLAGS) -o $@ $+
-# mm_nes_extract$(EXEEXT): mm_nes_extract.o
-# $(CC) $(LFLAGS) -o $@ $+
+mm_nes_extract$(EXEEXT): mm_nes_extract.o
+ $(CC) $(LFLAGS) -o $@ $+
rescumm$(EXEEXT): rescumm.o
$(CC) $(LFLAGS) -o $@ $+
More information about the Scummvm-git-logs
mailing list