diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2020-03-02 12:11:46 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2020-03-02 12:11:46 +0300 |
| commit | ab6cbf8f9d477284214dcf9370dbed9e99df4862 (patch) | |
| tree | c0a27272ef08369d895383d20d97a3b1ab5efeb7 /build | |
| parent | 45cd06e43469fddbd7ef04a06bf1616fb55ff697 (diff) | |
| parent | 47f6a9a80be72d14f20f3db82541495e36fc5a97 (diff) | |
.......... [ZBXNEXT-5716] updated to the latest master branch
Diffstat (limited to 'build')
| -rw-r--r-- | build/mingw/Makefile | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_agent | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_common.inc | 4 | ||||
| -rw-r--r-- | build/win32/project/Makefile_get | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_sender | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/build/mingw/Makefile b/build/mingw/Makefile index a64b6cfb045..2ca0ccdac69 100644 --- a/build/mingw/Makefile +++ b/build/mingw/Makefile @@ -27,7 +27,7 @@ OBJS = \ $(OUTPUTDIR)\sysinfo_system.o \ $(OUTPUTDIR)\eventlog.o -CFLAGS := $(CFLAGS) -O2 -g -DUNICODE -DHAVE_STDINT_H=1 -I$(TOPDIR)\include -I$(TOPDIR)\build\win32\include -I$(TOPDIR)\build\mingw +CFLAGS := $(CFLAGS) -O2 -g -DUNICODE -DHAVE_STDINT_H=1 -I$(TOPDIR)\build\win32\include -I$(TOPDIR)\build\mingw -I$(TOPDIR)\include GOPATH := $(GOPATH);$(TOPDIR)\go TAGS := diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index 0b62ad9ce0a..6d1df2f6726 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -105,7 +105,7 @@ OBJS = \ ..\..\..\src\libs\zbxwin32\fatal.o \ ..\..\..\src\libs\zbxwin32\disk.o -LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib delayimp.lib wevtapi.lib +LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib delayimp.lib wevtapi.lib $(LIBS) !INCLUDE Makefile_pcre.inc !INCLUDE Makefile_tls.inc diff --git a/build/win32/project/Makefile_common.inc b/build/win32/project/Makefile_common.inc index 1eafceb2b57..14280c44e8e 100644 --- a/build/win32/project/Makefile_common.inc +++ b/build/win32/project/Makefile_common.inc @@ -29,11 +29,11 @@ OPTS = /O2 COMMON_FLAGS = $(COMMON_FLAGS) /nologo $(OPTS) /GF /FD /EHsc /MT /Gy /W3 /c /D _WINDOWS /D _CONSOLE /D UNICODE \ /D _UNICODE /D HAVE_WINLDAP_H /D HAVE_ASSERT_H /D ZABBIX_SERVICE /D "_VC80_UPGRADE=0x0600" /D HAVE_IPV6 -CFLAGS = $(INCS) $(ADD_CFLAGS) $(COMMON_FLAGS) /TC +CFLAGS = $(CFLAGS) $(INCS) $(ADD_CFLAGS) $(COMMON_FLAGS) /TC CPPFLAGS = $(INCS) $(ADD_CFLAGS) $(COMMON_FLAGS) /TP LFLAGS = /NOLOGO $(ADD_LFLAGS) /INCREMENTAL:NO /MANIFEST /MANIFESTFILE:"$(TARGETNAME).$(TARGETEXT).manifest" \ /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DYNAMICBASE:NO /PDB:$(TARGETDIR)\$(TARGETNAME).pdb -RFLAGS = $(ADD_RFLAGS) /d _WINDOWS +RFLAGS = $(RFLAGS) $(ADD_RFLAGS) /d _WINDOWS diff --git a/build/win32/project/Makefile_get b/build/win32/project/Makefile_get index 1bd99ca9da4..ab910506fb8 100644 --- a/build/win32/project/Makefile_get +++ b/build/win32/project/Makefile_get @@ -45,7 +45,7 @@ OBJS = \ ..\..\..\src\zabbix_get\zabbix_get.o \ ..\..\..\src\libs\zbxwin32\fatal.o -LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib user32.lib +LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib user32.lib $(LIBS) !INCLUDE Makefile_pcre.inc !INCLUDE Makefile_tls.inc diff --git a/build/win32/project/Makefile_sender b/build/win32/project/Makefile_sender index 1d07cea9796..24e69797706 100644 --- a/build/win32/project/Makefile_sender +++ b/build/win32/project/Makefile_sender @@ -53,7 +53,7 @@ OBJS = \ ..\..\..\src\libs\zbxregexp\zbxregexp.o \ ..\..\..\src\zabbix_sender\zabbix_sender.o -LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib user32.lib +LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib user32.lib $(LIBS) !INCLUDE Makefile_pcre.inc !INCLUDE Makefile_tls.inc |