Fix nmake build

Author: ashabelnikov

sources/Makefile

@@ -7,7 +7,7 @@
 # Microsoft make utility
 MAKE=nmake
 # Borland make utility
-BMAKE=C:\Program Files\Borland\CBuilder5\Bin\make
+BMAKE="C:\Program Files\Borland\CBuilder5\Bin\make"
 
 all:
     md ..\binaries

sources/ParamDesk/Makefile

@@ -22,7 +22,7 @@ SOURCES = Application/StdAfx.cpp Application/ParamDesk.cpp common/ParamPageEvent
   Params/KnockPageDlg.cpp Params/MiscPageDlg.cpp Params/ParamDeskDlg.cpp Params/StarterPageDlg.cpp \
   Params/TemperPageDlg.cpp Params/IORemappingDlg.cpp Params/SecurPageDlg.cpp Tables/TablesDeskDlg.cpp \
   Tables/TDContextMenuManager.cpp Params/InjectorPageDlg.cpp Params/LambdaPageDlg.cpp Params/AccelEnrPageDlg.cpp \
-  common/ParamTabBaseDlg.cpp
+  common/ParamTabBaseDlg.cpp Params/UniOutPageDlg.cpp
 
 # DLL building
 all: paramdesk

sources/secu3man/Makefile

@@ -6,7 +6,7 @@ CC      = cl
 # resource compiler
 RC      = rc
 # compiler flags
-CFLAGS  = /nologo /W3 /GX /GR /O2 /Ob2 /DWIN32 /D_WINDOWS -I.. -I../secu3man -I../secu3man/Application /MD -D_AFXDLL /Ycstdafx.h
+CFLAGS  = /nologo /W3 /GX /GR /O2 /Ob2 /DWIN32 /D_WINDOWS -I.. -I../secu3man -I../secu3man/Application -I../ParamDesk /MD -D_AFXDLL /Ycstdafx.h
 CFLAGS  = $(CFLAGS) -D_CRT_NON_CONFORMING_SWPRINTFS -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 CFLAGS  = $(CFLAGS) /D NDEBUG
 CFLAGS  = $(CFLAGS) -D_WIN32_WINDOWS=0x0501 -DWINVER=0x0501

sources/ui-core/AnalogMeter.cpp

@@ -24,6 +24,9 @@
 #include <math.h>
 #include "AnalogMeter.h"
 
+#undef min //fucking stuff
+#undef max
+
 //IF You use _UNICODE:
 //In the Output category of the Link tab in the Project Settings dialog box,
 //set the Entry Point Symbol to wWinMainCRTStartup.
@@ -698,8 +701,8 @@ void CAnalogMeter::DrawNeedle()
  }
 
  dAngleRad = (m_dNeedlePos - m_dMinScale)*m_dRadiansPerValue - m_dLimitAngleRad;
- dAngleRad = max(dAngleRad, -m_dLimitAngleRad);
- dAngleRad = min(dAngleRad, m_dLimitAngleRad);
+ dAngleRad = std::max(dAngleRad, -m_dLimitAngleRad);
+ dAngleRad = std::min(dAngleRad, m_dLimitAngleRad);
  dCosAngle = cos(dAngleRad);
  dSinAngle = sin(dAngleRad);
 

sources/ui-core/OScopeCtrl.cpp

@@ -24,6 +24,9 @@
 #include "math.h"
 #include "OScopeCtrl.h"
 
+#undef min //fucking stuff
+#undef max
+
 BEGIN_MESSAGE_MAP(COScopeCtrl, CWnd)
  ON_WM_PAINT()
  ON_WM_SIZE()
@@ -201,7 +204,7 @@ void COScopeCtrl::InvalidateCtrl()
 
  //avoid overflow range error (crash), when m_dLowerLimit is zero.
  double log10ll = (m_dLowerLimit!=.0) ? log10(fabs(m_dLowerLimit)) : log10ll = .0;
- nCharacters = max(nCharacters, abs((int)log10ll));
+ nCharacters = std::max(nCharacters, abs((int)log10ll));
 
  // add the units digit, decimal point and a minus sign, and an extra space
  // as well as the number of decimal places to display

sources/ui-core/WndScroller.cpp

@@ -19,12 +19,13 @@
               email: [email protected]
 */
 
-#define NOMINMAX
-
 #include "stdafx.h"
 #include <algorithm>
 #include "WndScroller.h"
 
+#undef min //fucking stuff
+#undef max
+
 CWndScroller::CWndScroller()
 : mp_origWnd(NULL)
 , m_viewSize(CSize(0,0))