]> git.vomp.tv Git - vompclient.git/blob - Makefile.nmake
Fix compiling again
[vompclient.git] / Makefile.nmake
1
2 ###############################
3
4 #       ! Chris - WRONG FILE !
5
6 ###############################
7
8
9 CXXFLAGS_DEV = -g -O0 -Wall -Woverloaded-virtual -Wshadow -Werror -DDEV -D_GNU_SOURCE $(INCLUDES)
10 CXXFLAGS_REL = /I"$(DXSDK_DIR)\Include" /I"$(JPEG_LIB)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NEW_DEMUXER"  /nologo /EHsc /MD /GS   /W3  /c   /TP
11 LDFLAGS =  /INCREMENTAL:NO /NOLOGO /NODEFAULTLIB  /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LIBPATH:"$(DXSDK_DIR)\Lib\x86"
12
13 LIBS = Msvcrt.lib Ws2_32.lib shlwapi.lib d3d9.lib d3dx9.lib Iphlpapi.lib Strmiids.lib winmm.lib MSVCPRT.lib kernel32.lib user32.lib gdi32.lib ole32.lib uuid.lib libjpeg.lib oleaut32.lib
14
15 CROSSLIBS =
16
17 !include "objects.mk"
18
19
20 <<<<<<< HEAD
21 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 
22 =======
23 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
24 >>>>>>> 4612f8232dc402bada10681545f690c47ef4493a
25
26 OBJECTS = $(OBJECTS1) $(OBJECTSWIN)
27
28 #.PHONY: clean fresh all install strip
29
30 default: release  #dev
31
32 release::
33 CXXFLAGS= $(CXXFLAGS_REL)
34 release:: vompclient.exe
35
36
37
38 vompclient.exe: $(OBJECTS) vompwin.res
39         link $(LDFLAGS) /OUT:"vompclient.exe" $(LIBS) $(OBJECTS) vompwin.res
40
41
42
43 $(OBJECTS): $*.cc
44         $(CXX) $(CXXFLAGS) /Fo$*.o $*.cc
45
46 vompwin.res:vompwin.rc
47         $(RC) /fo"vompwin.res" "vompwin.rc"
48
49 clean:
50   del  *.o
51   del vompclient.exe
52   del fonts\*.o
53