This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new fb5c82ecc Add missing CFLAGS and RCFLAGS
fb5c82ecc is described below
commit fb5c82ecc061e2b8c7bedea506812793599c5413
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Tue Aug 8 12:04:53 2023 +0200
Add missing CFLAGS and RCFLAGS
---
native/NMAKEmakefile.inc | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 0b380b4ef..2c641a5cc 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -115,9 +115,13 @@ CPU=X86
CPU=$(PROCESSOR_ARCHITEW6432)
!ENDIF
!ELSE
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+CPU=X64
+!ELSE
CPU=$(PROCESSOR_ARCHITECTURE)
!ENDIF
!ENDIF
+!ENDIF
!IF "$(CPU)" != "X86"
!IF "$(CPU)" != "X64"
@@ -148,21 +152,17 @@ WINVER=WIN7
!IF "$(WINVER)" == "WIN7"
NMAKE_WINVER = 0x0601
-_WIN32_IE = 0x0800
!ELSEIF "$(WINVER)" == "WIN8"
NMAKE_WINVER = 0x0602
-_WIN32_IE = 0x0A00
!ELSEIF "$(WINVER)" == "WIN81"
NMAKE_WINVER = 0x0603
-_WIN32_IE = 0x0A00
!ELSEIF "$(WINVER)" == "WIN10"
NMAKE_WINVER = 0x0A00
-_WIN32_IE = 0x0A00
!ELSE
!ERROR Must specify WINVER environment variable (WIN7, WIN8, WIN81, WIN10)
!ENDIF
-NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) -DPSAPI_VERSION=1
+NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-DWINVER=$(NMAKE_WINVER)
!IF !DEFINED(BUILD) || "$(BUILD)" == ""
BUILD=RELEASE
@@ -196,6 +196,7 @@ CMN_CFLAGS = $(CMN_CFLAGS) -D_MBCS -DMBCS
!ELSE
CMN_CFLAGS = $(CMN_CFLAGS) -D_UNICODE -DUNICODE
!ENDIF
+CMN_CFLAGS = $(CMN_CFLAGS) -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE
!IF "$(CPU)" == "X86"
CPU_CFLAGS = -D_X86_=1
@@ -244,7 +245,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
!ENDIF
# Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib shell32.lib rpcrt4.lib
# Extra libs from command line or env
!IF DEFINED(EXTRA_LIBS)
LIBS = $(LIBS) $(EXTRA_LIBS)
@@ -258,20 +259,20 @@ CFLAGS = $(CFLAGS) -RTC1
!ENDIF
!ENDIF
-COMMON_LFLAGS = /NOLOGO
+COMMON_LFLAGS = /NOLOGO /MACHINE:$(MACHINE)
# Always add debugging to the linker
OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
!IF "$(BUILD)" == "RELEASE"
-OPT_LFLAGS = /OPT:REF
+OPT_LFLAGS = /OPT:REF $(OPT_LFLAGS)
!ENDIF
!IF "$(TARGET)" == "EXE"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE
!ELSEIF "$(TARGET)" == "GUI"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS
!ELSEIF "$(TARGET)" == "DLL"
-LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS
!ELSEIF "$(TARGET)" == "LIB"
LFLAGS = -lib $(COMMON_LFLAGS)
!ENDIF
@@ -286,13 +287,13 @@ LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
# Resource compiler flags
-RCFLAGS=/l 0x409
+RCFLAGS=/l 0x409 /n
!IF "$(BUILD)" == "RELEASE"
-RCFLAGS = $(RCFLAGS) /d "NDEBUG"
+RCFLAGS = $(RCFLAGS) /d NDEBUG
!ELSE
-RCFLAGS = $(RCFLAGS) /d "_DEBUG" /d "DEBUG"
+RCFLAGS = $(RCFLAGS) /d _DEBUG /d DEBUG
!ENDIF
-RCFLAGS = $(RCFLAGS)
+RCFLAGS = $(RCFLAGS) /d WIN32 /d WINNT /d WINVER=$(NMAKE_WINVER) /d
_WIN32_WINNT=$(NMAKE_WINVER)
!IF DEFINED(EXTRA_RCFLAGS)
RCFLAGS = $(RCFLAGS) $(EXTRA_RCFLAGS)
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
