Changeset 136 for branches/v2.9_Lars


Ignore:
Timestamp:
Dec 9, 2023, 5:11:21 PM (20 months ago)
Author:
erdmann
Message:

merging from trunk

Location:
branches/v2.9_Lars
Files:
13 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/JPGPROC/source/makefile

    r105 r136  
    4545#
    4646#################################################################################
     47include ../../make.inc
    4748
    4849.SUFFIXES: .exe .obj .asm .inc .def .lrf .lst .sym .map .c .h .lib .dlg .txt .cod  \
    … …  
    6061#################################
    6162MAPSYM=mapsym
    62 GMBLIBPATH= D:/usr/lib/GBM
    63 LIBS=   MMPM2.LIB $(GMBLIBPATH)/GBM.LIB
     63LIBS=   MMPM2.LIB $(GBMLIBPATH)/GBM.LIB
    6464LDFLAGS =       -Ge- /Gm+ -G4 /ss -Gl /O+ -Oc+ -Ol-  /Q+ /B"/NOE"
    6565
    … …  
    9696        -rm *.obj
    9797        -rm *.dll
    98         -rm *.res
     98        -rm *.RES
    9999        -rm *.*~
    100100        -rm *.map

  • branches/v2.9_Lars/LocalEnv.cmd.tpl

    r56 r136  
    4747 */
    4848
    49 G.PATH_TOOL_SOM_ENV     = 'U:\Toolkit\SOM\bin\somenv.cmd'
     49G.PATH_TOOL_SOM_ENV     = 'U:\Toolkit\SOM\bin\somenv.cmd'     
     50
     51/**
     52 * Set MAKESHELL to either cmd.exe or 4os2.exe as sh chokes on backslashes
     53 */
     54
     55G.MAKESHELL            = 'G:\4os2\4os2.exe'

  • branches/v2.9_Lars/classes/c/c_mm/mmfolder.c

    r74 r136  
    585585                  else if(_somIsA(wpObject, cwBitmapClass)) {
    586586                    hbm=MMBitmap_cwmmQuerySmallBitmapHandle( (MMBitmap*) wpObject, ulIconSize);
    587                     pBmpInfoHeader2=(PBITMAPINFOHEADER2)_wpQueryBitmapInfoHeader((MMBitmap*)wpObject);
     587                    pBmpInfoHeader2=(PBITMAPINFOHEADER2)_cwmmQueryBitmapInfoHeader((MMBitmap*)wpObject);
    588588                  }
    589589                  if(hbm)

  • branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile

    r130 r136  
    4141        -rm *.RES
    4242        -rm *.ini
     43        -rm *.def
    4344
    4445cleaner:

  • branches/v2.9_Lars/classes/mm-progs/volume/makefile

    r130 r136  
    2929        -rm *.ini
    3030        -rm $(LIBDIR)/*.obj
     31        -rm *.def
    3132
    3233cleaner:

  • branches/v2.9_Lars/common_functions/makefile

    r74 r136  
    33#include ../make.inc
    44
    5 CC           = gcc
     5CC           = icc
    66LIB_DIR      = D:/usr/lib
    7 #CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
    8 CPPFLAGS     = -O -Zomf -Zcrtdll -s
     7CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
     8#CPPFLAGS     = -O -Zomf -Zcrtdll -s
    99INC             = ../include
    1010DEFS         =

  • branches/v2.9_Lars/env.cmd

    r56 r136  
    5353call EnvSet 'EMXOMFLD_TYPE','wlink'
    5454call EnvSet 'EMXOMFLD_LINKER', 'wl.exe'
     55call EnvSet 'MAKESHELL', translate(G.MAKESHELL, '/', '\')
     56call EnvSet 'GBMLIBPATH', translate(G.GBMLIBPATH, '/', '\')
    5557
    5658/* set path amd beginlib path for building the wpi*/

  • branches/v2.9_Lars/make.inc

    r91 r136  
    11# List of languages to be built.
    2 LANGUAGES       =       de en es fr nl it tw
     2LANGUAGES       =       de en es fr nl it ru tw
    33
    44#define the next makro if compiling a release rather than a beta
    … …  
    2323AUTHOR_STRING   =       "(C) Chris Wohlgemuth 2002-2005 Gregg Young 2023"
    2424BUILD_ROOT      =       D:/cwmm/branches/v2.9_Lars
     25GBMLIBPATH      =       U:/usr/lib/GBM
    2526
    2627# Put version in environment for REXX skripts

  • branches/v2.9_Lars/makefile

    r4 r136  
    274274bld:
    275275        @build.cmd
    276 

  • branches/v2.9_Lars/mediafolder/res/makefile

    r91 r136  
    5656clean:
    5757        -cd $(OBJDIR) && rm *
    58         -rm *.res
     58        -rm *.RES
    5959
    6060cleaner:

  • branches/v2.9_Lars/nlv/de/classes/res/makefile

    r4 r136  
    3535        -rm *.*~
    3636        -rm *.flc
    37         -rm *.res
     37        -rm *.RES
    3838        -rm *.obj

  • branches/v2.9_Lars/stream_ioproc/source/makefile

    r4 r136  
    9797        -rm *.obj
    9898        -rm *.dll
    99         -rm *.res
     99        -rm *.RES
    100100        -rm *.*~
    101101        -rm *.map
Note: See TracChangeset for help on using the changeset viewer.