20000425-11:30 GMT+1

harbour/makefile.bc

@@ -10,9 +10,9 @@
 # NOTE: You can use these envvars to configure the make process:
 #       (note that these are all optional)
 #
-#       CFLAGS       - Extra C compiler options for libraries and for 
+#       CFLAGS       - Extra C compiler options for libraries and for
 #                      executables
-#       C_USR        - Extra C compiler options for libraries and for 
+#       C_USR        - Extra C compiler options for libraries and for
 #                      executables (GNU make compatible envvar)
 #       CLIBFLAGS    - Extra C compiler options for the libraries
 #       HARBOURFLAGS - Extra Harbour compiler options
@@ -42,13 +42,13 @@ LIB_DIR = lib\b16
 !else
 
 CC = bcc32
-AS = tasm32
+AS = tasm
 
 BIN_DIR = bin\b32
 OBJ_DIR = obj\b32
 LIB_DIR = lib\b32
 
-# This is needed, otherwise the libs may overflow when 
+# This is needed, otherwise the libs may overflow when
 # debug info is requested with -v -y
 ARFLAGS = /P32
 
@@ -81,7 +81,7 @@ HBPP_DIR     = utils\hbpp
 # C compiler definition and C flags. These should never have to change.
 #
 
-CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
+CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -DHARBOUR_OBJ_GENERATION
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
@@ -312,7 +312,7 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msghuwin.obj \
    $(OBJ_DIR)\msgis850.obj \
    $(OBJ_DIR)\msgpt.obj \
-   $(OBJ_DIR)\msgro.obj 
+   $(OBJ_DIR)\msgro.obj
 
 #
 # MACRO.LIB rules
@@ -421,6 +421,8 @@ VM_LIB_OBJS = \
    $(OBJ_DIR)\pvalue.obj \
    $(OBJ_DIR)\runner.obj \
    \
+   $(OBJ_DIR)\borsym.obj \
+   $(OBJ_DIR)\startup.obj \
    $(OBJ_DIR)\symbols.obj \
    \
    $(OBJ_DIR)\harbinit.obj
@@ -882,8 +884,16 @@ $(OBJ_DIR)\runner.obj : $(VM_DIR)\runner.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\borsym.obj : $(VM_DIR)\borsym.asm
+   $(AS) -ml $**, $@
+   tlib $(VM_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\startup.obj : $(VM_DIR)\startup.asm
+   $(AS) -ml $**, $@
+   tlib $(VM_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\symbols.obj : $(VM_DIR)\symbols.asm
-   $(AS) $**, $@
+   $(AS) -ml $**, $@
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,
 
 #
@@ -2037,5 +2047,4 @@ $(OBJ_DIR)\ft_funcs.c : $(HBDOC_DIR)\ft_funcs.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\ft_funcs.obj : $(OBJ_DIR)\ft_funcs.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-
+   $(CC) $(CLIBFLAGS) -o$@ $**