diff options
author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-03-22 12:15:09 +0300 |
---|---|---|
committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-03-22 12:15:09 +0300 |
commit | 29c50053a313d51d02c5e0618568e596c314fa64 (patch) | |
tree | 481821a8925f91c98cf8e5dc332afbf11615d48f /build | |
parent | 14e5844f8a474c9252f0a27d1f79f712f0c31eaa (diff) | |
parent | 8f5e6eddd75ad9518d708739b4ca68b7b40d9dad (diff) |
.......... [DEV-2113] updated to the latest master
Diffstat (limited to 'build')
-rw-r--r-- | build/win32/project/Makefile_agent | 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 | ||||
-rw-r--r-- | build/win32/project/Makefile_targets.inc | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index f7657af1348..1116027b029 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -43,7 +43,6 @@ OBJS = \ ..\..\..\src\libs\zbxcommon\misc.o \ ..\..\..\src\libs\zbxcommon\variant.o \ ..\..\..\src\libs\zbxcommon\str.o \ - ..\..\..\src\libs\zbxcommon\xml.o \ ..\..\..\src\libs\zbxcommon\zbxgetopt.o \ ..\..\..\src\libs\zbxcommon\file.o \ ..\..\..\src\libs\zbxcommon\time.o \ @@ -111,6 +110,7 @@ OBJS = \ ..\..\..\src\zabbix_agent\zabbix_agentd.o \ ..\..\..\src\zabbix_agent\zbxconf.o \ ..\..\..\src\libs\zbxregexp\zbxregexp.o \ + ..\..\..\src\libs\zbxxml\xml.o \ ..\..\..\src\libs\zbxwin32\fatal.o \ ..\..\..\src\libs\zbxwin32\disk.o diff --git a/build/win32/project/Makefile_get b/build/win32/project/Makefile_get index 70ad88e5b42..4f74589e1b1 100644 --- a/build/win32/project/Makefile_get +++ b/build/win32/project/Makefile_get @@ -35,7 +35,6 @@ OBJS = \ ..\..\..\src\libs\zbxcommon\variant.o \ ..\..\..\src\libs\zbxcommon\str.o \ ..\..\..\src\libs\zbxcommon\time.o \ - ..\..\..\src\libs\zbxcommon\xml.o \ ..\..\..\src\libs\zbxcommon\zbxgetopt.o \ ..\..\..\src\libs\zbxcommshigh\comms.o \ ..\..\..\src\libs\zbxcomms\comms.o \ @@ -54,6 +53,7 @@ OBJS = \ ..\..\..\src\libs\zbxsys\threads.o \ ..\..\..\src\zabbix_get\zabbix_get.o \ ..\..\..\src\libs\zbxregexp\zbxregexp.o \ + ..\..\..\src\libs\zbxxml\xml.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) diff --git a/build/win32/project/Makefile_sender b/build/win32/project/Makefile_sender index 8d8048745a3..561dd6da918 100644 --- a/build/win32/project/Makefile_sender +++ b/build/win32/project/Makefile_sender @@ -34,7 +34,6 @@ OBJS = \ ..\..\..\src\libs\zbxcommon\variant.o \ ..\..\..\src\libs\zbxcommon\str.o \ ..\..\..\src\libs\zbxcommon\time.o \ - ..\..\..\src\libs\zbxcommon\xml.o \ ..\..\..\src\libs\zbxcommon\zbxgetopt.o \ ..\..\..\src\libs\zbxcommshigh\comms.o \ ..\..\..\src\libs\zbxcomms\comms.o \ @@ -55,6 +54,7 @@ OBJS = \ ..\..\..\src\libs\zbxalgo\algodefs.o \ ..\..\..\src\libs\zbxalgo\vector.o \ ..\..\..\src\libs\zbxregexp\zbxregexp.o \ + ..\..\..\src\libs\zbxxml\xml.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) diff --git a/build/win32/project/Makefile_sender_dll b/build/win32/project/Makefile_sender_dll index 34c8368481e..24697d0edb8 100644 --- a/build/win32/project/Makefile_sender_dll +++ b/build/win32/project/Makefile_sender_dll @@ -40,7 +40,6 @@ OBJS = \ ..\..\..\src\libs\zbxcommon\variant.o \ ..\..\..\src\libs\zbxcommon\str.o \ ..\..\..\src\libs\zbxcommon\time.o \ - ..\..\..\src\libs\zbxcommon\xml.o \ ..\..\..\src\libs\zbxcommon\zbxgetopt.o \ ..\..\..\src\libs\zbxcommshigh\comms.o \ ..\..\..\src\libs\zbxcomms\comms.o \ @@ -60,6 +59,7 @@ OBJS = \ ..\..\..\src\libs\zbxalgo\algodefs.o \ ..\..\..\src\libs\zbxalgo\vector.o \ ..\..\..\src\libs\zbxregexp\zbxregexp.o \ + ..\..\..\src\libs\zbxxml\xml.o \ ..\..\..\src\zabbix_sender\win32\zabbix_sender.o LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib Iphlpapi.lib diff --git a/build/win32/project/Makefile_targets.inc b/build/win32/project/Makefile_targets.inc index dc1126720cb..77e72fd860a 100644 --- a/build/win32/project/Makefile_targets.inc +++ b/build/win32/project/Makefile_targets.inc @@ -46,6 +46,9 @@ $(RESOURCE_RES): $(RESOURCE_RC) $(RESOURCE_H) $(DESC_H) {..\..\..\src\libs\zbxlog}.c{..\..\..\src\libs\zbxlog}.o: $(CC) $? /Fo"$@" $(CFLAGS) +{..\..\..\src\libs\zbxxml}.c{..\..\..\src\libs\zbxxml}.o: + $(CC) $? /Fo"$@" $(CFLAGS) + {..\..\..\src\libs\zbxregexp}.c{..\..\..\src\libs\zbxregexp}.o: $(CC) $? /Fo"$@" $(CFLAGS) |