Changeset 4712 for trunk/tools/common
- Timestamp:
- Dec 3, 2000, 12:27:03 AM (25 years ago)
- Location:
- trunk/tools/common
- Files:
-
- 1 added
- 2 deleted
- 6 edited
-
common.mak (modified) (3 diffs)
-
common.mk (modified) (4 diffs)
-
common.mk.post (deleted)
-
common.post.mk (added)
-
kDef2Wat.mak (modified) (4 diffs)
-
kDump.mak (modified) (4 diffs)
-
makefile (modified) (6 diffs)
-
makefile.gcc (modified) (4 diffs)
-
makefile.icc (deleted)
Legend:
- Unmodified
- Added
- Removed
-
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 2 3 # 3 4 # Odin32 API … … 17 18 # Compiler, tools, and interference rules. 18 19 # 19 !include ../../ include/pdwin32.mk20 !include ../../makefile.inc 20 21 21 22 … … 40 41 # Includes the common rules. 41 42 # 42 !include $( PDWIN32_INCLUDE)/pdwin32.post43 !include $(ODIN32_POST_INC) 43 44 -
trunk/tools/common/common.mk
r4654 r4712 1 # $Id: common.mk,v 1. 3 2000-11-21 04:37:22bird Exp $1 # $Id: common.mk,v 1.4 2000-12-02 23:26:57 bird Exp $ 2 2 # 3 3 # Common definitions for tools. 4 4 # 5 # Requires that PDWIN32_TCOMMON is defined to point to the5 # Requires that ODIN32_TCOMMON is defined to point to the 6 6 # /tools/common directory 7 7 # 8 8 # 9 # Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@ pmsc.no)9 # Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no) 10 10 # 11 11 # Project Odin Software License can be found in LICENSE.TXT … … 20 20 # 21 21 !ifndef GCC 22 COMMONLIB = $( PDWIN32_TCOMMON)\$(OBJDIR)\common.lib22 COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.lib 23 23 !else 24 24 !if $(OMF) == 0 25 COMMONLIB = $( PDWIN32_TCOMMON)\$(OBJDIR)\common.a25 COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.a 26 26 !else 27 COMMONLIB = $( PDWIN32_TCOMMON)\$(OBJDIR)\common.lib27 COMMONLIB = $(ODIN32_TCOMMON)\$(OBJDIR)\common.lib 28 28 !endif 29 29 !endif … … 31 31 32 32 # 33 # Add PDWIN32_TCOMMON to the C and C++ includes.33 # Add ODIN32_TCOMMON to the C and C++ includes. 34 34 # 35 CINCLUDES = -I$( PDWIN32_TCOMMON) $(CINCLUDES)35 CINCLUDES = -I$(ODIN32_TCOMMON) $(CINCLUDES) 36 36 37 37 … … 42 42 INTLIBS = $(COMMONLIB) 43 43 44 45 # 46 # Macro for the post include. 47 # 48 ODIN32_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:22bird Exp $1 # $Id: kDef2Wat.mak,v 1.2 2000-12-02 23:26:58 bird Exp $ 2 2 3 3 # … … 11 11 # Macro which defines the tools common directory. 12 12 # 13 PDWIN32_TCOMMON = .14 PDWIN32_BIN = ..\bin 13 ODIN32_TCOMMON = . 14 ODIN32_BIN = $(ODIN32_TOOLS) 15 15 16 16 … … 31 31 # Compiler, tools, and interference rules. 32 32 # 33 !include ../../ include/pdwin32.mk34 !include $( PDWIN32_TCOMMON)/common.mk33 !include ../../makefile.inc 34 !include $(ODIN32_TCOMMON)/common.mk 35 35 36 36 … … 60 60 # Includes the common rules. 61 61 # 62 !include $( PDWIN32_INCLUDE)/pdwin32.post63 !include $( PDWIN32_TCOMMON)/common.mk.post62 !include $(ODIN32_POST_INC) 63 !include $(ODIN32_TCOMMON_POST_INC) 64 64 -
trunk/tools/common/kDump.mak
r4654 r4712 1 # $Id: kDump.mak,v 1. 1 2000-11-21 04:37:23bird Exp $1 # $Id: kDump.mak,v 1.2 2000-12-02 23:26:58 bird Exp $ 2 2 3 3 # … … 11 11 # Macro which defines the tools common directory. 12 12 # 13 PDWIN32_TCOMMON = .14 PDWIN32_BIN = ..\bin 13 ODIN32_TCOMMON = . 14 ODIN32_BIN = $(ODIN32_TOOLS) 15 15 16 16 … … 31 31 # Compiler, tools, and interference rules. 32 32 # 33 !include ../../ include/pdwin32.mk34 !include $( PDWIN32_TCOMMON)/common.mk33 !include ../../makefile.inc 34 !include $(ODIN32_TCOMMON)/common.mk 35 35 36 36 … … 60 60 # Includes the common rules. 61 61 # 62 !include $( PDWIN32_INCLUDE)/pdwin32.post63 !include $( PDWIN32_TCOMMON)/common.mk.post62 !include $(ODIN32_POST_INC) 63 !include $(ODIN32_TCOMMON_POST_INC) 64 64 -
trunk/tools/common/makefile
r4654 r4712 1 # $Id: makefile,v 1. 9 2000-11-21 04:37:23bird Exp $1 # $Id: makefile,v 1.10 2000-12-02 23:26:58 bird Exp $ 2 2 3 3 # 4 # PD-Win32 API4 # Odin32 API 5 5 # 6 6 # Tools common parts … … 22 22 # Compiler, tools, and interference rules. 23 23 # 24 !include .. \..\include\pdwin32.mk24 !include ../../makefile.inc 25 25 26 26 … … 32 32 $(OBJDIR)\common.a \ 33 33 !endif 34 $( PDWIN32_TOOLS)\kDef2Wat.exe35 # $( PDWIN32_TOOLS)\kDump.exe34 $(ODIN32_TOOLS)\kDef2Wat.exe 35 # $(ODIN32_TOOLS)\kDump.exe 36 36 37 37 … … 40 40 # 41 41 needed: $(OBJDIR)\common.lib \ 42 $( PDWIN32_TOOLS)\kDef2Wat.exe42 $(ODIN32_TOOLS)\kDef2Wat.exe 43 43 44 44 … … 61 61 # Tools. 62 62 # 63 $( PDWIN32_TOOLS)\kDump.exe $(OBJDIR)\kDump.exe kDump.exe \64 $( PDWIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe : force63 $(ODIN32_TOOLS)\kDump.exe $(OBJDIR)\kDump.exe kDump.exe \ 64 $(ODIN32_TOOLS)\kDef2Wat.exe $(OBJDIR)\kDef2Wat.exe kDef2Wat.exe : force 65 65 -@echo $@ 66 66 @$(MAKE_CMD) -f $(@B).mak all … … 81 81 dep: 82 82 $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \ 83 *.rc *.dlg $( PDWIN32_INCLUDE)\*.h -robj *.orc \83 *.rc *.dlg $(ODIN32_INCLUDE)\*.h -robj *.orc \ 84 84 -objo *.c *.cpp \ 85 85 -objgobj *.c *.cpp -
trunk/tools/common/makefile.gcc
r4620 r4712 1 # $Id: makefile.gcc,v 1. 7 2000-11-19 08:29:54bird Exp $1 # $Id: makefile.gcc,v 1.8 2000-12-02 23:26:58 bird Exp $ 2 2 3 3 # 4 # PD-Win32 API4 # Odin32 API 5 5 # 6 # Tools common library, GCC version.6 # Tools common library, GCC version. 7 7 # 8 8 # … … 20 20 # Directories and common tools. 21 21 # 22 PDWIN32_INCLUDE = ..\..\include23 PDWIN32_BIN = ..\..\bin\$(OBJDIR)24 PDWIN32_LIB = ..\..\lib25 PDWIN32_TOOLS = ..\bin26 PDWIN32_TCOMMON = ..\common27 !include $( PDWIN32_INCLUDE)\pdwin32.tools22 ODIN32_INCLUDE = ..\..\include 23 ODIN32_BIN = ..\..\bin\$(OBJDIR) 24 ODIN32_LIB = ..\..\lib 25 ODIN32_TOOLS = ..\bin 26 ODIN32_TCOMMON = ..\common 27 !include $(ODIN32_INCLUDE)\odin32.tools 28 28 29 # Definitions for pdwin32.post29 # Definitions for odin32.post 30 30 LOCALCLEAN = 1 31 31 CLEANEXTRAS = commongcc.* … … 64 64 65 65 CDEFINES = -D__WIN32OS2__ -D__WINE__ 66 CINCLUDES = -I$( PDWIN32_INCLUDE)\Win -I$(PDWIN32_INCLUDE)66 CINCLUDES = -I$(ODIN32_INCLUDE)\Win -I$(ODIN32_INCLUDE) 67 67 CPLUS_INCLUDE_PATH= $(CPLUS_INCLUDE_PATH);$(INCLUDE) 68 68 … … 120 120 121 121 # 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 123 124
Note:
See TracChangeset
for help on using the changeset viewer.
