diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 13:50:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 13:50:29 +0000 |
| commit | a8c6a52a1ac9240c15a38f9b9a50b01096e09b41 (patch) | |
| tree | 4f98a7f6fb4f72ebc4c5a66b037d99db503738f1 /win32/setup.mak | |
| parent | 8ead78806cd0f3b3e76c953c1f11181b9332db62 (diff) | |
| download | ruby-a8c6a52a1ac9240c15a38f9b9a50b01096e09b41.tar.gz | |
win32/setup.mak: check psapi.h
* win32/setup.mak (check-psapi.h): check if psapi.h is available.
* win32/win32.c (CHECK_CONSOLE_EMULATOR): enable console emulator DLL
check only when psapi.h is available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index 515271b85e..aa1a754cdd 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -70,11 +70,11 @@ USE_RUBYGEMS = $(USE_RUBYGEMS) @echo !endif>> $(MAKEFILE) !endif --system-vars-: -osname- -runtime- +-system-vars-: -osname- -runtime- -headers- --system-vars32-: -osname32- -runtime- +-system-vars32-: -osname32- -runtime- -headers- --system-vars64-: -osname64- -runtime- +-system-vars64-: -osname64- -runtime- -headers- -osname32-: nul @echo TARGET_OS = mswin32>>$(MAKEFILE) @@ -100,6 +100,15 @@ int main(void) {FILE *volatile f = stdin; return 0;} @$(WIN32DIR:/=\)\rtname conftest.exe >>$(MAKEFILE) @$(WIN32DIR:/=\)\rm.bat conftest.* +-headers-: check-psapi.h + +check-psapi.h: nul + ($(CC) -MD <<conftest.c psapi.lib -link && echo>>$(MAKEFILE) HAVE_PSAPI_H=1) & $(WIN32DIR:/=\)\rm.bat conftest.* +#include <windows.h> +#include <psapi.h> +int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);} +<< + -version-: nul @$(APPEND) @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE) |