Permanently get off of min/max, extend setup_cl with 2019 default paths

master
Allen Webster 2019-12-26 20:14:13 -08:00
parent ccb3767c55
commit 15c7188721
3 changed files with 8 additions and 2 deletions

View File

@ -268,8 +268,6 @@ enum{
#define Max(a,b) (((a)>(b))?(a):(b)) #define Max(a,b) (((a)>(b))?(a):(b))
#define Min(a,b) (((a)<(b))?(a):(b)) #define Min(a,b) (((a)<(b))?(a):(b))
#define max(a,b) (((a)>(b))?(a):(b))
#define min(a,b) (((a)<(b))?(a):(b))
#define clamp_top(a,b) Min(a,b) #define clamp_top(a,b) Min(a,b)
#define clamp_bot(a,b) Max(a,b) #define clamp_bot(a,b) Max(a,b)
#define clamp_(a,x,b) ((a>x)?a:((b<x)?b:x)) #define clamp_(a,x,b) ((a>x)?a:((b<x)?b:x))

View File

@ -707,6 +707,7 @@ struct Layout_Item{
u32 codepoint; u32 codepoint;
Layout_Item_Flag flags; Layout_Item_Flag flags;
Rect_f32 rect; Rect_f32 rect;
f32 padded_y1;
}; };
api(custom) api(custom)

View File

@ -22,3 +22,10 @@ IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcv
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional
IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1)) IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional
IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))