mirror of
https://github.com/mon/ifs_layeredfs.git
synced 2026-09-09 09:15:39 -05:00
Use the right project-level macros to nuke winapi min/max
This commit is contained in:
@@ -9,7 +9,12 @@ project('layeredfs', 'c', 'cpp', version: '4.1',
|
||||
)
|
||||
|
||||
add_project_link_arguments('-static', language: 'cpp')
|
||||
add_project_arguments('-DVER_STRING="' + meson.project_version() + '"', language: 'cpp')
|
||||
add_project_arguments(
|
||||
'-DVER_STRING="' + meson.project_version() + '"',
|
||||
'-DNOMINMAX',
|
||||
'-DWIN32_LEAN_AND_MEAN',
|
||||
language: 'cpp',
|
||||
)
|
||||
|
||||
# note: not using fmt from the wrapdb because it needs pkgconfig which doesn't
|
||||
# work for cross builds
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include <optional>
|
||||
#define NOMINMAX
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
@@ -23,10 +23,6 @@
|
||||
#include "avs.h"
|
||||
#include "modpath_handler.h"
|
||||
|
||||
// let me use the std:: version, damnit
|
||||
#undef max
|
||||
#undef min
|
||||
|
||||
#ifdef _DEBUG
|
||||
#define DBG_VER_STRING "_DEBUG"
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user