Changeset 314


Ignore:
Timestamp:
Mar 24, 2010, 11:21:27 PM (11 years ago)
Author:
dmik
Message:

branches/kmk: Updated build instructions and env.cmd to work with standalone SOM SDK.

Location:
branches/kmk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/kmk/Config.kmk

    r313 r314  
    5151#
    5252
    53 TOOL_GXX3OMF_RC                                 ?= rc$(HOST_SUFF_EXE)
     53TOOL_GXX3OMF_RC                                 ?= rc$(HOSTSUFF_EXE)
    5454TOOL_GXX3OMF_RCOBJSUFF                  ?= .res
    5555
     
    138138#------------------------------------------------------------------------------
    139139
    140 # Paths: SOM SDK
    141 PATH_SDK_SOM                            ?= D:/Dev/OS2TK45/som
     140# Paths: SOM SDK (defaults to the one from the OS/2 Toolkit installation)
     141PATH_SDK_SOM                            ?= $(subst \,/,$(SOMBASE))
    142142ifeq ($(PATH_SDK_SOM),)
    143143$(error PATH_SDK_SOM is not set!)
     
    148148# Paths: SOM Tool
    149149PATH_TOOL_SOM_BIN                       ?= $(PATH_SDK_SOM)/bin
     150PATH_TOOL_SOM_DLL                       ?= $(PATH_SDK_SOM)/lib
     151PATH_TOOL_SOM_MSG                       ?= $(PATH_SDK_SOM)/msg
     152PATH_TOOL_SOM_INC                       ?= $(PATH_SDK_SOM)/include
    150153
    151154#
     
    167170#
    168171TOOL_SOM                                        := System Object Model Tooklit
    169 TOOL_SOM_IDL                            ?= $(PATH_TOOL_SOM_BIN)/sc$(HOST_SUFF_EXE)
     172TOOL_SOM_IDL                            ?= $(PATH_TOOL_SOM_BIN)/sc$(HOSTSUFF_EXE)
    170173TOOL_SOM_IDLFLAGS           ?=
    171174TOOL_SOM_IDL_OUTPUT                      = $(addprefix $(outbase).,$(wordlist 2,1000,$(TOOL_SOM_IDL_EMITTERS)))
     
    190193#
    191194define TOOL_SOM_IDL_CMDS
    192         $(QUIET)$(TOOL_SOM_IDL) $(flags) \
     195        $(QUIET)$(REDIRECT) \
     196        -E 'PATH=$(PATH_TOOL_SOM_BIN);$(PATH)' \
     197        -E 'BEGINLIBPATH=$(PATH_TOOL_SOM_DLL);$(BEGINLIBPATH)' \
     198        -E 'DPATH=$(PATH_TOOL_SOM_MSG);$(DPATH)' \
     199        -E 'SMINCLUDE=$(PATH_TOOL_SOM_INC);$(INCLUDE)' \
     200        -E 'INCLUDE=' \
     201        -E 'LIB=' \
     202        -- \
     203        $(TOOL_SOM_IDL) $(flags) \
    193204        $(addprefix -I, $(incs)) \
    194205        $(addprefix -D, $(defs)) \
  • branches/kmk/README.DEV

    r295 r314  
    99  - kBuild version 0.1.5 (r2206) or later. Get it with the following command:
    1010
    11       svn co http://svn.netlabs.org/repos/kbuild/trunk/kBuild
     11      svn co http://svn.netlabs.org/repos/kbuild/trunk/kBuild -r 2206
    1212
    1313  - GCC compiler version 3.3.5 or 4.4.2 for OS/2 and the patched OpenWatcom
     
    2222    Follow the installation instructions contained in the README file inside
    2323    this ZIP archive to set up the GCC environment.
     24
     25  - SOM SDK 2.x. The one that is part of the OS/2 Tooklit version 4.5 is known
     26    to work and recommended. Note that installing the Toolkit is not required
     27    (though it will also work) -- you may simply extract the "som" subdirectory
     28    (with all its contents) out of the Toolkit and place it to some directory.
     29    You don't need to put any statements in CONFIG.SYS in this case.
    2430
    2531
     
    4046version of Lucide and all plugins.
    4147
    42 If you are a developer, you may prefer to use the "pe.cmd" script instead of
     48If you are a developer, you may prefer to use the "se.cmd" script instead of
    4349starting "env.cmd" in each new shell. This script will allow you to run "kmk"
    4450in the correct environment from any directory inside the Lucide source tree by
    45 simply typing "pe kmk" in that directory. This is especially handy if you use
    46 e.g. File Commander as your development IDE. The "pe.cmd" script is may be
    47 obtained at:
     51simply typing "se kmk" in that directory. This is especially handy if you use
     52e.g. File Commander as your development IDE. The "se.cmd" script may be taken
     53at:
    4854
    49   ftp://ftp.netlabs.org/pub/qt4/tools/pe10.zip
     55  ftp://ftp.netlabs.org/pub/qt4/tools/se10.zip
    5056
  • branches/kmk/env.cmd

    r295 r314  
    2626interpret LocalEnv
    2727
     28/* fix the outdated kBuild setting in GCC environment */
     29if (EnvGet('BUILD_PLATFORM') == 'OS2') then
     30    call EnvSet 'BUILD_PLATFORM', 'os2'
     31
    2832/* setup kBuild */
    2933cmdline = 'call' G.PATH_TOOL_KBUILD'\envos2.cmd'
     
    4044    call EnvSet 'BUILD_PLATFORM', 'os2'
    4145
    42 /* setup OpenWatcom */
     46/* setup variables for Config.kmk/kBuild */
     47
     48call EnvSet 'PATH_SDK_SOM', translate(G.PATH_SDK_SOM, '/', '\')
     49
     50/* setup OpenWatcom (not necessary any more) */
     51/*
    4352if (G.PATH_TOOL_OPENWATCOM \== '') then do
    4453    call EnvAddFront 'PATH', G.PATH_TOOL_OPENWATCOM'\binp'
     
    4655    call EnvAddFront 'INCLUDE', G.PATH_TOOL_OPENWATCOM'\h;'G.PATH_TOOL_OPENWATCOM'\h\os2'
    4756end
    48 
    49 /* setup OS/2 Toolkit */
     57*/
     58
     59/* setup OS/2 Toolkit (not necessary any more) */
     60/*
    5061if (G.PATH_OS2_TOOLKIT \== '') then do
    5162    call EnvAddEnd 'PATH', G.PATH_OS2_TOOLKIT'\som\bin'
     
    5566    call EnvAddEnd 'SMINCLUDE', G.PATH_OS2_TOOLKIT'\idl;'G.PATH_OS2_TOOLKIT'\som\include'
    5667end
     68*/
    5769
    5870/* final mark */
     
    7991end
    8092exit
     93
     94/*----------------------------------------------------------------------------*/
    8195
    8296/**
Note: See TracChangeset for help on using the changeset viewer.