Skip to content

Commit 0023180

Browse files
committed
#5 - 2019+
1 parent 51ef8e8 commit 0023180

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

libw32/msvc_2019/utime.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#ifndef LIBW32_MSVC_UTIME_H_INCLUDED
2+
#define LIBW32_MSVC_UTIME_H_INCLUDED
3+
#include <edidentifier.h>
4+
__CIDENT_RCSID(gr_libw32_msvc_utime_h,"$Id: utime.h,v 1.1 2025/02/02 14:15:31 cvsuser Exp $")
5+
__CPRAGMA_ONCE
6+
7+
/* -*- mode: c; indent-width: 4; -*- */
8+
9+
#if (_MSC_VER >= 1800)
10+
#include <sys/utime.h>
11+
#endif
12+
13+
#endif /*LIBW32_MSVC_UTIME_H_INCLUDED*/

makelib.in

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/perl
2-
# $Id: makelib.in,v 1.14 2025/02/02 08:47:32 cvsuser Exp $
2+
# $Id: makelib.in,v 1.15 2025/02/02 14:25:35 cvsuser Exp $
33
# -*- mode: perl; tabs: 8; indent-width: 4; -*-
44
# makelib configuration
55
#
@@ -146,7 +146,8 @@ Configure()
146146
################################################################################
147147
# Visual studio
148148

149-
if ($TOOLCHAIN =~ /^vs/) {
149+
if ($TOOLCHAIN =~ /^vs(\d+)/) {
150+
my $version = int($1); # vs140 etc
150151

151152
set_msvc_runtime('dynamic', '$(RTSUFFIX)');
152153

@@ -161,7 +162,11 @@ Configure()
161162
add_define('LIBW32_STATIC'); # libw32 bindings
162163

163164
add_xinclude('$(ROOT)/libw32'); # Extra includes; C and compiler tests.
164-
add_xinclude('$(ROOT)/libw32/msvc'); # MSVC specials
165+
if ($version >= 160) { # MSVC specials
166+
add_xinclude('$(ROOT)/libw32/msvc_2019'); # 2019+
167+
} else {
168+
add_xinclude('$(ROOT)/libw32/msvc'); # legacy
169+
}
165170
# add_application_library('libw32.lib');
166171
add_application_library('libw32_static.lib');
167172
}

0 commit comments

Comments
 (0)