New make system, compatible with both mvp and win

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644 (file)
index 0000000..a4d8ad1
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,56 @@
+CC = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-g++
+STRIP = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-strip
+
+CXX = $(CC)
+INCLUDES = -I../jpeg-6b
+CXXFLAGS_DEV = -g -O0 -Wall -Woverloaded-virtual -Wshadow -Werror -DDEV -D_GNU_SOURCE $(INCLUDES)
+CXXFLAGS_REL = -O3 -Wall -Woverloaded-virtual -Wshadow -Werror -D_GNU_SOURCE $(INCLUDES)
+LDFLAGS = -Wall -static
+
+LIBPATHS =
+LIBS = -lpthread -lrt
+CROSSLIBS = ../jpeg-6b/libjpeg.a
+
+# This is the only thing windows and linux share
+include objects.mk
+
+OBJECTSMVP = main.o threadp.o remotemvp.o ledmvp.o mtdmvp.o videomvp.o audiomvp.o osdmvp.o surfacemvp.o
+OBJECTSWIN = threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o
+
+OBJECTS = $(OBJECTS1) $(OBJECTSMVP)
+
+.PHONY: clean fresh all install strip
+
+default: dev
+fresh:   clean default
+
+vompclient: $(OBJECTS)
+       $(CC) $(LDFLAGS) $(LIBPATHS) $(RELEASE) -o vompclient $(OBJECTS) $(CROSSLIBS) $(LIBS)
+
+strip:
+       $(STRIP) vompclient
+
+install:
+       rm -f /diskless/nfs/mvp/vompclient
+       cp vompclient /diskless/nfs/mvp
+
+debug:
+       ../../gdb/gdb-6.3-target-ppc/gdb/gdb /diskless/nfs/mvp/vompclient /diskless/nfs/mvp/core.*
+
+debug2:
+       ../../gdb/gdb-6.3-target-ppc/gdb/gdb /diskless/nfs/mvp/vompclient /diskless/nfs/mvp/core
+
+dev: CXXFLAGS := $(CXXFLAGS_DEV)
+dev: vompclient
+
+release: CXXFLAGS := $(CXXFLAGS_REL)
+release: clean vompclient strip
+
+deps: GNUmakefile
+       $(CC) -MM $(INCLUDES) $(OBJECTS:%.o=%.cc) > deps
+
+-include deps
+
+clean:
+       rm -f *.o deps vompclient *~ fonts/*.o fonts/*~
+

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 9ee421c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-CC = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-g++
-STRIP = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-strip
-
-CXX = $(CC)
-INCLUDES = -I../jpeg-6b
-CXXFLAGS_DEV = -g -O0 -Wall -Woverloaded-virtual -Wshadow -Werror -DDEV -D_GNU_SOURCE $(INCLUDES)
-CXXFLAGS_REL = -O3 -Wall -Woverloaded-virtual -Wshadow -Werror -D_GNU_SOURCE $(INCLUDES)
-LDFLAGS = -Wall -static
-
-LIBPATHS =
-LIBS = -lpthread -lrt
-CROSSLIBS = ../jpeg-6b/libjpeg.a
-
-OBJECTS1 = main.o command.o log.o tcp.o dsock.o thread.o timers.o i18n.o               \
-           message.o messagequeue.o                                                    \
-           vdr.o recman.o recording.o channel.o rectimer.o event.o directory.o         \
-           player.o vfeed.o afeed.o                                                    \
-                                        demuxer.o demuxervdr.o stream.o draintarget.o                               \
-           viewman.o box.o region.o colour.o view.o                                    \
-           vinfo.o vwallpaper.o vvolume.o vrecordinglist.o vlivebanner.o vmute.o       \
-           vtimerlist.o vtimeredit.o voptionsmenu.o vrecordingmenu.o vquestion.o       \
-           vchannellist.o vwelcome.o vvideolive.o vvideorec.o vepgsettimer.o           \
-           vchannelselect.o vserverselect.o vconnect.o voptions.o vepg.o vrecmove.o    \
-           widget.o wselectlist.o wjpeg.o wsymbol.o wbutton.o woptionbox.o wtextbox.o  \
-           fonts/helvB24.o fonts/helvB18.o                                             \
-           remote.o led.o mtd.o video.o audio.o osd.o surface.o
-
-OBJECTSMVP = threadp.o   remotemvp.o ledmvp.o mtdmvp.o videomvp.o audiomvp.o osdmvp.o surfacemvp.o
-OBJECTSWIN = threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o
-
-OBJECTS = $(OBJECTS1) $(OBJECTSMVP)
-
-.PHONY: clean fresh all install strip
-
-default: dev
-fresh:   clean default
-
-vompclient: $(OBJECTS)
-       $(CC) $(LDFLAGS) $(LIBPATHS) $(RELEASE) -o vompclient $(OBJECTS) $(CROSSLIBS) $(LIBS)
-
-strip:
-       $(STRIP) vompclient
-
-install:
-       rm -f /diskless/nfs/mvp/vompclient
-       cp vompclient /diskless/nfs/mvp
-
-debug:
-       ../../gdb/gdb-6.3-target-ppc/gdb/gdb /diskless/nfs/mvp/vompclient /diskless/nfs/mvp/core.*
-
-debug2:
-       ../../gdb/gdb-6.3-target-ppc/gdb/gdb /diskless/nfs/mvp/vompclient /diskless/nfs/mvp/core
-
-dev: CXXFLAGS := $(CXXFLAGS_DEV)
-dev: vompclient
-
-release: CXXFLAGS := $(CXXFLAGS_REL)
-release: clean vompclient strip
-
-deps: Makefile
-       $(CC) -MM $(INCLUDES) $(OBJECTS:%.o=%.cc) > deps
-
--include deps
-
-clean:
-       rm -f *.o deps vompclient *~ fonts/*.o fonts/*~

diff --git a/Makefile.nmake b/Makefile.nmake
new file mode 100644 (file)
index 0000000..fad4573
--- /dev/null
+++ b/Makefile.nmake
@@ -0,0 +1,43 @@
+CXXFLAGS_DEV = -g -O0 -Wall -Woverloaded-virtual -Wshadow -Werror -DDEV -D_GNU_SOURCE $(INCLUDES)\r
+CXXFLAGS_REL = /I"$(DXSDK_DIR)\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NEW_DEMUXER"  /nologo /EHsc /MD /GS   /W3  /c   /TP \r
+LDFLAGS =  /INCREMENTAL:NO /NOLOGO /NODEFAULTLIB  /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LIBPATH:"$(DXSDK_DIR)\Lib\x86"\r
+\r
+\r
+\r
+\r
+LIBS = Msvcrt.lib Ws2_32.lib shlwapi.lib d3d9.lib d3dx9.lib Iphlpapi.lib strmbase.lib Strmiids.lib winmm.lib MSVCPRT.lib atls.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \r
+CROSSLIBS = \r
+\r
+!include "objects.mk"\r
+\r
+\r
+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\r
+\r
+OBJECTS = $(OBJECTS1) $(OBJECTSWIN)\r
+\r
+#.PHONY: clean fresh all install strip\r
+\r
+default: release  #dev\r
+\r
+release:: \r
+CXXFLAGS= $(CXXFLAGS_REL)\r
+release:: vompclient.exe\r
+\r
+\r
+\r
+vompclient.exe: $(OBJECTS) vompwin.res\r
+        link $(LDFLAGS) /OUT:"vompclient.exe" $(LIBS) $(OBJECTS) vompwin.res\r
+       \r
+\r
+\r
+$(OBJECTS): $*.cc\r
+        $(CXX) $(CXXFLAGS) /Fo$*.o $*.cc\r
+\r
+vompwin.res:vompwin.rc\r
+        $(RC) /fo"vompwin.res" "vompwin.rc"\r
+\r
+clean:\r
+       del  *.o \r
+       del vompclient.exe\r
+       del fonts\*.o \r
+\r

diff --git a/objects.mk b/objects.mk
new file mode 100644 (file)
index 0000000..b51cde8
--- /dev/null
+++ b/objects.mk
@@ -0,0 +1,13 @@
+OBJECTS1 = command.o log.o tcp.o dsock.o thread.o timers.o i18n.o                      \\r
+           message.o messagequeue.o                                                    \\r
+           vdr.o recman.o recording.o channel.o rectimer.o event.o directory.o         \\r
+           player.o vfeed.o afeed.o                                                    \\r
+           demuxer.o demuxervdr.o stream.o draintarget.o                               \\r
+           viewman.o box.o region.o colour.o view.o                                    \\r
+           vinfo.o vwallpaper.o vvolume.o vrecordinglist.o vlivebanner.o vmute.o       \\r
+           vtimerlist.o vtimeredit.o voptionsmenu.o vrecordingmenu.o vquestion.o       \\r
+           vchannellist.o vwelcome.o vvideolive.o vvideorec.o vepgsettimer.o           \\r
+           vchannelselect.o vserverselect.o vconnect.o voptions.o vepg.o vrecmove.o    \\r
+           widget.o wselectlist.o wjpeg.o wsymbol.o wbutton.o woptionbox.o wtextbox.o  \\r
+           fonts/helvB24.o fonts/helvB18.o                                             \\r
+           remote.o led.o mtd.o video.o audio.o osd.o surface.o\r