[Scummvm-cvs-logs] SF.net SVN: scummvm: [23137] tools/trunk

[sev at users.sourceforge.net]

Revision: 23137
Author:   sev
Date:     2006-06-15 08:13:56 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23137&view=rev

Log Message:
-----------
Fix compilation on *nix

Modified Paths:
--------------
    tools/trunk/Makefile
    tools/trunk/compress_saga.cpp
    tools/trunk/utils/wave.cpp
Modified: tools/trunk/Makefile
===================================================================
--- tools/trunk/Makefile	2006-06-15 14:34:46 UTC (rev 23136)
+++ tools/trunk/Makefile	2006-06-15 15:13:56 UTC (rev 23137)
@@ -5,7 +5,7 @@
 
 CC      := gcc
 CXX     := g++
-CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar
+CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX
 # LDFLAGS +=
 
 # Additional warnings
@@ -37,6 +37,14 @@
 	extract_simon1_amiga$(EXEEXT) \
 	extract_zak_c64$(EXEEXT)
 
+UTILS := \
+	utils/adpcm.o \
+	utils/audiostream.o \
+	utils/file.o \
+	utils/md5.o \
+	utils/voc.o \
+	utils/wave.o
+
 all: $(TARGETS)
 
 compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
@@ -78,7 +86,7 @@
 extract_scumm_mac$(EXEEXT): extract_scumm_mac.o util.o
 	$(CC) $(LDFLAGS) -o $@ $+
 
-compress_saga$(EXEEXT): compress_saga.o compress.o util.o
+compress_saga$(EXEEXT): compress_saga.o compress.o util.o $(UTILS)
 	$(CXX) $(LDFLAGS) -o $@ $+
 
 extract_simon1_amiga$(EXEEXT): extract_simon1_amiga.o

Modified: tools/trunk/compress_saga.cpp
===================================================================
--- tools/trunk/compress_saga.cpp	2006-06-15 14:34:46 UTC (rev 23136)
+++ tools/trunk/compress_saga.cpp	2006-06-15 15:13:56 UTC (rev 23137)
@@ -26,8 +26,8 @@
 #include "compress.h"
 #include "utils/md5.h"
 #include "utils/util.h"
-#include "utils/AudioStream.h"
-#include "utils/File.h"
+#include "utils/audiostream.h"
+#include "utils/file.h"
 #include "utils/voc.h"
 #include "utils/wave.h"
 #include "utils/adpcm.h"

Modified: tools/trunk/utils/wave.cpp
===================================================================
--- tools/trunk/utils/wave.cpp	2006-06-15 14:34:46 UTC (rev 23136)
+++ tools/trunk/utils/wave.cpp	2006-06-15 15:13:56 UTC (rev 23137)
@@ -1,5 +1,5 @@
 #include "stream.h"
-#include "AudioStream.h"
+#include "audiostream.h"
 #include "adpcm.h"
 
 namespace Audio {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.