SQLite

Check-in [3e35584621]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Attempt to detect when the MSVC linker requires the /MACHINE argument.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | msvcTcl
Files: files | file ages | folders
SHA3-256: 3e355846217785c30f518d31a5541172c4213c0d8559c3f8638a047cd745c98e
User & Date: mistachkin 2019-03-22 16:52:17.298
Context
2019-03-22
22:34
Further enhancements and fixes. (check-in: c9f1972e10 user: mistachkin tags: msvcTcl)
16:52
Attempt to detect when the MSVC linker requires the /MACHINE argument. (check-in: 3e35584621 user: mistachkin tags: msvcTcl)
01:26
Sync up the autoconf makefile for MSVC. (check-in: ecbae90aef user: mistachkin tags: msvcTcl)
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.msc.
1084
1085
1086
1087
1088
1089
1090









1091
1092
1093

1094
1095
1096
1097
1098
1099
1100
# If a platform was set, force the linker to target that.
# Note that the vcvars*.bat family of batch files typically
# set this for you.  Otherwise, the linker will attempt
# to deduce the binary type based on the object files.
!IFDEF PLATFORM
LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)









!ELSE
LTLINKOPTS = /NOLOGO
LTLIBOPTS = /NOLOGO

!ENDIF

# When compiling for use in the WinRT environment, the following
# linker option must be used to mark the executable as runnable
# only in the context of an application container.
#
!IF $(FOR_WINRT)!=0







>
>
>
>
>
>
>
>
>



>







1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
# If a platform was set, force the linker to target that.
# Note that the vcvars*.bat family of batch files typically
# set this for you.  Otherwise, the linker will attempt
# to deduce the binary type based on the object files.
!IFDEF PLATFORM
LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)
!ELSE
!IFDEF VISUALSTUDIOVERSION
!IF "$(VISUALSTUDIOVERSION)">="12.0"
LTLINKOPTS = /NOLOGO /MACHINE:x86
LTLIBOPTS = /NOLOGO /MACHINE:x86
!ELSE
LTLINKOPTS = /NOLOGO
LTLIBOPTS = /NOLOGO
!ENDIF
!ELSE
LTLINKOPTS = /NOLOGO
LTLIBOPTS = /NOLOGO
!ENDIF
!ENDIF

# When compiling for use in the WinRT environment, the following
# linker option must be used to mark the executable as runnable
# only in the context of an application container.
#
!IF $(FOR_WINRT)!=0