From c45e481d6e52bdaad93394f76b2c2fabc2d9d662 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sat, 8 Dec 2012 14:23:20 +0100 Subject: [PATCH] Windows Makefile fix --- Makefile.nmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index 8342d96..3f97014 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -17,11 +17,7 @@ CROSSLIBS = !include "objects.mk" -<<<<<<< HEAD OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o -======= -OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o mediafile.o ->>>>>>> 4612f8232dc402bada10681545f690c47ef4493a OBJECTS = $(OBJECTS1) $(OBJECTSWIN) -- 2.39.5