[Vm-dev] [commit] r2402 - Merging support files from cogvm branch.

commits at squeakvm.org commits at squeakvm.org
Thu Jun 9 06:59:34 UTC 2011


Author: andreas
Date: 2011-06-08 23:59:34 -0700 (Wed, 08 Jun 2011)
New Revision: 2402

Added:
   trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.msvc
Modified:
   trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.win32
Log:
Merging support files from cogvm branch.

Added: trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.msvc
===================================================================
--- trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.msvc	                        (rev 0)
+++ trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.msvc	2011-06-09 06:59:34 UTC (rev 2402)
@@ -0,0 +1,31 @@
+include $(BASEDIR)/Makefile.plugin
+
+# additional CFLAGS
+CFLAGS += -DNOPTHREADS
+
+# additional directories and files
+MP3DIR=  $(CROSSDIR)/libmpeg
+MP3SRC:= $(notdir $(wildcard $(MP3DIR)/*.c))
+MP3SRC:= $(filter-out dump.c dump2.c mpeg3toc.c mpeg3cat.c testaudio.c udump.c test.c, $(MP3SRC))
+MP3OBJ=  $(MP3SRC:.c=.o)
+
+AUDDIR=  $(MP3DIR)/audio
+AUDSRC:= $(notdir $(wildcard $(AUDDIR)/*.c))
+AUDOBJ=  $(AUDSRC:.c=.o)
+
+VIDDIR= $(MP3DIR)/video
+VIDSRC:=  $(notdir $(wildcard $(VIDDIR)/*.c))
+VIDSRC:= $(filter-out worksheet.c, $(VIDSRC))
+VIDOBJ=  $(VIDSRC:.c=.o)
+
+# add the libmpeg files
+LIBSRC += $(MP3SRC) $(AUDSRC) $(VIDSRC)
+LIBSRC=   $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC) $(MP3SRC) $(AUDSRC) $(VIDSRC))
+LIBOBJ += $(MP3OBJ) $(AUDOBJ) $(VIDOBJ)
+
+# Restate the dependency.  Don't ask me why, but it appears necessary :/
+$(PLUGINLIB): $(LIBOBJ)
+
+# add the directories
+VPATH    +=   $(MP3DIR)   $(VIDDIR)   $(AUDDIR)
+INCLUDES += -I$(MP3DIR) -I$(VIDDIR) -I$(AUDDIR)

Modified: trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.win32
===================================================================
--- trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.win32	2011-06-09 06:59:03 UTC (rev 2401)
+++ trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.win32	2011-06-09 06:59:34 UTC (rev 2402)
@@ -35,7 +35,7 @@
 OBJDIR= .
 
 makelib: $(LIBOBJ)
-	-$(RM) $(LIB)
+	-$(RM) $(LIB).lib
 	ar rc $(LIB).lib $(LIBOBJ)
 	$(RM) $(LIBOBJ)
 



More information about the Vm-dev mailing list