From 9bdd77969a8f9057f3b46994135d39adb3ef216f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 26 Nov 2014 10:46:17 +0000 Subject: [PATCH] [msvc] duplicate 1d6b8a75fa31d60e9ddbc0b9eddbf05ed3fb6c12 for eglib --- eglib/winconfig.h | 5 +++++ msvc/eglib.vcxproj | 18 +++++++++--------- msvc/winsetup.bat | 2 ++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/eglib/winconfig.h b/eglib/winconfig.h index fdab3ddae63ef..04e8d4075ce13 100755 --- a/eglib/winconfig.h +++ b/eglib/winconfig.h @@ -1,6 +1,10 @@ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +#ifndef _MSC_VER +#include "cygconfig.h" +#else + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -74,3 +78,4 @@ #define VERSION "0.1" #define HAVE_STRTOK_R 1 +#endif diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index 8086d41a54e30..3d1db4be7f3d6 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -129,7 +129,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat Disabled @@ -145,7 +145,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat Disabled @@ -161,7 +161,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat MinSpace @@ -175,7 +175,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat MinSpace @@ -189,7 +189,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat X64 @@ -208,7 +208,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat X64 @@ -227,7 +227,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat X64 @@ -244,7 +244,7 @@ - copy ..\eglib\winconfig.h ..\eglib\config.h + winsetup.bat X64 @@ -304,4 +304,4 @@ - \ No newline at end of file + diff --git a/msvc/winsetup.bat b/msvc/winsetup.bat index 6b1c6f8461ec4..f67a854569327 100755 --- a/msvc/winsetup.bat +++ b/msvc/winsetup.bat @@ -1,7 +1,9 @@ @echo off cd .. if exist config.h if not exist cygconfig.h copy config.h cygconfig.h +if exist eglib\config.h if not exist eglib\cygconfig.h copy eglib\config.h eglib\cygconfig.h copy winconfig.h config.h +copy eglib\winconfig.h eglib\config.h goto end :error echo fatal error: the VSDepenancies directory was not found in the "mono" directory