/ Check-in [8ade136a]
Login

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

Overview
Comment:Enable the use of a simpler command line when cross-compiling in the MSVC build environment.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8ade136a038ee71d741af4a9f9e692fdff4e7911
User & Date: mistachkin 2012-08-28 01:44:13
Context
2012-08-28
04:20
Issue a log message if the temporary directory has not been set when running on WinRT. check-in: 9ee39102 user: mistachkin tags: trunk
01:44
Enable the use of a simpler command line when cross-compiling in the MSVC build environment. check-in: 8ade136a user: mistachkin tags: trunk
00:17
Formatting changes to the C code example in the documentation for sqlite3_temp_directory(). No changes to code. check-in: 5b4b3978 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    14     14   # Set this non-0 to use the International Components for Unicode (ICU).
    15     15   #
    16     16   USE_ICU = 0
    17     17   
    18     18   # Set this non-0 to dynamically link to the MSVC runtime library.
    19     19   #
    20     20   USE_CRT_DLL = 0
           21  +
           22  +# Set this non-0 to attempt setting the native compiler automatically
           23  +# for cross-compiling the command line tools needed during the compilation
           24  +# process.
           25  +#
           26  +XCOMPILE = 0
    21     27   
    22     28   # Set this non-0 to use the native libraries paths for cross-compiling
    23     29   # the command line tools needed during the compilation process.
    24     30   #
    25     31   USE_NATIVE_LIBPATHS = 0
    26     32   
    27     33   # Set this non-0 to compile binaries suitable for the WinRT environment.
................................................................................
    79     85   # Check for the command macro NCC.  This should point to the compiler binary
    80     86   # for the platform the compilation process is taking place on.  If it is not
    81     87   # defined, simply define it to have the same value as the CC macro.  When
    82     88   # cross-compiling, it is suggested that this macro be modified via the command
    83     89   # line (since nmake itself does not provide a built-in method to guess it).
    84     90   # For example, to use the x86 compiler when cross-compiling for x64, a command
    85     91   # line similar to the following could be used (all on one line):
           92  +#
           93  +#     nmake /f Makefile.msc sqlite3.dll
           94  +#           XCOMPILE=1 USE_NATIVE_LIBPATHS=1
           95  +#
           96  +# Alternatively, the full path and file name to the compiler binary for the
           97  +# platform the compilation process is taking place may be specified (all on
           98  +# one line):
    86     99   #
    87    100   #     nmake /f Makefile.msc sqlite3.dll
    88    101   #           "NCC=""%VCINSTALLDIR%\bin\cl.exe"""
    89    102   #           USE_NATIVE_LIBPATHS=1
    90    103   #
    91    104   !IFDEF NCC
    92    105   NCC = $(NCC:\\=\)
          106  +!ELSEIF $(XCOMPILE)!=0
          107  +NCC = "$(VCINSTALLDIR)\bin\cl.exe"
          108  +NCC = $(NCC:\\=\)
    93    109   !ELSE
    94    110   NCC = $(CC)
    95    111   !ENDIF
    96    112   
    97    113   # Check for the MSVC runtime library path macro.  Othertise, this
    98    114   # value will default to the 'lib' directory underneath the MSVC
    99    115   # installation directory.