Changeset 212 for trunk/src

Timestamp:

Jun 26, 1999, 1:42:39 PM (26 years ago)

Author:

hugh

Message:

Updated Makefile for DX6 ddraw

File:

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

trunk/src/ddraw/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 1999-06-10 17:10:57 phaller Exp $
-
 #
 # PD-Win32 API
 #
-#       ddraw.dll makefile
+# ddraw.dll makefile
 #
 
@@ -13 +11 @@
 
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
+ASFLAGS = -Sc -Sv:ALP
 
-
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
-
+CFLAGS = $(CFLAGS) -Ft+ -I$(PDWIN32_INCLUDE);
+CXXFLAGS = $(CXXFLAGS) -Ft+ -I$(PDWIN32_INCLUDE);
 
 TARGET = ddraw
 
-OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj \
-        os2surface.obj os2palette.obj os2palset.obj initterm.obj misc.obj \
-        os2util.obj asmutil.obj
+OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj iccio1.obj asmutil.obj\
+        os2surface.obj os2palette.obj os2palset.obj misc.obj initterm.obj
 
-LIBS = pmwinx.lib mmpm2.lib $(PDWIN32_LIB)/kernel32.lib
+LIBS =  ($PDWIN32_LIB)\pmwinx.lib mmpm2.lib CPPOOC3.lib CPPOM30.lib
 
 all: $(TARGET).dll $(TARGET).lib
@@ -31 +27 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
-        $(CP) $@ $(PDWIN32_BIN)
+        $(LD) $(LDFLAGS) -Tdp -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
+  $(CP) $@ $(PDWIN32_BIN)
 
 
 $(TARGET).lib: $(TARGET).dll
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).dll
-        $(CP) $@ $(PDWIN32_LIB)
-
+  $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).dll
+  $(CP) $@ $(PDWIN32_LIB)
 
 
 ddraw.obj: ddraw.cpp  \
-    os2ddraw.h
+    os2ddraw.h        \
+    $(PDWIN32_INCLUDE)\win\ddraw.h
 
 os2ddraw.obj: os2ddraw.cpp  \
@@ -48 +44 @@
     os2clipper.h \
     os2surface.h \
-    os2ddraw.h
-
+    os2ddraw.h\
+    $(PDWIN32_INCLUDE)\win\ddraw.h \
+    $(PDWIN32_INCLUDE)\win\d3d.h
 os2d3d.obj: os2d3d.cpp \
     os2ddraw.h
 
-misc.obj: misc.c \
-    $(PDWIN32_INCLUDE)\misc.h
-
-os2util.obj: os2util.cpp \
-    os2util.h \
-    $(PDWIN32_INCLUDE)\misc.h
+misc.obj: misc.cpp
 
 os2palette.obj: os2palette.cpp  \
@@ -77 +69 @@
 
 os2surface.obj: os2surface.cpp  \
-    os2util.h \
-    asmutil.h \
     os2palette.h \
     os2clipper.h \
@@ -84 +74 @@
     os2ddraw.h
 
+
 initterm.obj: initterm.cpp
 
-asmutil.obj: asmutil.asm
-
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch  
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+  $(RM) *.obj *.lib *.dll *~ *.map *.pch
+  $(RM) $(PDWIN32_BIN)\$(TARGET).dll
+  $(RM) $(PDWIN32_LIB)\$(TARGET).lib