Changeset 2174 for trunk/src/ddraw/makefile

Timestamp:

Dec 21, 1999, 2:28:20 AM (26 years ago)

Author:

hugh

Message:

Added ODIn lic header with ID to all files where missing

Cleaned up Surface handling by movefing colorfill and
colorconversion into own files and use functionpointers
setup during creation.

updated makefile to add files

removed inhertiance from IBASE in DDrectangle class

File:

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

trunk/src/ddraw/makefile

@@ -1 @@
-#
-# PD-Win32 API
+# $Id: makefile,v 1.16 1999-12-21 01:28:20 hugh Exp $
 #
 # ddraw.dll makefile
+#
+# Copyright 1998 Sander van Leeuwen
+#           1999 Markus Montkowski
+#
+# Project Odin Software License can be found in LICENSE.TXT
+#
 #
 
@@ -20 +25 @@
 OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj iccio1.obj asmutil.obj\
         os2surface.obj os2palette.obj os2palset.obj rectangle.obj initterm.obj \
-        os2util.obj bltFunc.obj
+        os2util.obj bltFunc.obj fillfunc.obj colorconv.obj
 
 
-LIBS =  ..\..\lib\pmwinx.lib mmpm2.lib ..\..\lib\comctl32.lib $(PDWIN32_LIB)\advapi32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\gdi32.lib $(PDWIN32_LIB)\comctl32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+LIBS =  $(PDWIN32_LIB)\pmwinx.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)
 
 all: $(TARGET).dll $(TARGET).lib
@@ -78 +85 @@
     os2surface.h \
     os2ddraw.h\
+    rectangle.h \
     $(PDWIN32_INCLUDE)\win\ddraw.h \
     $(PDWIN32_INCLUDE)\win\d3d.h
 
-rectangle.obj: rectangle.cpp
+rectangle.obj: rectangle.cpp rectangle.h
 
 initterm.obj: initterm.cpp initterm.h
@@ -88 +96 @@
 
 bltFunc.obj: bltFunc.cpp bltFunc.h \
+    $(PDWIN32_INCLUDE)\misc.h
+
+fillfunc.obj: fillfunc.cpp fillfunc.h \
+    $(PDWIN32_INCLUDE)\misc.h
+
+colorconv.obj: colorconv.cpp colorconv.h \
     $(PDWIN32_INCLUDE)\misc.h