Changeset 10222 for trunk/src/odinprof

Timestamp:

Aug 8, 2003, 5:55:34 PM (22 years ago)

Author:

sandervl

Message:

Update for libwrap

File:

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

trunk/src/odinprof/makefile

@@ -1 @@
-# $Id: makefile,v 1.4 2003-02-28 10:32:38 sandervl Exp $
+# $Id: makefile,v 1.5 2003-08-08 15:53:31 sandervl Exp $
 
 #
 # Odin32 API
 #
-#       odinprof.dll makefile
+#       odincrt.dll makefile
 #
 
@@ -12 +12 @@
 #
 NOTEXPDEF   = 1
-STATIC_CRT  = 1
 
 #
@@ -25 +24 @@
 CXXFLAGS    = $(CXXFLAGS_ODINCRT)
 LD2FLAGS    = $(LD2FLAGS_ODINCRT)
+!ifdef WITH_KLIB
+CDEFINES    = $(CDEFINES_ODINCRT) -DWITH_KLIB
+!else
 CDEFINES    = $(CDEFINES_ODINCRT)
+!endif
 IMPLIBFLAGS = $(IMPLIBFLAGS) /NOIgnoreCase
-DEFFILE     = odinprof.def
-OBJ_PROFILE =
-LIB_PROFILE =
+
+DBG=
+!ifdef DEBUG
+DBG=d
+!endif
+
+# Sorry, this looks like hell now.
+!ifdef VAC3
+! ifdef WITH_KLIB
+DEFFILE_ORG = odincrt$(DBG).def
+DEFFILE     = $(OBJDIR)\odincrt$(DBG)klib.def
+! else
+DEFFILE     = odincrt$(DBG).def
+! endif
+!endif
+!ifdef VAC36
+! ifdef WITH_KLIB
+DEFFILE_ORG = odin36$(DBG).def
+DEFFILE     = $(OBJDIR)\odin36$(DBG)klib.def
+! else
+DEFFILE     = odin36$(DBG).def
+! endif
+!endif
+!ifdef WAT
+! ifdef WITH_KLIB
+DEFFILE_ORG = odinwat$(DBG).def
+DEFFILE     = $(OBJDIR)\odinwat$(DBG)klib.def
+! else
+DEFFILE     = odinwat$(DBG).def
+! endif
+!endif
+!ifndef DEFFILE
+!error "not supported on this compiler yet."
+!endif
 
 
@@ -36 +70 @@
 #
 OBJS = \
-$(OBJDIR)\odinprof.obj \
+$(OBJDIR)\odincrt.obj \
 $(OBJDIR)\initterm.obj \
-$(OBJDIR)\profiler.obj \
-$(OBJDIR)\profasm.obj \
-$(OBJDIR)\profcollection.obj \
-$(OBJDIR)\symfile.obj
+!ifndef WAT
+!ifdef VAC3
+$(OBJDIR)\math64.obj \
+!endif
+!ifdef WITH_KLIB
+$(ODIN32_LIB)\kHeapDbgVACWrappersR3.lib \
+!endif
+$(OBJDIR)\malloc.obj \
+$(OBJDIR)\file.obj \
+$(OBJDIR)\critsect.obj \
+$(OBJDIR)\interlock.obj \
+!else
+!ifdef NMAKE
+$(WATCOM)\lib386\os2\$(RTLLIB_O)
+!else
+$(%WATCOM)\lib386\os2\$(RTLLIB_O)
+!endif
+!endif
 
 
@@ -47 +95 @@
 # Libraries. One space before the '\'.
 #
-LIBS = $(LIB_DEMANGLE)
-!if "$(LIB_DEMANGLE)" == ""
-!error demangle not configured for this compiler
+LIBS = \
+!ifdef WITH_KLIB
+$(ODIN32_LIB)\kLibR3.lib \
 !endif
-
+!ifdef WAT
+$(RTLLIB_O)
+!endif
+!ifdef VAC36
+$(SOMLIB)
+!endif
 
 #
 # Target name - name of the dll without extention and path.
 #
-TARGET = odinprof
+TARGET = $(ODINCRT)
 
 
@@ -64 +117 @@
 !include $(ODIN32_POST_INC)
 
+
+
+!ifdef DEFFILE_ORG
+# Add kLib export to the def-file.
+$(DEFFILE): Makefile $(DEFFILE_ORG)
+    $(CP) $(DEFFILE_ORG) $@
+    $(ECHO)     kHeapDbgException           @1500 >> $@
+!endif
+