Index: /branches/v2.9_Lars/classes/mm-progs/MMPlayer/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/MMPlayer/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/MMPlayer/makefile	(revision 116)
@@ -25,6 +25,7 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile	(revision 116)
@@ -23,6 +23,7 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/mm-progs/imageconverter/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/imageconverter/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/imageconverter/makefile	(revision 116)
@@ -21,6 +21,7 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/mm-progs/master_volume/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/master_volume/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/master_volume/makefile	(revision 116)
@@ -23,6 +23,7 @@
 	-rm *.exe
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/mm-progs/mmfind/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/mmfind/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/mmfind/makefile	(revision 116)
@@ -12,5 +12,5 @@
 
 
-OBJECTS		=	image.obj	 
+OBJECTS		=	image.obj	
 
 
@@ -27,6 +27,7 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile	(revision 116)
@@ -4,11 +4,11 @@
 
 CC           = gcc
-LIB_DIR      = $d:/emx/lib 
+LIB_DIR      = $d:/emx/lib
 #CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
 #CPPFLAGS     = -O -Zomf -Zcrtdll -Zmtd -s
 CPPFLAGS     = -O -Wall -Zomf -Zmt -s
 INC		= ../include -I ../../../classes/inc -I ../../../common_functions/include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR		= .
 CPPDIR	= .
@@ -20,9 +20,9 @@
 all:	mmplayer.exe vioplayer.exe
 
-$(LIBDIR)/%.obj:	$(COMMONSRC)/%.c 
-	gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+$(LIBDIR)/%.obj:	$(COMMONSRC)/%.c
+	gcc -c -Wall -o$@ -Zomf -I$(INC) $<
 
 %.obj:	%.c
-	gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+	gcc -c -Wall -o$@ -Zomf -I$(INC) $<
 
 mmplayer.exe:	mmplayer.c $(OBJECTS) $(OBJS2) makefile
@@ -38,5 +38,5 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
 
Index: /branches/v2.9_Lars/classes/mm-progs/volume/makefile
===================================================================
--- /branches/v2.9_Lars/classes/mm-progs/volume/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/mm-progs/volume/makefile	(revision 116)
@@ -26,6 +26,7 @@
 	-rm *.dll
 	-rm *.obj
-	-rm *.res
+	-rm *.RES
 	-rm *.ini
+	-rm *.def
 
 cleaner:
Index: /branches/v2.9_Lars/classes/res/de/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/de/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/de/makefile	(revision 116)
@@ -9,5 +9,5 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
+DEFS         =
 
 OBJDIR	=	../dll
@@ -31,5 +31,5 @@
 
 #(OBJDIR)/mmres$(LANGUAGE).res:	mmres$(LANGUAGE).rc $(OBJECTS)
-#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -43,5 +43,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/en/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/en/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/en/makefile	(revision 116)
@@ -9,6 +9,6 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR	=	../dll
@@ -31,5 +31,5 @@
 
 #mmres$(LANGUAGE).res:	mmres$(LANGUAGE).rc $(OBJECTS)
-#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -40,5 +40,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/es/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/es/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/es/makefile	(revision 116)
@@ -9,6 +9,6 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR	=	../dll
@@ -30,5 +30,5 @@
 
 #mmres$(LANGUAGE).res:	mmres$(LANGUAGE).rc $(OBJECTS)
-#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -39,5 +39,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/fr/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/fr/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/fr/makefile	(revision 116)
@@ -9,6 +9,6 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR	=	../dll
@@ -30,5 +30,5 @@
 
 #mmres$(LANGUAGE).res:	mmres$(LANGUAGE).rc $(OBJECTS)
-#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -39,5 +39,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/it/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/it/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/it/makefile	(revision 116)
@@ -9,6 +9,6 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR	=	../dll
@@ -21,5 +21,5 @@
 			cwaudio$(LANGUAGE).rc cwaudio$(LANGUAGE).dlg \
 			cwimage$(LANGUAGE).rc cwvideo$(LANGUAGE).rc \
-			mmfind$(LANGUAGE).dlg mmfind$(LANGUAGE).rc 
+			mmfind$(LANGUAGE).dlg mmfind$(LANGUAGE).rc
 
 all:	$(OBJDIR)/mmres$(LANGUAGE).dll
@@ -35,5 +35,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/nl/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/nl/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/nl/makefile	(revision 116)
@@ -9,6 +9,6 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR	=	../dll
@@ -20,5 +20,5 @@
 			imageconv$(LANGUAGE).dlg imageconv$(LANGUAGE).rc \
 			cwaudio_nl.rc cwaudio_nl.dlg cwimage_nl.rc cwvideo_nl.rc \
-			mmfind_nl.dlg mmfind_nl.rc 
+			mmfind_nl.dlg mmfind_nl.rc
 
 all:	$(OBJDIR)/mmres$(LANGUAGE).dll
@@ -34,5 +34,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/classes/res/tw/makefile
===================================================================
--- /branches/v2.9_Lars/classes/res/tw/makefile	(revision 115)
+++ /branches/v2.9_Lars/classes/res/tw/makefile	(revision 116)
@@ -9,5 +9,5 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC	=	../../inc
-DEFS         = 
+DEFS         =
 
 OBJDIR	=	../dll
@@ -32,5 +32,5 @@
 
 #(OBJDIR)/mmres$(LANGUAGE).res:	mmres$(LANGUAGE).rc $(OBJECTS)
-#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#		rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -44,5 +44,5 @@
 	-rm *.*~
 	-rm *.flc
-	-rm *.res
+	-rm *.RES
 	-rm *.obj
 
Index: /branches/v2.9_Lars/mediafolder/c/cddb/makefile
===================================================================
--- /branches/v2.9_Lars/mediafolder/c/cddb/makefile	(revision 115)
+++ /branches/v2.9_Lars/mediafolder/c/cddb/makefile	(revision 116)
@@ -102,4 +102,5 @@
 	-rm *.exe
 	-rm *.dll
+	-rm *.o
 	-cd ./res && make clean
 
Index: /branches/v2.9_Lars/mediafolder/c/cddb/res/makefile
===================================================================
--- /branches/v2.9_Lars/mediafolder/c/cddb/res/makefile	(revision 115)
+++ /branches/v2.9_Lars/mediafolder/c/cddb/res/makefile	(revision 116)
@@ -76,5 +76,5 @@
 	-rm *.obj
 	-rm *.dll
-	-rm *.res
+	-rm *.RES
 
 cleaner:
Index: /branches/v2.9_Lars/mediafolder/makefile
===================================================================
--- /branches/v2.9_Lars/mediafolder/makefile	(revision 115)
+++ /branches/v2.9_Lars/mediafolder/makefile	(revision 116)
@@ -12,4 +12,5 @@
 
 CMNINC	= 	$(COMMONSRC)/include
+CLSINC    =   $(COMMONSRC)/../classes/include
 
 HELPERDIR	=	./c/helper
@@ -25,5 +26,5 @@
 #
 #######################################
-COMPILE	=	$(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(CMNINC) /Fo$@ $<
+COMPILE	=	$(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(CMNINC) -I$(CLSINC) /Fo$@ $<
 
 #######################################
@@ -126,5 +127,5 @@
 		@create_mfldr_def.CMD mediafolder.DEF
 		implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def
-		icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) lib/progfldr.lib $(LIBS) mediafolder.def
+		icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) ../classes/lib/cwmm.lib lib/progfldr.lib $(LIBS) mediafolder.def
 		rc ./res/mediafolder.res $@
 		MAPSYM $*.map
@@ -163,11 +164,11 @@
 #######################################
 $(INC)/cwaudio.hh: ../classes/idl/idl_audio/cwaudio.idl
-	sc -shh -S 64000  -I $(IDLDIR)/idl_mm  -dinclude -m noqualifytypes $<
+	sc -shh -S 100000  -I $(IDLDIR)/idl_mm  -dinclude -m noqualifytypes -musexhpass $<
 
 $(INC)/cwcdtrack.hh: ../classes/idl/idl_audio/cwcdtrack.idl
-	sc -shh -S 64000  -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes $<
+	sc -shh -S 100000  -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes -musexhpass $<
 
 $(INC)/cwmmdataf.hh:	../classes/idl/idl_mm/cwmmdataf.idl
-	sc -shh -S 64000  -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes $<
+	sc -shh -S 100000  -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes -musexhpass $<
 
 
