diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-10 22:27:34 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-10 22:27:34 +0300 |
| commit | 7d5bc4b46ff6f7c5cf788f02ff3bf178d7d22424 (patch) | |
| tree | 35c46957de6916268b3933c27151350bb50841c2 /build | |
| parent | fac0cd94cfcc1a44b1433790699909b61f46a212 (diff) | |
| parent | f13a3f887da6168e89d5388f331ef041b26f97c5 (diff) | |
.......... [DEV-2127] updated to the latest master
Diffstat (limited to 'build')
| -rw-r--r-- | build/mingw/Makefile | 4 | ||||
| -rw-r--r-- | build/win32/include/common/config.h (renamed from build/win32/include/config.h) | 0 | ||||
| -rw-r--r-- | build/win32/project/Makefile_common.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/mingw/Makefile b/build/mingw/Makefile index 5e40f4b6be4..5fed71d63cd 100644 --- a/build/mingw/Makefile +++ b/build/mingw/Makefile @@ -43,7 +43,7 @@ OBJS = \ $(TARGETDIR)\resource.syso CFLAGS := $(CFLAGS) -O2 -g -DHAVE_STDINT_H=1 -DZBX_BUILD_AGENT2=1 -DHAVE_THREAD_LOCAL=1 \ - -I$(TOPDIR)\build\win32\include -I$(TOPDIR)\build\mingw -I$(TOPDIR)\include + -I$(TOPDIR)\build\win32\include\common -I$(TOPDIR)\build\mingw -I$(TOPDIR)\include -I$(TOPDIR)\include\common RFLAGS := $(RFLAGS) --input-format=rc -O coff GOPATH := $(GOPATH);$(TOPDIR)\go @@ -206,4 +206,4 @@ $(TARGETBIN): $(OBJS) .FORCE clean: go clean -cache - del $(TOPDIR)\include\config.h "$(TARGETBIN)" $(OUTPUTDIR)\*.o $(TARGETDIR)\*.syso 2>NUL + del $(TOPDIR)\include\common\config.h "$(TARGETBIN)" $(OUTPUTDIR)\*.o $(TARGETDIR)\*.syso 2>NUL diff --git a/build/win32/include/config.h b/build/win32/include/common/config.h index 8eee7dfea1d..8eee7dfea1d 100644 --- a/build/win32/include/config.h +++ b/build/win32/include/common/config.h diff --git a/build/win32/project/Makefile_common.inc b/build/win32/project/Makefile_common.inc index 14280c44e8e..944baa9420a 100644 --- a/build/win32/project/Makefile_common.inc +++ b/build/win32/project/Makefile_common.inc @@ -10,7 +10,7 @@ RESOURCE_RC = resource.rc DESC_H = $(PROJECTNAME)_desc.h RESOURCE_RES = $(PROJECTNAME).res -INCS = /I $(PROJECTDIR) /I .\ /I ..\include /I ..\..\..\include +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 |