Changeset 4712 for trunk/tools


Ignore:
Timestamp:
Dec 3, 2000, 12:27:03 AM (25 years ago)
Author:
bird
Message:

New makefile style.

Location:
trunk/tools
Files:
1 added
2 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/SDF/makefile

    r4620 r4712  
    1 # $Id: makefile,v 1.3 2000-11-19 08:25:50 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-02 23:26:57 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 # Makefile for the SDF utility.
     6#       Makefile for the SDF utility.
    77#
    88#
    … …  
    1212# Directory macros.
    1313#
    14 PDWIN32_INCLUDE = ..\..\include
    15 PDWIN32_LIB     = ..\..\lib
    16 PDWIN32_BIN     = ..\bin
    17 PDWIN32_TOOLS   = ..\bin
    18 PDWIN32_TCOMMON = ..\common
     14ODIN32_TCOMMON = ..\common
     15ODIN32_BIN     = $(ODIN32_TOOLS)
    1916
    2017
    … …  
    3027# Compiler, tools, and interference rules.
    3128#
    32 !include $(PDWIN32_INCLUDE)\pdwin32.mk
    33 !include $(PDWIN32_TCOMMON)\common.mk
     29!include ../../makefile.inc
     30!include $(ODIN32_TCOMMON)\common.mk
    3431
    3532
    … …  
    6865# Includes the common rules.
    6966#
    70 !include $(PDWIN32_INCLUDE)\pdwin32.post
    71 !include $(PDWIN32_TCOMMON)\common.mk.post
     67!include $(ODIN32_POST_INC)
     68!include $(ODIN32_TCOMMON_POST_INC)
    7269

  • trunk/tools/common/common.mak

    r4654 r4712  
    1 # $Id: common.mak,v 1.1 2000-11-21 04:37:22 bird Exp $
     1# $Id: common.mak,v 1.2 2000-12-02 23:26:57 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    1718# Compiler, tools, and interference rules.
    1819#
    19 !include ../../include/pdwin32.mk
     20!include ../../makefile.inc
    2021
    2122
    … …  
    4041# Includes the common rules.
    4142#
    42 !include $(PDWIN32_INCLUDE)/pdwin32.post
     43!include $(ODIN32_POST_INC)
    4344

  • trunk/tools/common/common.mk

    r4654 r4712  
    1 # $Id: common.mk,v 1.3 2000-11-21 04:37:22 bird Exp $
     1# $Id: common.mk,v 1.4 2000-12-02 23:26:57 bird Exp $
    22#
    33# Common definitions for tools.
    44#
    5 # Requires that PDWIN32_TCOMMON is defined to point to the
     5# Requires that ODIN32_TCOMMON is defined to point to the
    66# /tools/common directory
    77#
    88#
    9 # Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
     9# Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
    1010#
    1111# Project Odin Software License can be found in LICENSE.TXT
    … …  
    2020#
    2121!ifndef GCC
    22 COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.lib
     22COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.lib
    2323!else
    2424    !if $(OMF) == 0
    25 COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.a
     25COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.a
    2626    !else
    27 COMMONLIB = $(PDWIN32_TCOMMON)\$(OBJDIR)\common.lib
     27COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.lib
    2828    !endif
    2929!endif
    … …  
    3131
    3232#
    33 # Add PDWIN32_TCOMMON to the C and C++ includes.
     33# Add ODIN32_TCOMMON to the C and C++ includes.
    3434#
    35 CINCLUDES = -I$(PDWIN32_TCOMMON) $(CINCLUDES)
     35CINCLUDES = -I$(ODIN32_TCOMMON) $(CINCLUDES)
    3636
    3737
    … …  
    4242INTLIBS = $(COMMONLIB)
    4343
     44
     45#
     46# Macro for the post include.
     47#
     48ODIN32_TCOMMON_POST_INC = $(ODIN32_TCOMMON)/common.post.mk
     49

  • trunk/tools/common/kDef2Wat.mak

    r4654 r4712  
    1 # $Id: kDef2Wat.mak,v 1.1 2000-11-21 04:37:22 bird Exp $
     1# $Id: kDef2Wat.mak,v 1.2 2000-12-02 23:26:58 bird Exp $
    22
    33#
    … …  
    1111# Macro which defines the tools common directory.
    1212#
    13 PDWIN32_TCOMMON = .
    14 PDWIN32_BIN = ..\bin
     13ODIN32_TCOMMON = .
     14ODIN32_BIN     = $(ODIN32_TOOLS)
    1515
    1616
    … …  
    3131# Compiler, tools, and interference rules.
    3232#
    33 !include ../../include/pdwin32.mk
    34 !include $(PDWIN32_TCOMMON)/common.mk
     33!include ../../makefile.inc
     34!include $(ODIN32_TCOMMON)/common.mk
    3535
    3636
    … …  
    6060# Includes the common rules.
    6161#
    62 !include $(PDWIN32_INCLUDE)/pdwin32.post
    63 !include $(PDWIN32_TCOMMON)/common.mk.post
     62!include $(ODIN32_POST_INC)
     63!include $(ODIN32_TCOMMON_POST_INC)
    6464

  • trunk/tools/common/kDump.mak

    r4654 r4712  
    1 # $Id: kDump.mak,v 1.1 2000-11-21 04:37:23 bird Exp $
     1# $Id: kDump.mak,v 1.2 2000-12-02 23:26:58 bird Exp $
    22
    33#
    … …  
    1111# Macro which defines the tools common directory.
    1212#
    13 PDWIN32_TCOMMON = .
    14 PDWIN32_BIN = ..\bin
     13ODIN32_TCOMMON = .
     14ODIN32_BIN     = $(ODIN32_TOOLS)
    1515
    1616
    … …  
    3131# Compiler, tools, and interference rules.
    3232#
    33 !include ../../include/pdwin32.mk
    34 !include $(PDWIN32_TCOMMON)/common.mk
     33!include ../../makefile.inc
     34!include $(ODIN32_TCOMMON)/common.mk
    3535
    3636
    … …  
    6060# Includes the common rules.
    6161#
    62 !include $(PDWIN32_INCLUDE)/pdwin32.post
    63 !include $(PDWIN32_TCOMMON)/common.mk.post
     62!include $(ODIN32_POST_INC)
     63!include $(ODIN32_TCOMMON_POST_INC)
    6464

  • trunk/tools/common/makefile

    r4654 r4712  
    1 # $Id: makefile,v 1.9 2000-11-21 04:37:23 bird Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:26:58 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       Tools common parts
    … …  
    2222# Compiler, tools, and interference rules.
    2323#
    24 !include ..\..\include\pdwin32.mk
     24!include ../../makefile.inc
    2525
    2626
    … …  
    3232        $(OBJDIR)\common.a \
    3333!endif
    34         $(PDWIN32_TOOLS)\kDef2Wat.exe
    35 #        $(PDWIN32_TOOLS)\kDump.exe
     34        $(ODIN32_TOOLS)\kDef2Wat.exe
     35#        $(ODIN32_TOOLS)\kDump.exe
    3636
    3737
    … …  
    4040#
    4141needed:     $(OBJDIR)\common.lib \
    42             $(PDWIN32_TOOLS)\kDef2Wat.exe
     42            $(ODIN32_TOOLS)\kDef2Wat.exe
    4343
    4444
    … …  
    6161# Tools.
    6262#
    63 $(PDWIN32_TOOLS)\kDump.exe    $(OBJDIR)\kDump.exe    kDump.exe \
    64 $(PDWIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe : force
     63$(ODIN32_TOOLS)\kDump.exe    $(OBJDIR)\kDump.exe    kDump.exe \
     64$(ODIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe : force
    6565    -@echo $@
    6666    @$(MAKE_CMD) -f $(@B).mak all
    … …  
    8181dep:
    8282    $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
    83         *.rc *.dlg $(PDWIN32_INCLUDE)\*.h -robj *.orc \
     83        *.rc *.dlg $(ODIN32_INCLUDE)\*.h -robj *.orc \
    8484        -objo    *.c *.cpp \
    8585        -objgobj *.c *.cpp

  • trunk/tools/common/makefile.gcc

    r4620 r4712  
    1 # $Id: makefile.gcc,v 1.7 2000-11-19 08:29:54 bird Exp $
     1# $Id: makefile.gcc,v 1.8 2000-12-02 23:26:58 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 # Tools common library, GCC version.
     6#       Tools common library, GCC version.
    77#
    88#
    … …  
    2020# Directories and common tools.
    2121#
    22 PDWIN32_INCLUDE = ..\..\include
    23 PDWIN32_BIN     = ..\..\bin\$(OBJDIR)
    24 PDWIN32_LIB     = ..\..\lib
    25 PDWIN32_TOOLS   = ..\bin
    26 PDWIN32_TCOMMON = ..\common
    27 !include $(PDWIN32_INCLUDE)\pdwin32.tools
     22ODIN32_INCLUDE = ..\..\include
     23ODIN32_BIN     = ..\..\bin\$(OBJDIR)
     24ODIN32_LIB     = ..\..\lib
     25ODIN32_TOOLS   = ..\bin
     26ODIN32_TCOMMON = ..\common
     27!include $(ODIN32_INCLUDE)\odin32.tools
    2828
    29 # Definitions for pdwin32.post
     29# Definitions for odin32.post
    3030LOCALCLEAN  = 1
    3131CLEANEXTRAS = commongcc.*
    … …  
    6464
    6565CDEFINES  = -D__WIN32OS2__ -D__WINE__
    66 CINCLUDES = -I$(PDWIN32_INCLUDE)\Win -I$(PDWIN32_INCLUDE)
     66CINCLUDES = -I$(ODIN32_INCLUDE)\Win -I$(ODIN32_INCLUDE)
    6767CPLUS_INCLUDE_PATH= $(CPLUS_INCLUDE_PATH);$(INCLUDE)
    6868
    … …  
    120120
    121121# Includes the common rules.
    122 !include $(PDWIN32_INCLUDE)/pdwin32.post
     122!error "this makefile doesn't work right now."
     123!include $(ODIN32_INCLUDE)/odin32.post
    123124

  • trunk/tools/database/Makefile

    r4332 r4712  
    1 # $Id: Makefile,v 1.14 2000-09-28 03:06:27 bird Exp $
     1# $Id: Makefile,v 1.15 2000-12-02 23:26:58 bird Exp $
    22
    33#
    … …  
    66
    77# include common definitions
    8 PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_TOOLS   = ..\bin
    10 !include ..\..\include\pdwin32.mk
     8ODIN32_TCOMMON = ..\common
     9ODIN32_BIN     = $(ODIN32_TOOLS)
     10!include ../../makefile.inc
     11!include $(ODIN32_TCOMMON)/common.mk
    1112
    1213# Addjust common definitions
    13 CINCLUDES= -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win -Igd -Imysql -I..\common
     14CINCLUDES= -I$(ODIN32_INCLUDE) -I$(ODIN32_INCLUDE)\win -Igd -Imysql -I..\common
    1415!ifdef DEBUG
    1516CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ -Tm- $(CINCLUDES)      -DNO_CLIENT_LONG_LONG -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gh+ -DDEBUG_ALLOC
    … …  
    3536# APIImport
    3637#
    37 APIImport.exe: APIImport.obj db.obj ..\common\commonicc.lib mysql\libmysqlclient.lib
     38APIImport.exe: APIImport.obj db.obj $(COMMONLIB) mysql\libmysqlclient.lib
    3839   $(LD) $(LDFLAGS) $**
    3940
    4041..\bin\APIImport.exe: APIImport.exe
    4142   $(CP) $** $@
    42 
    43 ..\common\commonicc.lib:
    44     cd ..\common
    45     nmake /nologo commonicc.lib
    46     cd ..\database
    4743
    4844
    … …  
    7066
    7167gd\gdicc.lib: force
    72    @cd gd
    73    @nmake /nologo gdicc.lib
    74    @cd ..
    75 
     68   $(DODIRS) "gd" $(MAKE_CMD) gdicc.lib
    7669
    7770
    … …  
    111104#
    112105dep:
    113     $(DEPEND) $(CINCLUDES) -o- *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
     106    $(DEPEND) $(CINCLUDES) -o- *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h \
    114107        *.c *.cpp -objo *.c *.cpp
    115     cd gd
    116     @nmake /nologo dep
    117     cd ..
     108    $(DODIRS) "gd" $(MAKE_CMD) dep
    118109
    119110
    … …  
    124115clean:
    125116   $(RM) *.obj *.lib *.o *.a *.dll *.exe *.pch *.log *.map *.html
    126    cd gd
    127    $(MAKE) /nologo clean
    128    cd ..
     117    $(DODIRS) "gd" $(MAKE_CMD) clean
    129118
    130119
    … …  
    147136force:
    148137    @$(ECHO) ...
     138
     139
     140#
     141# Common rules.
     142#
     143!include $(ODIN32_TCOMMON_POST_INC)
     144

  • trunk/tools/database/gd/Makefile

    r4332 r4712  
    1111all: gdgcc.a gdgcc.lib gdicc.lib
    1212
    13 PDWIN32_TOOLS = ..\..\bin
    14 PDWIN32_INCLUDE = ..\..\..\include
    15 !include ..\..\..\include\pdwin32.tools
     13ODIN32_TOOLS = ../../bin
     14!include ../../../makefile.inc
    1615
    1716gdgcc.a: force

  • trunk/tools/database/gd/Makefile.gcc

    r4332 r4712  
    88#for your system.
    99
    10 PDWIN32_INCLUDE = ..\..\..\include
    11 PDWIN32_TOOLS = ..\..\bin
    12 !include $(PDWIN32_INCLUDE)\pdwin32.mk
     10ODIN32_TOOLS    = ..\..\bin
     11!include ../../../makefile.inc
    1312
    1413CC=gcc

  • trunk/tools/database/gd/Makefile.icc

    r4332 r4712  
    99
    1010
    11 PDWIN32_INCLUDE = ..\..\..\include
    12 PDWIN32_TOOLS = ..\..\bin
    13 !include $(PDWIN32_INCLUDE)\pdwin32.mk
     11ODIN32_TOOLS = ..\..\bin
     12!include ../../../makefile.inc
    1413
    1514

  • trunk/tools/database/makefile.gcc

    r2770 r4712  
    1 # $Id: makefile.gcc,v 1.2 2000-02-12 23:54:30 bird Exp $
     1# $Id: makefile.gcc,v 1.3 2000-12-02 23:26:59 bird Exp $
    22
    33#
    … …  
    66
    77# common include directory
    8 PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_TOOLS = ..\bin
    10 !include $(PDWIN32_INCLUDE)\pdwin32.tools
     8ODIN32_INCLUDE = ..\..\include
     9ODIN32_TOOLS = ..\bin
     10!include $(ODIN32_INCLUDE)\odin32.tools
    1111
    1212!ifndef OMF
    … …  
    3434
    3535CDEFINES  = -D__WIN32OS2__ -D__WINE__ -DNOTDLL
    36 CINCLUDES = -I$(PDWIN32_INCLUDE)\Win -I$(PDWIN32_INCLUDE) -Imysql -Igd -I..\common
     36CINCLUDES = -I$(ODIN32_INCLUDE)\Win -I$(ODIN32_INCLUDE) -Imysql -Igd -I..\common
    3737# Note: Add -fhandle-exceptions if old gcc version.
    3838!ifndef DEBUG
    … …  
    159159#
    160160dep:
    161     $(DEPEND) $(CINCLUDES) *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
     161    $(DEPEND) $(CINCLUDES) *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h \
    162162        *.c *.cpp -objo *.c *.cpp
    163163    cd gd

  • trunk/tools/dbginfo/makefile

    r4131 r4712  
    1 # $Id: makefile,v 1.6 2000-08-31 03:05:05 bird Exp $
     1# $Id: makefile,v 1.7 2000-12-02 23:26:59 bird Exp $
     2
    23#
    34# Makefile for debug info convertes - experimental.
     5#   Don't bother to cleanup this mess yet.
    46#
    57# Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
    … …  
    1012
    1113# Directory macros.
    12 PDWIN32_INCLUDE = ..\..\include
    13 PDWIN32_LIB     = ..\..\lib
    14 PDWIN32_BIN     = ..\..\$(OBJDIR)
    15 PDWIN32_TOOLS   = ..\..\tools\bin
    16 PDWIN32_TCOMMON = ..\common
     14ODIN32_TCOMMON = ..\common
    1715
    1816
    1917# Compiler, tools, and interference rules.
    2018EXETARGET=1
    21 !include $(PDWIN32_INCLUDE)\pdwin32.mk
    22 !include $(PDWIN32_TCOMMON)\common.mk
     19OLD_STYLE=1
     20!include ../../makefile.inc
     21!include $(ODIN32_TCOMMON)\common.mk
    2322
    2423
    2524# Flag overloads and local macros.
    26 CINCLUDES  = -I$(PDWIN32_TCOMMON)
    27 
    28 CFLAGS     = $(CINCLUDES) $(CFLAGS) -DRING3 \
    29              -Ge+ -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- -Gm- -Gn- -Ti+ -Rn -Tm-
    30 CXXFLAGS   = $(CINCLUDES) $(CXXFLAGS) -DRING3 \
    31              -Ge+ -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gm- -Gn- -Ti+ -Gx -Rn -Tm-
     25CINCLUDES  = -I$(ODIN32_TCOMMON)
     26CFLAGS     = $(CFLAGS)   -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- -Gm- -Ti+ -Tm-
     27CXXFLAGS   = $(CXXFLAGS) -Wall+ppt-ppc-inl-cnv-gnr-vft-             -Gm- -Ti+ -Tm- $(CXXEXCEPTIONS)
    3228
    3329
    … …  
    6662
    6763
     64#
     65# Includes the common rules.
     66#
     67!include $(ODIN32_POST_INC)
     68!include $(ODIN32_TCOMMON_POST_INC)
    6869
    69 
    70 # Dep rule - makes depenencies for C, C++ and Asm files.
    71 # -o- removes the object directory - for the time being.
    72 dep:
    73     $(DEPEND) -o- -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win; $(CINCLUDES) \
    74         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    75 
    76 
    77 # Includes the common rules.
    78 !include $(PDWIN32_INCLUDE)\pdwin32.post
    79 !include $(PDWIN32_TCOMMON)\common.mk.post
    80 
    81 

  • trunk/tools/fastdep/makefile

    r4653 r4712  
    1 # $Id: makefile,v 1.7 2000-11-21 04:35:37 bird Exp $
     1# $Id: makefile,v 1.8 2000-12-02 23:27:00 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 # Makefile for the Quick-and-Dirty dependency utility. (FastDep)
     6#   Makefile for the Quick-and-Dirty dependency utility. (FastDep)
    77#
    88#
    … …  
    1212# Directory macro.
    1313#
    14 PDWIN32_BIN     = ..\bin
     14ODIN32_BIN     = $(ODIN32_TOOLS)
    1515
    1616
    … …  
    2929# include common definitions
    3030#
    31 !include ../../include/pdwin32.mk
     31!include ../../makefile.inc
    3232
    3333
    … …  
    6868# Includes the common rules.
    6969#
    70 !include $(PDWIN32_INCLUDE)/pdwin32.post
     70!include $(ODIN32_POST_INC)
    7171
    7272

  • trunk/tools/impdef/makefile

    r4655 r4712  
    1 # $Id: makefile,v 1.8 2000-11-21 04:37:53 bird Exp $
     1# $Id: makefile,v 1.9 2000-12-02 23:27:01 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 # Makefile for the ImpDef utility.
     6#       Makefile for the ImpDef utility.
    77#
    88#
    … …  
    1212# Directory macros.
    1313#
    14 PDWIN32_BIN     = ..\bin
    15 PDWIN32_TCOMMON = ..\common
     14ODIN32_TCOMMON = ..\common
     15ODIN32_BIN     = $(ODIN32_TOOLS)
    1616
    1717
    … …  
    3030# Compiler, tools, and interference rules.
    3131#
    32 !include ../../include/pdwin32.mk
    33 !include $(PDWIN32_TCOMMON)\common.mk
     32!include ../../makefile.inc
     33!include $(ODIN32_TCOMMON)\common.mk
    3434
    3535
    … …  
    7474# Includes the common rules.
    7575#
    76 !include $(PDWIN32_INCLUDE)\pdwin32.post
    77 !include $(PDWIN32_TCOMMON)\common.mk.post
     76!include $(ODIN32_POST_INC)
     77!include $(ODIN32_TCOMMON_POST_INC)
    7878

  • trunk/tools/install/makefile

    r4650 r4712  
    1 # $Id: makefile,v 1.4 2000-11-21 04:33:25 bird Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:27:01 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       odininst.exe makefile
    … …  
    1212#
    1313EXETARGET = 1
     14VIO = 1
     15STATIC_CRT = 1
     16NO_MAIN_BIN_COPY = 1
    1417
    1518
    … …  
    1720# Compiler, tools, and interference rules.
    1821#
    19 !include ../../include/pdwin32.mk
     22!include ../../makefile.inc
    2023
    2124
    … …  
    3336os2386.lib \
    3437$(RTLLIB) \
    35 $(PDWIN32_LIB)\kernel32.lib
     38$(ODIN32_LIB)\kernel32.lib
    3639
    3740
    … …  
    4548# Includes the common rules.
    4649#
    47 !include $(PDWIN32_INCLUDE)\pdwin32.post
     50!include $(ODIN32_POST_INC)
    4851

  • trunk/tools/install/odininst.wis

    r3459 r4712  
    44     PACKAGEID="Odin\Odin\Odin Core Files\0\0\5"
    55     TARGET="C:\ODIN" BASE
    6      TITLE="Odin Daily Build (29 Apr 2000)"
     6     TITLE="Odin Daily Build (26 Nov 2000)"
    77     SELECT NODESELECT
    88     >Installation of Odin Daily Build .</PCK>
    … …  
    1212     TARGET="C:\ODIN\SYSTEM32"
    1313     FIXED SELECT NODESELECT
    14      TITLE="Odin Daily Build System Files (29 Apr 2000)"
     14     TITLE="Odin Daily Build System Files (26 Nov 2000)"
     15     EXECUTE="odininst.exe"
    1516     CONFIGSYS="LIBPATH=$(1)\SYSTEM32 | ADDRIGHT"
    1617     CONFIGSYS="SET PATH=$(1)\SYSTEM32 | ADDRIGHT"
    17      EXECUTE="CONFIGSYS|odininst.exe"
    1818     >Installation of Odin System files .</PCK>
    1919
    … …  
    2222     TARGET="C:\ODIN\SYSTEM32"
    2323     FIXED
    24      TITLE="Odin Daily Build 3dfx Voodoo OpenGL Files (29 Apr 2000)"
     24     TITLE="Odin Daily Build 3dfx Voodoo OpenGL Files (26 Nov 2000)"
    2525     >Installation of Odin 3dfx Voodoo OpenGL files .</PCK>
    2626
    … …  
    2929     TARGET="C:\ODIN\SYSTEM32"
    3030     FIXED
    31      TITLE="Odin Daily Build 3dfx Voodoo 1 Glide Files (29 Apr 2000)"
     31     TITLE="Odin Daily Build 3dfx Voodoo 1 Glide Files (26 Nov 2000)"
    3232     >Installation of Odin 3dfx Voodoo 1 Glide files .</PCK>
    3333
    … …  
    3636     TARGET="C:\ODIN\SYSTEM32"
    3737     FIXED
    38      TITLE="Odin Daily Build 3dfx Voodoo 2 Glide Files (29 Apr 2000)"
     38     TITLE="Odin Daily Build 3dfx Voodoo 2 Glide Files (26 Nov 2000)"
    3939     >Installation of Odin 3dfx Voodoo 2 Glide files .</PCK>
    4040</HEAD>
    … …  
    5555of the Win32 binary emulator.
    5656
    57 This readme is intended for end users that have downloaded the
    58 latest public alpha release and want to give it a try. For more
    59 information, be sure to regularly check http://www.netlabs.org/odin.</TEXT>
     57Odin is available thanks to the work of the following people:
     58
     59     Christoph Bratschi
     60     Oliver Braun
     61     Edgar Buerkle
     62     Yuri Dario
     63     Przemyslaw Dobrowolski
     64     Daniela Engert
     65     Peter Fitzsimmons
     66     Adrian Gschwend
     67     Jeroen van den Horn
     68     Patrick Haller
     69     Achim Hasenmueller
     70     Kevin Langman
     71     Bart van Leeuwen
     72     Sander van Leeuwen
     73     Felix Maschek
     74     Chris McKillop
     75     Nenad Milenkovic
     76     Markus Montkowski
     77     Michal Necasek
     78     Ondrej Necasek
     79     Knut Stange Osmundsen
     80     Vitali E. Pelenyov
     81     Rene Pronk
     82     David Raison
     83     Carsten Tenbrink
     84     Vit Timchishin
     85     Joel Troster
     86     Jens Wiessner
     87     Vince Vielhaber
     88     All the WINE people
     89
     90</TEXT>
    6091</PAGE>
    6192<PAGE INDEX=2 TYPE=README>
    … …  
    134165</README>
    135166</PAGE>
    136 <PAGE INDEX=3 TYPE=CONTAINER>
     167<PAGE INDEX=3 TYPE=README>
    137168<NEXTBUTTON TARGET=4>~Next</NEXTBUTTON>
     169<TEXT>
     170List of changes and bugfixes for this Odin daily build (26 Nov 2000)
     171</TEXT>
     172<README>
     173/* $Id: odininst.wis,v 1.2 2000-12-02 23:27:02 bird Exp $ */
     174
     175 2000-11-25: Sander van Leeuwen <sandervl@xs4all.nl>
     176    - USER32:   o ReleaseCapture fix (endless loop in MultiEdit)
     177    - KERNEL32: o Workaround for DosAllocSharedMem limitation. OS/2 does
     178                  not accept shared memory names with colons. Replace
     179                  them with underscores.
     180                  (fixes crash at startup for PMMail 2000)
     181
     182 2000-11-24: Patrick Haller <patrick.haller@innotek.de>
     183    - WINMM:    o FS: corruption fix in MixSetup->pmixWrite (DART)
     184
     185 2000-11-24: Sander van Leeuwen <sandervl@xs4all.nl>
     186    - USER32:   o Don't send WM_CREATE or WM_NCCREATE messages to dialogs
     187                o Don't send WM_NCCALCSIZE to a dialog before it has received
     188                  WM_INITDIALOG
     189                  (looks like that's how NT4 SP6 does it)
     190                  (fixes sysinf32 error messages about failure to create dialogs)
     191                o CopyIcon bugfix (CURSORICON_ExtCopy)
     192
     193 2000-11-24: Kai Sommerfeld <kai.sommerfeld@hamburg.de>
     194    - SHELL32:  o Completed ICO_ExtractIconEx rewite
     195                o Changed shell32 icon lookup (IExtractIconA_fnGetIconLocation)
     196                o Added 45 shell icons + one Explorer icon
     197                  (Icon author: Pierre Cavanna, Icon origin: http://www.iconstreet.com)
     198
     199 2000-11-24: Oliver Braun <Oliver.Braun@hamburg.de>
     200    - OLE32:    o Synched with latest OLE clipboard implementation
     201
     202 2000-11-23: Sander van Leeuwen <sandervl@xs4all.nl>
     203    - GDI32:    o Fixed crash in SetDIBits method of DIB section class
     204                  for compressed bitmaps.
     205    - KERNEL32: o Fix for launching apps with spaces in their pathname
     206                  (CreateProcessA)
     207                o Fix for OpenFile and file names with too many backslashes
     208                  (NT4, SP6 accepts e.g. m:\\\ikernel.ex_; DosOpen doesn't)
     209                o Same fix for CreateFile (same behaviour observed in NT4, SP6)
     210    - USER32:   o Added localized resources (copied from Wine)
     211
     212 2000-11-22: Patrick Haller <patrick.haller@innotek.de>
     213    - CRTDLL:   o Added some debug code, added missing exports ltow, ultow
     214
     215 2000-11-22: Sander van Leeuwen <sandervl@xs4all.nl>
     216    - USER32:   o When application sends invalid brush in responds to
     217                  WM_CTLCOLOR messages -> get default brush (by calling
     218                  DefWindowProcA)
     219                  (fixes white background of checkboxes in Adobe Distiller's
     220                   option dialog)
     221                o Workaround added for bug in StretchDIBits when stretching
     222                  AND mask of icons. Create bitmap and use StretchBlt to blit
     223                  and stretch/shrink the icon mask.
     224                  (fixes wrong icons for some executables (e.g. Napster) in
     225                   the file open dialog)
     226    - GDI32:    o Print warning when StretchDIBits is called with 1bpp bitmap data
     227                 
     228 2000-11-21: Patrick Haller <patrick.haller@innotek.de>
     229    - CRTDLL:   o Merged with WINE code, numerous stubs resolved, many VAC
     230                  CRT dependencies resolved with self-contained ODIN code
     231
     232 2000-11-21: Sander van Leeuwen <sandervl@xs4all.nl>
     233    - include\win\thread.h:
     234                o New TEB layout (like latest Wine)
     235    - include\versionos2.h:
     236                o Increased LX dll version (new dlls incompatible with old versions)
     237    - USER32,KERNEL32:
     238                o Changes for new TEB
     239    - OLE32:    o Added CreateErrorInfo, GetErrorInfo & SetErrorInfo (Wine port)
     240                o Added Wine cursors to resource file
     241    - KERNEL32: o Be careful with terminating strings in lstrcpynAtoW/WtoA
     242                  Must not always set the last character to 0; just terminate
     243                  the string if it's shorter than the max size. Some apps send
     244                  the wrong string size to apis that use this function (i.e.
     245                  GetMenuStringW (Notes)) -> overwrites stack
     246                  (fixes crash when activating menus in Lotus Notes 5)
     247    - USER32:   o CopyImage bugfix (black icons in file dialog)
     248
     249 2000-11-21: Oliver Braun <Oliver.Braun@hamburg.de>
     250    - USER32:   o Added support for WM_DESTROYCLIPBOARD
     251
     252 2000-11-21: knut st. osmundsen <knut.stange.osmundsen@mynd.no>
     253    - pdwin32.*:
     254                o Fighting with the Watcom compilers and WMAKE.
     255                  Not at all completed. (Is now able to build fastdep.c - very usefull! ;-) )
     256    - tools/install:
     257                o Corrected makefile.
     258    - fastdep:  o Updated to compile with Watcom.
     259    - tools/common, tools/impdef:
     260                o Updated to new makefile style.
     261
     262 2000-11-20: Sander van Leeuwen <sandervl@xs4all.nl>
     263    - USER32:   o Fixed bug in code that looks for the best icon (based on size/bpp)
     264                  Don't use entry->ResInfo.icon.bColorCount, but entry->wBitCount instead.
     265                  (Winamp 2.7 has icons with bColorCount set to 0 even though
     266                   they're 8 bits)
     267
     268 2000-11-20: Michal Necasek <michalnec@volny.cz>
     269    - KERNEL32: o Updates and fixes for the debug api functions
     270
     271 2000-11-20: knut st. osmundsen <knut.stange.osmundsen@mynd.no>
     272    - pdwin32.*:
     273                o Some sdjustments and corrections.
     274                o Flag macros can't be added and added and added and
     275                  added to - NMAKE don't support it.
     276                o Use CreatePath.cmd to makesure that OBJDIR any target
     277                  directory for a copy (CP) operation exists.
     278                o Use ExecExcl.cmd to execute ILINK execlusivly. Since
     279                  running ILINK concurrently in two processes often failes.
     280    - src/makefile:
     281                o Changed the all rule.
     282                o Added two nice features to the all, build, lib(s), dep
     283                  and clean rules:<ul>
     284                    <li>MASSIVE. Define MASSIVE (on nmake commandline) and
     285                        these rules will spawn a nmake child for each
     286                        subdirectory.
     287                    <li>SMP. Define SMP (on nmake commandline) and the
     288                        subdirectories are traversed backwards. This
     289                        replaces the makefile.smp stuff.
     290                  </ul>
     291                o smp rule - dual build. Build Odin as usual but first it
     292                  spawns a child which builds Odin backwards (SMP=1).
     293    - makefile: o Updated the SMP ruls to use new src/makefile.
     294    - COMCTL32: o Removed debugtools.h. Yesterdays changes by Sander depended
     295                  on debugtools.h found in include\win.
     296                o Added the missing IDS_SEPARATOR from the current Wine sources.
     297
     298 2000-11-19: Sander van Leeuwen <sandervl@xs4all.nl>
     299    - COMCTL32: o Resynced new Wine code with Christoph's unicode fixes
     300                  (animate, comboboxex, datetime, monthcalc & flatsb)
     301    - USER32:   o Another SetWindowPos fix for SWP_FRAMECHANGED (send WM_POSCHANGING/CHANGED messages)
     302    - PELDR:    o Fixed makefiles.
     303
     304 2000-11-19: knut st. osmundsen <knut.stange.osmundsen@mynd.no>
     305    - *:        o New makefile style implemented in the entire tree;
     306                  except for some unused makefiles.
     307                  As last time everything went quite well excpet for the
     308                  opengl and win32k trees which still are quite special
     309                  cases (especially win32k).
     310                o The new makefile style is designed minimal, only specifying
     311                  what really is unique for a makefile. All general stuff is
     312                  placed in central makefiles (the pdwin32.*.* files).
     313                o It is meant to work with wmake too. But that's not quite
     314                  ready and tested yet.
     315                o One of the more important changes are that C, C++ and
     316                  resource include search path is define separatly as
     317                  CINCLUDES.
     318                o The same goes for defines, they are defined as CDEFINES.
     319                  There are two alternate CDEFINES macros; CDEFINES_ODINCRT
     320                  and CDEFINES_WIN32APP.
     321                o All the PDWIN32_ directory macros
     322                o New LIBTARGET type of makefiles.
     323                o Many addtions, changes and corrections to the .post files.
     324                o Watcom main makefiles aren't quite up-to-date.
     325                o If there are any errors/problems Then
     326                    If you can fix them Then Do fix them ASAP.
     327                    Else Send a message ASAP to the win32os2-wai list.
     328                    Endif
     329                  Endif
     330    - PELDR:    o Makefile splitted into pe.mak and pec.mak.
     331    - OLE32:    o Makefile splitted into ole32.mak and regsvr32.mak.
     332    - MSCVRT:   o Makefile splitted into msvcrt.mak, msvcrt20.mak and msvcrt40.mak.
     333    - OPENGL:   o For some queer reason I had to add mem.c to the mesa/3dxf
     334                  makefile. This might be an indication that something went
     335                  wrong here but I am unable to figure it out.
     336    - NTDLL:    o Added dllinitstub.asm instead of the compiler specific
     337                  object file. Should perhaps be placed in dllentry and
     338                  made ready for Watcom.
     339    - tools/database:
     340                o Fixed build bug.
     341    - tools/fastdep:
     342                o Fixed option -r. It changed the object extention in stead
     343                  of the resource target extention. (Used to generated
     344                  dependencies for .orc files now.)
     345
     346 2000-11-18: Sander van Leeuwen <sandervl@xs4all.nl>
     347    - USER32:   o CopyImage fix for icons
     348
     349 2000-11-18: Michal Necasek <michalnec@volny.cz>
     350    - KERNEL32: o Workaround for exceptions caused by apps filling ES
     351                  with the FS selector
     352
     353 2000-11-17: Sander van Leeuwen <sandervl@xs4all.nl>
     354    - include\win\authors.h:
     355                o Added Kai Sommerfeld
     356    - USER32:   o SetWindowPos fix for frame change in Clock.exe
     357                  (missing MsgFormatFrame call)
     358    - KERNEL32: o CreateThread bugfix (crash in pmwinx when lpIDThread == NULL)
     359    - COMCTL32: o Updated animate, comboboxex, datetime, monthcalc & flatsb
     360                  controls with latest Wine code (2000-11-12)
     361    - COMDLG32: o Temporary workaround for crash in Adobe Acrobat 4.0
     362                  (file open dialog; weird hook call in FILEDLG95_OnOpen)
     363
     364 2000-11-17: Kai Sommerfeld <kai.sommerfeld@hamburg.de>
     365    - SHELL32:  o Added support for LX images to ICO_ExtractIconEx
     366
     367 2000-11-16: Sander van Leeuwen <sandervl@xs4all.nl>
     368    - USER32:   o Added support for SPI_GETICONMETRICS in SystemParametersInfoA
     369                  (ported Wine code)
     370                o SPI_GETICONTITLELOGFONT fix for SystemParametersInfoW (wrong height)
     371    - GDI32:    o Reimplemented GetTextExtentA. Seems to solve some
     372                  problems with font size calculation.
     373
     374 2000-11-15: Oliver Braun <Oliver.Braun@hamburg.de>
     375    - USER32:   o Added message translation for clipboard messages
     376                o OpenClipboard fix for NULL window handle
     377
     378 2000-11-15: Sander van Leeuwen <sandervl@xs4all.nl>
     379    - WINSPOOL: o Partially implemented EnumPrintersA
     380                o Implemented DeviceCapabilitiesA/W (calls Open32)
     381    - GDI32:    o Workaround added for coordinate problem when a window
     382                  looses focus and SelectClipRgn is called. GpiSetClipRegion
     383                  resets the window origin for some unknown reason
     384                  (TODO: figure out why)
     385                o Same workaround added for ExtSelectClipRgn
     386                o Reset origin after a bitmap is selected into a window DC
     387                o Fix for yesterday's SetDIBits bugfix; SetBitmapBits
     388                  expects WORD aligned scanlines; SetDIBits DWORD aligned
     389                  Correct this when flipping the bitmap
     390    - USER32:   o selectClientArea exported for GDI32
     391                o Validate rectangle returned after WM_NCCALCSIZE
     392
     393 2000-11-14: Michal Necasek <michalnec@volny.cz>
     394    - KERNEL32: o HMInitialize bugfix (initialization)
     395                o VirtualAlloc fix (wrong VirtualProtect call)
     396
     397 2000-11-14: Sander van Leeuwen <sandervl@xs4all.nl>
     398    - KERNEL32: o Added FindDevice method to device classes to ease searching
     399                  for device names. (COM class now doesn't have to register
     400                  16 devices)
     401                o Bugfix in COMM class (error code interpreted wrong)
     402                o COMx: (x=1..8) now also recognized as name for COM port
     403    - GDI32:    o Workaround added for bugs in Open32's SetDIBits; messes
     404                  up colors for 1 bpp bitmaps
     405                  (reversing scanlines and calling SetBitmapBits works, but only
     406                   if the all scanlines are updated!)
     407
     408 2000-11-12: Sander van Leeuwen <sandervl@xs4all.nl>
     409    - USER32:   o LoadBitmapW heap corruption fixes (reported by Michal Necasek)
     410                  for OS/2 1.3 bitmaps conversion
     411
     412 2000-11-11: Sander van Leeuwen <sandervl@xs4all.nl>
     413    - USER32:   o CreateWindowExW bugfixes (atom lookup + unicode string handling)
     414                o Added stubs for SetWinEventHook, UnhookWinEvent & NotifyWinEvent
     415
     416 2000-11-10: Patrick Haller <phaller@gmx.net>
     417    - KERNEL32: o implemented .42 and .47 ... which are "NullFunction"s.
     418
     419 2000-11-10: Sander van Leeuwen <sandervl@xs4all.nl>
     420    - USER32:   o Fixed wrong icon colors in release build
     421
     422 2000-11-10: Michal Necasek <michalnec@volny.cz>
     423    - KERNEL32: o VirtualQuery fix for inaccessible pages
     424
     425 2000-11-10: Knut St. Osmundsen <knut.stange.osmundsen@mynd.no>
     426    - Win32k:   o Updated symbol database with the 14060 kernels from
     427                  testcase. (Very minor changes compared to the first 14059
     428                  release when symbols are compared.)
     429                  Note. The 14059 kernels from 2000-10-31 are not supported
     430                  due to build number conflict with the kernels released
     431                  2000-10-23. The 2000-10-23 kernels are present in the
     432                  symbol database.
     433
     434 2000-11-09: Sander van Leeuwen <sandervl@xs4all.nl>
     435    - USER32:   o Implemented LoadCursorFromFileA/W (Wine port)
     436                o Fixes for LoadIconA/W & LoadCursorA/W; use default width & height
     437                  in LoadImage call
     438                o Fixed memory leaks in LoadCursorA/W
     439                o Rewrote icon apis using ported and modified Wine code
     440                  (fixes scaling of icons + wrong size of icons)
     441                  NOTE: Still some problems left (e.g. file open dialog icon)
     442                        Will be fixed asap.
     443                o Fixed coordinate mapping problem in MDI_ChildGetMinMaxInfo
     444                o Added Wine user32 icons (user32\bmp)
     445                o Fixed resource dependency
     446    - GDI32:    o Wrong call to dsect->SetDIBColorTable in CreateDIBSection
     447                  (PALETTEENTRY has red & blue reversed compared to RGB2/RGBQUAD)
     448                  (reported by Platon Fomichev)
     449                o Must call ReleaseDC for window dcs in DeleteDC
     450    - KERNEL32: o Removed unused resource conversion code (bitmaps, icons & accelerators)
     451                o Create system32\drivers\etc directory during install
     452    - COMCTL32: o Fixed resource dependency
     453    - COMDLG32: o Fixed resource dependency
     454    - SHELL32:  o Fixed resource dependency
     455
     456 2000-11-09: Achim Hasenmueller <achimha@innotek.de>
     457    - WSOCK32:  o WINSOCK_DeleteIData fix
     458
     459 2000-11-09: Michal Necasek <michalnec@volny.cz>
     460    - KERNEL32: o GetLocaleInfoW fix for Czech language (weird thousand separator)
     461
     462 2000-11-06: Sander van Leeuwen <sandervl@xs4all.nl>
     463    - COMDLG32: o Merged with latest Wine code (11-05-2000)
     464                o Added bugfix for empty initial dir string (file open/save dialogs)
     465                  Should use current directory; not the desktop
     466    - SHELL32:  o Merged with latest Wine code (11-05-2000)
     467
     468 2000-11-06: Michal Necasek <michalnec@volny.cz>
     469    - KERNEL32: o GetFullPathNameW bugfix
     470                o HeapReAlloc fix; must return the same pointer when shrinking
     471                  an allocation (NT's CMD.EXE depends on this!)
     472
     473 2000-11-05: Sander van Leeuwen <sandervl@xs4all.nl>
     474    - USER32:   o Changed warning string for ExitWindows api
     475                o Additional exports for gdi32; moved 4 apis back into gdi32
     476                o Fixed SetWindowPos during WM_NCCREATE (static control (bitmaps
     477                  + icon) resize now works)
     478    - GDI32:    o Rewrote many transformation & coordinate apis
     479    - KERNEL32: o Use DosLoadModule instead of O32_LoadLibrary
     480                o Changed exception dump logging (.dll.dll -> .dll)
     481                o Fix for GetDriveTypeW; return DRIVE_CANNOTDETERMINE if string
     482                  pointer is -1 (VERIFIED in NT 4, SP6) (reported by Michal Necasek)
     483                  (NOTE: Not true for GetDriveTypeA (crashes))
     484    - COMDLG32: o Fix for FindReplace dialog; must return pointer to FINDREPLACEA/W
     485                  structure when calling hook during WM_INITDIALOG; not pointer
     486                  to custum data dword (old SDK docs were wrong; newer versions
     487                  have been corrected)
     488
     489 2000-11-04: Sander van Leeuwen <sandervl@xs4all.nl>
     490    - GDI32:    o OffsetRgn fix
     491    - USER32:   o Rewrote LockWindowUpdate
     492
     493 2000-11-02: Sander van Leeuwen <sandervl@xs4all.nl>
     494    - SHELL32:  o Wrong exports for several apis (SHGetSpecialFolderPathA
     495                  & PathProcessCommandA reported by Kai Sommerfeld)
     496                  (PathBuildRoot, PathFileExists, ParseField & DoEnvironmentSubst)
     497                  SHGetSpecialFolderPathA export added.
     498
     499 2000-11-01: Brian Smith <dbsoft@technologist.com>
     500    - USER32:   o Fix for MENU_InsertItem (add if menu item not found)
     501                  (from latest Wine code;
     502                   TODO: need to sync user32 controls!)
     503</README>
     504</PAGE>
     505<PAGE INDEX=4 TYPE=CONTAINER>
     506<NEXTBUTTON TARGET=5>~Next</NEXTBUTTON>
    138507<TEXT>
    139508Please select the packages which are to be installed. You may change the target paths for the packages.
    140509</TEXT>
    141510</PAGE>
    142 <PAGE INDEX=4 TYPE=CONFIGURE>
    143 <NEXTBUTTON TARGET=5>~Next</NEXTBUTTON>
     511<PAGE INDEX=5 TYPE=CONFIGURE>
     512<NEXTBUTTON TARGET=6>~Next</NEXTBUTTON>
    144513<TEXT>
    145514Please select additional configuration that WarpIN should perform after installing this archive.
    146515</TEXT>
    147516</PAGE>
    148 <PAGE INDEX=5 TYPE=TEXT>
     517<PAGE INDEX=6 TYPE=TEXT>
    149518<NEXTBUTTON TARGET=0>I~nstall</NEXTBUTTON>
    150519<TEXT>
    … …  
    154523</WARPIN>
    155524
    156 RPIN>
    157 
    158 

  • trunk/tools/makefile

    r4620 r4712  
    1 # $Id: makefile,v 1.13 2000-11-19 08:20:55 bird Exp $
     1# $Id: makefile,v 1.14 2000-12-02 23:26:57 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       Top of the tools tree makefile
    … …  
    2121# Directory macros.
    2222#
    23 PDWIN32_INCLUDE = ..\include
    24 PDWIN32_TOOLS   = .\bin
    25 !include $(PDWIN32_INCLUDE)\pdwin32.tools
     23!include ../makefile.inc
    2624
    2725
    … …  
    4947# common rules.
    5048#
    51 dep clean all:
     49$(COMMONRULES):
    5250    $(DODIRS) "$(ALL_DIRS)" $(MAKE_CMD) $@
    5351
    … …  
    5755#
    5856needed:
    59     cd fastdep
    60     $(MAKE_CMD)
    61     cd ..\common
    62     $(MAKE_CMD) NODEP=1 dep
    63     $(MAKE_CMD) needed
    64     cd ..\impdef
    65     $(MAKE_CMD) NODEP=1 dep
    66     $(MAKE_CMD)
    67     cd ..
     57    $(DODIRS) "fastdep common impdef" $(MAKE_CMD)
    6858
    6959

  • trunk/tools/omfdumper/makefile

    r4620 r4712  
    1 # $Id: makefile,v 1.3 2000-11-19 08:26:16 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-02 23:27:02 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 # Very simple OMF/LIB dumper.
     6#       Very simple OMF/LIB dumper.
    77#
    88
    … …  
    1010# Directory macros.
    1111#
    12 PDWIN32_INCLUDE = ..\..\include
    13 PDWIN32_LIB     = ..\..\lib
    14 PDWIN32_BIN     = ..\bin
    15 PDWIN32_TOOLS   = ..\bin
    16 PDWIN32_TCOMMON = ..\common
     12ODIN32_TCOMMON = ..\common
     13ODIN32_BIN     = $(ODIN32_TOOLS)
    1714
    1815
    … …  
    2825# Compiler, tools, and interference rules.
    2926#
    30 !include $(PDWIN32_INCLUDE)\pdwin32.mk
    31 !include $(PDWIN32_TCOMMON)\common.mk
     27!include ../../makefile.inc
     28!include $(ODIN32_TCOMMON)\common.mk
    3229
    3330
    … …  
    5653# Includes the common rules.
    5754#
    58 !include $(PDWIN32_INCLUDE)\pdwin32.post
    59 !include $(PDWIN32_TCOMMON)\common.mk.post
     55!include $(ODIN32_POST_INC)
     56!include $(ODIN32_TCOMMON_POST_INC)
    6057

  • trunk/tools/regedit/makefile

    r3424 r4712  
     1# $Id: makefile,v 1.2 2000-12-02 23:27:03 bird Exp $
     2
    13#
    2 # PD-Win32 API
     4# Odin32 API
    35#
     6#       Makefile for regedit.exe.
    47#
    58
    6 PDWIN32_INCLUDE = ..\..\include
    7 PDWIN32_LIB = ..\..\lib
    8 PDWIN32_BIN = ..\..\bin
    99
    10 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    11 
    12 PROJ = regedit
    13 
    14 all: $(PROJ).exe
    15 
    16 # Define project specific macros
    17 PROJ_OBJS  = regapi.obj
    18 BASE_OBJS  = odinexe.obj
     10#
     11# Directory macros.
     12#
     13ODIN32_BIN  = $(ODIN32_TOOLS)
    1914
    2015
    21 CFLAGS     = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -DDEBUG -D__i386__
    22 CXXFLAGS   = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -DDEBUG -D__i386__
     16#
     17# Tell buildenvironment that we're making an .exe.
     18# Tell buildenvironment that we like to use static linked CRT.
     19# Tell buildenvironment that we should not copy this into /bin.
     20#
     21EXETARGET   = 1
     22NO_MAIN_BIN_COPY = 1
    2323
    24 CFLAGS = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE)
    25 CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE)
    26 LDFLAGSEXE = $(LDFLAGS) /Ge+ /B"/pmtype:pm /stack:0x30000 /NOBASE /Map" \
    27              $(EXTRA_LIBS) $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib \
    28              $(PDWIN32_LIB)\gdi32.lib os2386.lib $(PDWIN32_LIB)\odincrt.lib $(RTLLIB_O)
     24
     25#
     26# Compiler, tools, and interference rules.
     27#
     28!include ../../makefile.inc
     29
     30
     31#
     32# Set Win32APP flags.
     33#
     34CFLAGS   = $(CFLAGS_WIN32APP)
     35CXXFLAGS = $(CXXFLAGS_WIN32APP)
     36CDEFINES = $(CDEFINES_WIN32APP)
     37#LD2FLAGS = $(LD2FLAGS_WIN32APP)
     38
     39
     40#
     41# Object files. Prefix with OBJDIR and one space before the '\'.
     42#
     43OBJS= \
     44$(OBJDIR)\regapi.obj \
     45$(OBJDIR)\odinexe.obj
     46
     47
     48#
     49# Libraries. One space before the '\'.
     50#
     51LIBS = \
     52$(ODIN32_LIB)\kernel32.lib \
     53$(ODIN32_LIB)\advapi32.lib \
     54$(ODIN32_LIB)\user32.lib \
     55$(ODIN32_LIB)\gdi32.lib \
     56$(ODIN32_LIB)\$(ODINCRT).lib \
     57os2386.lib \
     58$(RTLLIB_O)
     59
     60
     61#
     62# Target name - name of the exe without extention and path.
     63#
     64TARGET = regedit
     65
     66
     67#
     68# Includes the common rules.
     69#
     70!include $(ODIN32_POST_INC)
     71
     72
     73
     74
     75#CFLAGS     = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(ODIN32_INCLUDE)\Win -D__WIN32OS2__ -DDEBUG -D__i386__
     76#CXXFLAGS   = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(ODIN32_INCLUDE)\Win -D__WIN32OS2__ -DDEBUG -D__i386__
     77#CFLAGS = $(CFLAGS) /Ge+ -I$(ODIN32_INCLUDE)
     78#CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(ODIN32_INCLUDE)
     79#LDFLAGSEXE = $(LDFLAGS) /Ge+ /B"/pmtype:pm /stack:0x30000 /NOBASE /Map" \
     80#             $(EXTRA_LIBS) $(ODIN32_LIB)\kernel32.lib $(ODIN32_LIB)\user32.lib \
     81#             $(ODIN32_LIB)\gdi32.lib os2386.lib $(ODIN32_LIB)\odincrt.lib $(RTLLIB_O)
    2982
    3083# Build rule for EXE
    31 $(PROJ).EXE: $(BASE_OBJS) $(PROJ_OBJS)
    32         $(LD) $(LDFLAGSEXE) -Fe$@ $(PROJ_OBJS) $(BASE_OBJS)
     84#$(PROJ).EXE: $(BASE_OBJS) $(PROJ_OBJS)
     85#        $(LD) $(LDFLAGSEXE) -Fe$@ $(PROJ_OBJS) $(BASE_OBJS)
    3386
    3487# Rules for cleaning out those old files
    35 clean:
    36     del *.bak *.pdb *.obj *.res *.exp *.map *.sbr *.bsc
     88#clean:
     89#    del *.bak *.pdb *.obj *.res *.exp *.map *.sbr *.bsc

  • trunk/tools/wrc/makefile.os2

    r4332 r4712  
    1 # $Id: makefile.os2,v 1.11 2000-09-28 03:06:28 bird Exp $
     1# $Id: makefile.os2,v 1.12 2000-12-02 23:27:03 bird Exp $
    22
    33
    4 PDWIN32_TOOLS = ..\bin
    5 PDWIN32_INCLUDE = ..\..\include
    6 !include $(PDWIN32_INCLUDE)\pdwin32.tools
     4ODIN32_TOOLS = ..\bin
     5ODIN32_INCLUDE = ..\..\include
     6!include $(ODIN32_INCLUDE)\odin32.tools.mk
    77
    88
    … …  
    5555dep:
    5656    $(DEPEND) -I../../include/win -I../../include -I$(C_INCLUDE_PATH) \
    57         *.h *.asm *.inc  $(PDWIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp
     57        *.h *.asm *.inc  $(ODIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp
    5858
    5959
Note: See TracChangeset for help on using the changeset viewer.