Changeset 468 for trunk


Ignore:
Timestamp:
Jan 18, 2011, 7:06:48 PM (11 years ago)
Author:
dmik
Message:

Added setup variables for the CURL library which is required by poppler.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r445 r468  
    5656TEMPLATE_LucideC_CFLAGS          =
    5757TEMPLATE_LucideC_DEFS            = OS2
     58TEMPLATE_LucideC_INCS            = $(PATH_LIB_CURL_INCS)
     59TEMPLATE_LucideC_LIBPATH         = $(PATH_LIB_CURL_LIBPATH)
    5860
    5961#
     
    6466TEMPLATE_LucideCxx_CXXFLAGS      =
    6567TEMPLATE_LucideCxx_DEFS          = OS2
     68TEMPLATE_LucideCxx_INCS          = $(PATH_LIB_CURL_INCS)
     69TEMPLATE_LucideCxx_LIBPATH       = $(PATH_LIB_CURL_LIBPATH)
    6670
    6771#
  • trunk/LocalEnv.cmd.tpl

    r367 r468  
    2020
    2121/**
    22  * Path to GCC 4.4.2.
     22 * Path to the GCC 4.x.x environment script. Leave it empty if you already have
     23 * GCC 4.x.x in path.
    2324 */
    24 G.PATH_TOOL_GCC442      = 'D:\Dev\gcc442'
     25G.PATH_TOOL_GCC4_ENV    = ''
    2526
    2627/**
     
    2930G.PATH_SDK_SOM          = ''
    3031
     32/**
     33 * Paths to the CURL library (headers and libraries, respectively). Leave it
     34 * empty if you have them in paths.
     35 */
     36G.PATH_LIB_CURL_INCS    = ''
     37G.PATH_LIB_CURL_LIBPATH = ''
  • trunk/README.DEV

    r461 r468  
    1313  - GCC compiler version 3.3.5 or 4.4.2 for OS/2 and the patched OpenWatcom
    1414    linker. The GCC compiler must be set up to use the OpenWatcom linker for
    15     linking.
     15    linking. Note that GCC 4.4.4 is known to have problems with the _System
     16    modifier and is not suitable for building Lucide SOM DLLs for this reason.
    1617
    1718    If you do not have a working GCC environment with the above requirements, it
     
    2829    (with all its contents) out of the Toolkit and place it to some directory.
    2930    You don't need to put any statements in CONFIG.SYS in this case.
     31   
     32  - A recent version of the CURL library (headers and .a/.lib files).
    3033
    3134  - RC.EXE version 4 or 5 which should be located in a directory listed in PATH.
  • trunk/env.cmd

    r403 r468  
    4646
    4747/* setup GCC */
    48 if (G.PATH_TOOL_GCC442 \== '') then do
    49 cmdline = 'call' G.PATH_TOOL_GCC442'\gcc442.cmd @'
     48if (G.PATH_TOOL_GCC4_ENV \== '') then do
     49cmdline = 'call' G.PATH_TOOL_GCC4_ENV
    5050cmdline
    5151drop cmdline
     
    5959
    6060call EnvSet 'PATH_SDK_SOM', translate(G.PATH_SDK_SOM, '/', '\')
     61call EnvSet 'PATH_LIB_CURL_INCS', translate(G.PATH_LIB_CURL_INCS, '/', '\')
     62call EnvSet 'PATH_LIB_CURL_LIBPATH', translate(G.PATH_LIB_CURL_LIBPATH, '/', '\')
    6163
    6264/* setup OpenWatcom (not necessary any more) */
Note: See TracChangeset for help on using the changeset viewer.