Changeset 4719 for trunk/src/pe2lx

Timestamp:

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

Author:

bird

Message:

New makefile style. (addjustments)

Location:

trunk/src/pe2lx

Files:

• makefile (modified) (4 diffs)
• makefile.wat (modified) (3 diffs)

trunk/src/pe2lx/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 2000-03-06 23:38:55 bird Exp $
+# $Id: makefile,v 1.11 2000-12-02 23:58:01 bird Exp $
 
 #
@@ -9 +9 @@
 #
 
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
+OLD_STYLE=1
+!include ../../makefile.inc
 
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-
-CFLAGS = $(CFLAGS) /Ge+ /Tm+ /I$(PDWIN32_INCLUDE) /D__PE2LX__
-CXXFLAGS = $(CXXFLAGS) -Ge+ /Tm+ /I$(PDWIN32_INCLUDE) /D__PE2LX__
+CFLAGS = $(CFLAGS) /Ge+ /Tm+ /I$(ODIN32_INCLUDE) /D__PE2LX__
+CXXFLAGS = $(CXXFLAGS) -Ge+ /Tm+ /I$(ODIN32_INCLUDE) /D__PE2LX__
 LDFLAGS = $(LDFLAGS) -Ge+
 
@@ -34 +30 @@
 $(TARGET).exe: $(OBJS)
         $(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
-        $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $(TARGET).exe $(PDWIN32_BIN)
+        $(ODIN32_LIB)\LIBCONV.LIB $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+        $(CP) $(TARGET).exe $(ODIN32_BIN)
 
 
-accelerator.obj: accelerator.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
+accelerator.obj: accelerator.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
                  accelerator.h  icon.h misc.h
-bitmap.obj: bitmap.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
+bitmap.obj: bitmap.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
             bitmap.h icon.h misc.h
-cursor.obj: cursor.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
+cursor.obj: cursor.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
             cursor.h icon.h misc.h
-cursorgrp.obj: cursorgrp.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h  \
+cursorgrp.obj: cursorgrp.cpp $(ODIN32_INCLUDE)\pefile.h lx.h  \
                cursor.h cursorgrp.h misc.h
-dialog.obj: dialog.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
+dialog.obj: dialog.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
             dialog.h misc.h
-icon.obj: icon.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h icon.h misc.h
-icongrp.obj: icongrp.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h icon.h \
+icon.obj: icon.cpp $(ODIN32_INCLUDE)\pefile.h lx.h icon.h misc.h
+icongrp.obj: icongrp.cpp $(ODIN32_INCLUDE)\pefile.h lx.h icon.h \
              icongrp.h misc.h
 lx.obj: lx.cpp lx.h
-menu.obj: menu.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h menu.h
-misc.obj: misc.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h ..\..\include\versionos2.h
-pe.obj: pe.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
+menu.obj: menu.cpp $(ODIN32_INCLUDE)\pefile.h lx.h menu.h
+misc.obj: misc.cpp $(ODIN32_INCLUDE)\pefile.h lx.h ..\..\include\versionos2.h
+pe.obj: pe.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
         accelerator.h bitmap.h cursor.h \
         cursorgrp.h dialog.h icon.h \
         icongrp.h menu.h misc.h rcdata.h \
         strings.h
-pefile.obj: pefile.cpp $(PDWIN32_INCLUDE)\pefile.h misc.h
+pefile.obj: pefile.cpp $(ODIN32_INCLUDE)\pefile.h misc.h
 rcdata.obj: rcdata.cpp lx.h rcdata.h
 strings.obj: strings.cpp lx.h misc.h strings.h
@@ -66 +62 @@
 clean:
         $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
-        $(RM) $(PDWIN32_BIN)\$(TARGET).exe
+        $(RM) $(ODIN32_BIN)\$(TARGET).exe

trunk/src/pe2lx/makefile.wat

@@ -1 @@
-# $Id: makefile.wat,v 1.3 1999-07-05 12:36:12 sandervl Exp $
+# $Id: makefile.wat,v 1.4 2000-12-02 23:58:01 bird Exp $
 
 #===================================================================
@@ -6 +6 @@
 #
 #===================================================================
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
+ODIN32_INCLUDE = ..\..\include
+ODIN32_LIB = ..\..\lib
+ODIN32_BIN = ..\..\bin
 INC     = $(%WATCOM)\h;f:\toolkit\h;.;..\..\include;..\..\include\win
 DEF     =
@@ -62 +62 @@
 FILE5   = accelerator.obj
 FILE6   = cursor.obj cursorgrp.obj
-FILE7   = $(PDWIN32_LIB)\LIBCONV.LIB
+FILE7   = $(ODIN32_LIB)\LIBCONV.LIB
 FILE8   =
 FILE9   =