diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-07-09 14:15:10 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-07-09 14:22:16 +0300 |
| commit | fe165d2c245ed501458deb21e8cf27d7a990f25a (patch) | |
| tree | d83b7a756c78ebcd90167c0d2cea834d60b850de /build | |
| parent | c32e043a9b1def6e0c77bf4c692f16f8106a975c (diff) | |
....I..... [ZBX-16277] fixed compilation Zabbix agent for Windows with options available for Windows Vista and newer
* commit '7b65462d9af0870eafcf7747947603735c022e55':
....I..... [ZBX-16277] edit ChangeLog entry
....I..... [ZBX-16277] added ChangeLog entry
....I..... [ZBX-16277] renamed all internal windows structures associated with GetFileInformationByHandleEx()
....I..... [ZBX-16277] added CPU=x86 support to Makefiles for compiling the windows agent
(cherry picked from commit aa59d7f7a075654775e8c902a7712fbd8fec7c3d)
(cherry picked from commit b05443d0ed6f1394a338b7771c6812e3c9985b33)
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/project/Makefile_agent | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_common.inc | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_get | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_sender | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_sender_dll | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index 495661eb9b4..88f3f3f0f32 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -3,7 +3,7 @@ CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF -!IF "$(CPU)" == "i386" +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" TARGETDIR = ..\..\..\bin\win32 ADD_LFLAGS = /MACHINE:X86 diff --git a/build/win32/project/Makefile_common.inc b/build/win32/project/Makefile_common.inc index 708e0e0af04..ecd276a5a7c 100644 --- a/build/win32/project/Makefile_common.inc +++ b/build/win32/project/Makefile_common.inc @@ -12,7 +12,7 @@ RESOURCE_RES = $(PROJECTNAME).res INCS = /I $(PROJECTDIR) /I .\ /I ..\include /I ..\..\..\include -!IF "$(CPU)" == "i386" +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" COMMON_FLAGS = /D _WIN32_WINNT=0x0501 ADD_LFLAGS = $(ADD_LFLAGS) /SUBSYSTEM:"CONSOLE,5.01" !ELSEIF "$(CPU)" == "AMD64" diff --git a/build/win32/project/Makefile_get b/build/win32/project/Makefile_get index b161d06fe7a..1bd99ca9da4 100644 --- a/build/win32/project/Makefile_get +++ b/build/win32/project/Makefile_get @@ -3,7 +3,7 @@ CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF -!IF "$(CPU)" == "i386" +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" TARGETDIR = ..\..\..\bin\win32 ADD_LFLAGS = /MACHINE:X86 diff --git a/build/win32/project/Makefile_sender b/build/win32/project/Makefile_sender index 14af7166f58..acf754df55b 100644 --- a/build/win32/project/Makefile_sender +++ b/build/win32/project/Makefile_sender @@ -3,7 +3,7 @@ CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF -!IF "$(CPU)" == "i386" +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" TARGETDIR = ..\..\..\bin\win32 ADD_LFLAGS = /MACHINE:X86 diff --git a/build/win32/project/Makefile_sender_dll b/build/win32/project/Makefile_sender_dll index 69769ad20fe..271ffc7a7f6 100644 --- a/build/win32/project/Makefile_sender_dll +++ b/build/win32/project/Makefile_sender_dll @@ -3,7 +3,7 @@ CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF -!IF "$(CPU)" == "i386" +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" TARGETDIR = ..\..\..\bin\win32\dev ADD_LFLAGS = /MACHINE:X86 |