Windows readme and makefile updated!

diff --git a/Makefile.nmake b/Makefile.nmake
index 1ef0c3fc54651fb882bec867fc6012f4cf5ece62..45737657b6eafe54f1981152092c566d43ab78cc 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -7,17 +7,28 @@
 
 
 CXXFLAGS_DEV = -g -O0 -Wall -Woverloaded-virtual -Wshadow -Werror -DDEV -D_GNU_SOURCE $(INCLUDES)
-CXXFLAGS_REL = /I"$(DXSDK_DIR)\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NEW_DEMUXER"  /nologo /EHsc /MD /GS   /W3  /c   /TP
+CXXFLAGS_REL = /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NEW_DEMUXER"  /nologo /EHsc /MD /GS   /W3  /c   /TP
 LDFLAGS =  /INCREMENTAL:NO /NOLOGO /NODEFAULTLIB  /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LIBPATH:"$(DXSDK_DIR)\Lib\x86"
 
-LIBS = Msvcrt.lib Ws2_32.lib shlwapi.lib d3d9.lib d3dx9.lib Iphlpapi.lib Strmiids.lib Mfuuid.lib winmm.lib MSVCPRT.lib kernel32.lib user32.lib gdi32.lib ole32.lib uuid.lib oleaut32.lib
+LIBS = Msvcrt.lib Ws2_32.lib shlwapi.lib d3d9.lib Iphlpapi.lib Strmiids.lib Mfuuid.lib winmm.lib MSVCPRT.lib kernel32.lib user32.lib gdi32.lib ole32.lib uuid.lib oleaut32.lib
+
+LIBSLEGACY = gdiplus.lib
+
+LIBSCURRENT =  d3d10_1.lib d2d1.lib dwrite.lib windowscodecs.lib
 
 CROSSLIBS =
 
 !include "objects.mk"
 
 
-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 wwinvideoh264filter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o 
+OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o windowsosd.o  dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinvideoh264filter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o 
+
+
+OBJECTSWINLEGACY =  osdvector.o surfacevector.o osdwinpixel.o surfacewin.o fonts/helvB24.o fonts/helvB18.o 
+
+OBJECTSWINCURRENT = osdvector.o surfacevector.o osdwinvector.o
+
+
 
 OBJECTS = $(OBJECTS1) $(OBJECTSWIN)
 
@@ -25,26 +36,49 @@ OBJECTS = $(OBJECTS1) $(OBJECTSWIN)
 
 default: release  #dev
 
+!ifdef LEGACY
+release:: 
+CXXFLAGS= /D "WINDOWS_LEGACY" $(CXXFLAGS_REL)
+OBJECTS = $(OBJECTS) $(OBJECTSWINLEGACY)
+LIBS = $(LIBS) $(LIBSLEGACY)
+release:: vompclient-legacy.exe
+
+
+vompclient-legacy.exe: $(OBJECTS) vompwin.res
+        link $(LDFLAGS) /OUT:"vompclient-legacy.exe" $(LIBS) $(OBJECTS) vompwin.res
+!else
+
+
 release::
 CXXFLAGS= $(CXXFLAGS_REL)
+OBJECTS = $(OBJECTS) $(OBJECTSWINCURRENT)
+LIBS = $(LIBS) $(LIBSCURRENT)
 release:: vompclient.exe
 
-
-
 vompclient.exe: $(OBJECTS) vompwin.res
         link $(LDFLAGS) /OUT:"vompclient.exe" $(LIBS) $(OBJECTS) vompwin.res
-        mt -manifest vompclient.exe.manifest -outputresource:vompclient.exe;1
+
+!endif
 
 
 
 $(OBJECTS): $*.cc
         $(CXX) $(CXXFLAGS) /Fo$*.o $*.cc
 
+!ifdef LEGACY
+vompwin.res:vompwin.rc
+        $(RC) /d WINDOWS_LEGACY /fo"vompwin.res" "vompwin.rc"
+!else
 vompwin.res:vompwin.rc
         $(RC) /fo"vompwin.res" "vompwin.rc"
+!endif
 
 clean:
   del  *.o
+!ifdef LEGACY
+  del vompclient-legacy.exe
+!else
   del vompclient.exe
+!endif
   del fonts\*.o
 

diff --git a/objects.mk b/objects.mk
index 2aea3f72b1f892423242fb562a847f7207fa6989..e47642ab7d8e45352bb0eadf2753bc749b1498ec 100644 (file)
--- a/objects.mk
+++ b/objects.mk
@@ -1,5 +1,5 @@
 OBJECTS1 = command.o  tcp.o dsock.o thread.o timers.o i18n.o       \
-           message.o messagequeue.o udp.o wol.o audio.o video.o log.o  mutex.o signal.o     \
+           message.o messagequeue.o udp.o wol.o audio.o video.o log.o  mutex.o    \
            vdr.o recman.o recording.o recinfo.o channel.o rectimer.o event.o     \
            directory.o mark.o option.o                                           \
            player.o playerradio.o vfeed.o afeed.o                                \

diff --git a/readme.win b/readme.win
index 9c45c6f7809904441552b30ceea723fae0845426..4d30b0eaab63b854ba80644060a298e27c5b4c3d 100644 (file)
--- a/readme.win
+++ b/readme.win
@@ -18,9 +18,8 @@ Requirements
 
 The vomp client on Windows requires:
 
-* Windows 2000 or later
-* Windows XP for full remote control support
-* Windows Vista for EVR support
+* Windows XP or later [legacy version]
+* Windows Vista with platform update or later for EVR support and truecolor OSD
 * DirectX 8 graphics card (some older cards might work also)
 * A DirectShow MPEG2 decoder, which supports Video Mixing Renderer 9 (VMR-9) 
 or the Enhanced Video Renderer (EVR) mostly included within DVD software player