Build in this directory.

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 70e37a47b8f95de5fc21063de87ac536beaf57e7..04623dfa1f2c0b72490a07c6e4b7b6b00bb7760d 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -13,14 +13,14 @@
 \r
 \r
 ARCH = win32\r
-\r
-SRCDIR=..\src\r
+SRCDIR = ..\src\r
+OBJDIR = .\r
 \r
 !ifndef WITH_OPENSSL\r
 !error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"\r
 !endif\r
 \r
-KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
+KUMU_OBJS = $(OBJDIR)\KM_fileio.obj $(OBJDIR)\KM_log.obj $(OBJDIR)\KM_prng.obj $(OBJDIR)\KM_util.obj $(OBJDIR)\KM_xml.obj\r
 ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \\r
        JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \\r
        TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \\r
@@ -44,7 +44,7 @@ LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG
 CXXFLAGS2 = $(CXXFLAGS1) /MTd /DDEBUG /D_DEBUG /Od /RTC1 /ZI\r
 LINKFLAGS = $(LINKFLAGS1) /DEBUG\r
 !else\r
-CXXFLAGS2 = $(CXXFLAGS1) /MT /DNDEBUG /D_NDEBUG /O2\r
+CXXFLAGS2 = $(CXXFLAGS1) /MT /DNODEBUG /D_NODEBUG /O2\r
 LINKFLAGS = $(LINKFLAGS1)\r
 !endif\r
 \r
@@ -58,20 +58,24 @@ LINKFLAGS = $(LINKFLAGS1)
 !endif\r
 \r
 XERCES_DIR = $(WITH_XERCES)\r
-CPPFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include\r
+CXXFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include\r
 LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(XERCES_DIR)"\lib\r
 !ELSEIFDEF WITH_XML_PARSER\r
-CPPFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib\r
+CXXFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib\r
 !IFDEF DEBUG\r
 LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\debug\r
 !ELSE\r
 LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\release\r
 !ENDIF\r
 !ELSE\r
-CPPFLAGS = $(CXXFLAGS2)\r
+CXXFLAGS = $(CXXFLAGS2)\r
 LIBFLAGS = $(LIBFLAGS1)\r
 !ENDIF\r
 \r
+CPPFLAGS = $(CXXFLAGS)\r
+\r
+{$(SRCDIR)\}.cpp{}.obj:\r
+       $(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<\r
 \r
 all: libkumu.lib kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe\r
 \r
@@ -111,3 +115,7 @@ klvwalk.exe: libasdcp.lib klvwalk.obj
 \r
 asdcp-test.exe: libasdcp.lib asdcp-test.obj\r
        $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe asdcp-test.obj libasdcp.lib Advapi32.lib\r
+\r
+\r
+O = .\r
+S = ..\src\r

diff --git a/win32/build.bat b/win32/build.bat
deleted file mode 100755 (executable)
index b47211e..0000000
--- a/win32/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ..\src\r
-nmake /f ..\win32\Makefile.mak\r