--- ray/platform/Windows_32.cfg	2016/03/10 01:44:51	1.10
+++ ray/platform/Windows_32.cfg	2016/03/28 17:45:18	1.13
@@ -7,20 +7,26 @@ RAD_BINDIR:    bin
 RAD_RLIBDIR:   share\lib
 RAD_MANDIR:    share\man
 
-# shouldn't need any changes
+# shouldn't need any changes other for the Tifflib location
 [build]
-CPPDEFINES: _WIN32 NDEBUG _CONSOLE _MBCS HDSUF=.exe _CRT_SECURE_NO_WARNINGS RT_WINPROC
-CCFLAGS:    /W3 /Gy /O2 /FD /c /EHsc /wd4244 /wd4305
+CPPDEFINES: _WIN64 NDEBUG _CONSOLE _MBCS RT_WINPROC HDSUF=.exe _CRT_SECURE_NO_WARNINGS
+CCFLAGS:    /MD /W2 /Gy /O2 /c /EHsc /wd4244 /wd4305
+LINKFLAGS:  /INCREMENTAL:NO /OPT:REF,ICF
+#TIFFINCLUDE: C:\Users\gm\Downloads\dev\tiff-4.0.6\libtiff
+#TIFFLIB: C:\Users\gm\Downloads\dev\tiff-4.0.6\libtiff
 
 [debug]
-CPPDEFINES: _WIN32 _DEBUG _CONSOLE _MBCS HDSUF=.exe _CRT_SECURE_NO_WARNINGS RT_WINPROC
-CCFLAGS:    /W3 /Gy /Od /Yd /FD /Zi /c /EHsc /wd4244 /wd4305
-LINKFLAGS:  /debug
+CPPDEFINES: _WIN64 _DEBUG _CONSOLE _MBCS _CRT_SECURE_NO_WARNINGS RT_WINPROC HDSUF=.exe 
+CCFLAGS:    /MDd /W3 /Gy /Od /Zi /c /EHsc /Fd"{RAD_BUILDOBJ}\radiance.pdb" /wd4244 /wd4305
+LINKFLAGS:  /DEBUG /INCREMENTAL:NO
+#TIFFINCLUDE: C:\Users\gm\Downloads\dev\tiff-4.0.6\libtiff
+#TIFFLIB: C:\Users\gm\Downloads\dev\tiff-4.0.6\libtiff
 
 # never touch below this
 [code]
 RAD_ARGSCOMPAT: fixargv0.c 
-RAD_MATHCOMPAT: erf.c
+# VC 2015 includes erf() and erfc()
+# RAD_MATHCOMPAT: erf.c
 RAD_NETCOMPAT: win_netproc.c
 RAD_PROCESS: win_process.c win_popen.c
 RAD_PCALLS: raypwin.c