diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-06-14 14:39:52 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-06-14 14:39:52 +0300 |
| commit | d1f1f8a609d90b0525cbdf052bfeb5a7d2460089 (patch) | |
| tree | ea4832e20d1c02d0e51ff125f5a328df534e7651 /build | |
| parent | bc42a93c1b8513eeac73230af5284429387dac20 (diff) | |
| parent | a843b422dc405711a0694589bd605057dda7a547 (diff) | |
.......... [DEV-2113] updated to the latest master
Diffstat (limited to 'build')
| -rw-r--r-- | build/mingw/Makefile | 5 | ||||
| -rw-r--r-- | build/win32/project/Makefile_agent | 3 | ||||
| -rw-r--r-- | build/win32/project/Makefile_common.inc | 2 | ||||
| -rw-r--r-- | build/win32/project/Makefile_tls.inc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/build/mingw/Makefile b/build/mingw/Makefile index 7e0a4e7a8e7..0735f7e2972 100644 --- a/build/mingw/Makefile +++ b/build/mingw/Makefile @@ -130,6 +130,9 @@ $(OUTPUTDIR)\components_strings_representations.o: $(TOPDIR)\src\libs\zbxcommon\ $(OUTPUTDIR)\tls_version.o: $(TOPDIR)\src\libs\zbxcrypto\tls_version.c $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@ +$(OUTPUTDIR)\tls_version.o: $(TOPDIR)\src\libs\zbxcomms\tls_version.c + $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@ + $(OUTPUTDIR)\fatal.o: $(TOPDIR)\src\libs\zbxwin32\fatal.c $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@ @@ -151,7 +154,7 @@ $(OUTPUTDIR)\json_parser.o: $(TOPDIR)\src\libs\zbxjson\json_parser.c $(OUTPUTDIR)\jsonpath.o: $(TOPDIR)\src\libs\zbxjson\jsonpath.c $(CC) $(CFLAGS) -DUNICODE -DWITH_COMMON_METRICS -c $^ -o $@ -$(OUTPUTDIR)\sha256crypt.o: $(TOPDIR)\src\libs\zbxcrypto\sha256crypt.c +$(OUTPUTDIR)\sha256crypt.o: $(TOPDIR)\src\libs\zbxhash\sha256crypt.c $(CC) $(CFLAGS) -DUNICODE -DWITH_COMMON_METRICS -c $^ -o $@ $(OUTPUTDIR)\variant.o: $(TOPDIR)\src\libs\zbxvariant\variant.c diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index 4e7e1f14f55..95003f04014 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -54,7 +54,7 @@ OBJS = \ ..\..\..\src\libs\zbxcrypto\base64.o \ ..\..\..\src\libs\zbxgetopt\getopt.o \ ..\..\..\src\libs\zbxhash\md5.o \ - ..\..\..\src\libs\zbxcrypto\sha256crypt.o \ + ..\..\..\src\libs\zbxhash\sha256crypt.o \ ..\..\..\src\libs\zbxcrypto\crypto.o \ ..\..\..\src\libs\zbxjson\json.o \ ..\..\..\src\libs\zbxjson\json_parser.o \ @@ -88,6 +88,7 @@ OBJS = \ ..\..\..\src\libs\zbxsysinfo\win32\memory.o \ ..\..\..\src\libs\zbxsysinfo\win32\net.o \ ..\..\..\src\libs\zbxsysinfo\win32\pdhmon.o \ + ..\..\..\src\libs\zbxsysinfo\win32\registry.o \ ..\..\..\src\libs\zbxsysinfo\win32\proc.o \ ..\..\..\src\libs\zbxsysinfo\win32\services.o \ ..\..\..\src\libs\zbxsysinfo\win32\swap.o \ diff --git a/build/win32/project/Makefile_common.inc b/build/win32/project/Makefile_common.inc index 944baa9420a..f4288b2e778 100644 --- a/build/win32/project/Makefile_common.inc +++ b/build/win32/project/Makefile_common.inc @@ -13,7 +13,7 @@ RESOURCE_RES = $(PROJECTNAME).res INCS = /I $(PROJECTDIR) /I .\ /I ..\include /I ..\include\common /I ..\..\..\include /I ..\..\..\include\common !IF "$(CPU)" == "i386" || "$(CPU)" == "x86" -COMMON_FLAGS = /D _WIN32_WINNT=0x0501 +COMMON_FLAGS = /D _WIN32_WINNT=0x0502 ADD_LFLAGS = $(ADD_LFLAGS) /SUBSYSTEM:"CONSOLE,5.01" !ELSEIF "$(CPU)" == "AMD64" COMMON_FLAGS = /D _WIN32_WINNT=0x0502 diff --git a/build/win32/project/Makefile_tls.inc b/build/win32/project/Makefile_tls.inc index 5bdb9f950d8..6ca26400abe 100644 --- a/build/win32/project/Makefile_tls.inc +++ b/build/win32/project/Makefile_tls.inc @@ -71,6 +71,6 @@ LIBS = $(LIBS) "$(TLSLIB)" ! ENDIF INCS = $(INCS) /I "$(TLSINCDIR)" -OBJS = $(OBJS) ..\..\..\src\libs\zbxcrypto\tls.o ..\..\..\src\libs\zbxcrypto\tls_version.o +OBJS = $(OBJS) ..\..\..\src\libs\zbxcomms\tls.o ..\..\..\src\libs\zbxcomms\tls_version.o !ENDIF |