Changeset 3031 for trunk/src/gdi32

Timestamp:

Mar 7, 2000, 12:39:20 AM (26 years ago)

Author:

bird

Message:

Makefiles are updated to new style.
Odin32 resource files are renamed to *.orc and most have changed name to avoid
name clashes for object files.

Location:

trunk/src/gdi32

Files:

• gdi32.rc (deleted)
• gdi32rsrc.orc (added)
• makefile (modified) (1 diff)

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.22 2000-02-16 14:18:10 sandervl Exp $
+# $Id: makefile,v 1.23 2000-03-06 23:38:38 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       gdi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = gdi32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\gdi32.obj \
+$(OBJDIR)\opengl.obj \
+$(OBJDIR)\callback.obj \
+$(OBJDIR)\dibsect.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\oslibgdi.obj \
+$(OBJDIR)\font.obj \
+$(OBJDIR)\text.obj \
+$(OBJDIR)\palette.obj \
+$(OBJDIR)\line.obj \
+$(OBJDIR)\oslibgpi.obj \
+$(OBJDIR)\region.obj \
+$(OBJDIR)\metafile.obj \
+$(OBJDIR)\dibitmap.obj \
+$(OBJDIR)\blit.obj \
+$(OBJDIR)\rgbcvt.obj \
+$(OBJDIR)\dbglocal.obj \
+$(OBJDIR)\gdi32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = gdi32
 
-OBJS =  gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
-        oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
-        metafile.obj dibitmap.obj blit.obj rgbcvt.obj dbglocal.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/user32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: gdi32.rc
-    $(RC) $(RCFLAGS) -o resource.asm gdi32.rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        $(TARGET)exp.def
-