Changeset 4719 for trunk/src/shell32

Timestamp:

Dec 3, 2000, 12:59:51 AM (25 years ago)

Author:

bird

Message:

New makefile style. (addjustments)

Location:

trunk/src/shell32

Files:

• makefile (modified) (4 diffs)
• old/makefile (modified) (3 diffs)

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.31 2000-11-24 13:19:12 sandervl Exp $
+# $Id: makefile,v 1.32 2000-12-02 23:57:22 bird Exp $
 
 #
@@ -11 +11 @@
 # Compiler, tools, and interference rules.
 #
-!include ../../include/pdwin32.mk
+!include ../../makefile.inc
 
 
@@ -66 +66 @@
 #
 LIBS = \
-$(PDWIN32_LIB)/kernel32.lib \
-$(PDWIN32_LIB)/user32.lib \
-$(PDWIN32_LIB)/advapi32.lib \
-$(PDWIN32_LIB)/gdi32.lib \
-$(PDWIN32_LIB)/ole32.lib \
-$(PDWIN32_LIB)/version.lib \
-$(PDWIN32_LIB)/comctl32.lib \
-$(PDWIN32_LIB)/$(ODINCRT).lib \
-$(PDWIN32_LIB)/pmwinx.lib \
-$(PDWIN32_LIB)/shlwapi.lib \
+$(ODIN32_LIB)/kernel32.lib \
+$(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/advapi32.lib \
+$(ODIN32_LIB)/gdi32.lib \
+$(ODIN32_LIB)/ole32.lib \
+$(ODIN32_LIB)/version.lib \
+$(ODIN32_LIB)/comctl32.lib \
+$(ODIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)/pmwinx.lib \
+$(ODIN32_LIB)/shlwapi.lib \
 OS2386.LIB \
 $(RTLLIB_O)
@@ -89 +89 @@
 # Includes the common rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.post
+!include $(ODIN32_POST_INC)
 

trunk/src/shell32/old/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 1999-10-09 11:11:30 sandervl Exp $
+# $Id: makefile,v 1.2 2000-12-02 23:57:22 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       shell32.dll makefile
 #
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+!error "don't work?"
 
+OLD_STYLE=1
+!include ../../../makefile.inc
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
 
@@ -30 +24 @@
 $(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)/advapi32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+              $(ODIN32_LIB)/pmwinx.lib $(ODIN32_LIB)/kernel32.lib \
+              $(ODIN32_LIB)/user32.lib $(ODIN32_LIB)/advapi32.lib \
+              $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+        $(CP) $@ $(ODIN32_BIN)
 
 
 $(TARGET).lib: $(TARGET)exp.def
         $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+        $(CP) $@ $(ODIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
@@ -64 +58 @@
 clean:
         $(RM) *.obj *.lib *.dll *~ *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+        $(RM) $(ODIN32_BIN)\$(TARGET).dll
+        $(RM) $(ODIN32_LIB)\$(TARGET).lib