From 64ed937dd4c49106f58a7a29338871d22f48133f Mon Sep 17 00:00:00 2001 From: Helge Brands Date: Tue, 9 Jul 2024 17:41:35 +0200 Subject: [PATCH] changes for windows in Makefile and require.c --- Makefile | 3 +-- require.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2f85c3b..176236c 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,7 @@ USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include # Pass T_A to the code USR_CFLAGS += -DT_A='"${T_A}"' -# This should really go into some global WIN32 config file -USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501 +USR_CFLAGS += -DEPICSVERSION='"${EPICSVERSION}"' include $(TOP)/configure/RULES diff --git a/require.c b/require.c index c27baaa..153bd08 100644 --- a/require.c +++ b/require.c @@ -262,6 +262,7 @@ int requireDebug; #define END_DIR_LOOP while(FindNextFile(dir,&direntry)); FindClose(dir); #define SKIP_NON_DIR(e) if (!(e.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || (e.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) continue; #define FILENAME(e) e.cFileName + #pragma comment(lib, "kernel32.lib") #else #include