Changeset 4624 for trunk/src/ddraw

Timestamp:

Nov 19, 2000, 10:27:40 AM (25 years ago)

Author:

bird

Message:

New makefile style.

File:

• trunk/src/ddraw/makefile (modified) (3 diffs)

trunk/src/ddraw/makefile

@@ -1 @@
-# $Id: makefile,v 1.24 2000-07-19 19:05:05 sandervl Exp $
+# $Id: makefile,v 1.25 2000-11-19 09:20:50 bird Exp $
 #
 # ddraw.dll makefile
@@ -10 +10 @@
 #
 
-# Directory macros.
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB     = ..\..\lib
-PDWIN32_BIN     = ..\..\$(OBJDIR)
-PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+#
 # Compiler, tools, and interference rules.
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+#
+!include ../../include/pdwin32.mk
 
 
-# Flag overloads and local macros.
-CLEANEXTRAS = ddrawrsrc.asm
-ASFLAGS     = -Sc -Sv:ALP
-
-
-# Object files. All objects should be prefixed with $(OBJDIR)!
+#
+# Object files. Prefix with OBJDIR and one space before the '\'.
+#
 OBJS = \
 $(OBJDIR)\ddraw.obj \
@@ -46 +40 @@
 
 
+#
+# Libraries. One space before the '\'.
+#
+LIBS = \
+$(PDWIN32_LIB)/ole32.lib \
+$(PDWIN32_LIB)/advapi32.lib \
+$(PDWIN32_LIB)/gdi32.lib \
+$(PDWIN32_LIB)/comctl32.lib \
+$(PDWIN32_LIB)/kernel32.lib \
+$(PDWIN32_LIB)/$(ODINCRT).lib \
+$(PDWIN32_LIB)/user32.lib \
+mmpm2.lib \
+os2386.lib \
+$(RTLLIB_O)
+
+
+#
 # Target name - name of the dll without extention and path.
+#
 TARGET = ddraw
 
 
-# All rule - build objs, target dll, copies dll to bin and makes libs.
-all:    $(OBJDIR) \
-        $(OBJDIR)\$(TARGET).dll \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        lib
-
-
-# Lib rule - build importlibrary (and evt. other libs)
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-
-# Dll rule - builds the target dll.
-$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
-    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-
-
-# 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)/ole32.lib
-$(PDWIN32_LIB)/advapi32.lib
-$(PDWIN32_LIB)/gdi32.lib
-$(PDWIN32_LIB)/comctl32.lib
-$(PDWIN32_LIB)/kernel32.lib
-$(PDWIN32_LIB)/$(ODINCRT).lib
-$(PDWIN32_LIB)/user32.lib
-mmpm2.lib
-OS2386.LIB
-$(RTLLIB_O)
-$(TARGET).def
-<<keep
-
-
-# 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
-
-
+#
 # Includes the common rules.
+#
 !include $(PDWIN32_INCLUDE)/pdwin32.post