fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-11-11 04:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_b32.mak
  * make_vc.mak
  * make_gcc.mak
  * common.mak
    * Changed dll and mt obj locations to reside inside the platform dir:
      obj/dll/* -> obj/*/dll
      obj/*_mt -> obj/*/mt
    + Added provisions for new obj location:
      obj/*/mt_dll
This commit is contained in:
Viktor Szakats
2008-11-11 03:22:56 +00:00
parent 0342c6c8da
commit ff29cb14e2
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-11 04:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_b32.mak
* make_vc.mak
* make_gcc.mak
* common.mak
* Changed dll and mt obj locations to reside inside the platform dir:
obj/dll/* -> obj/*/dll
obj/*_mt -> obj/*/mt
+ Added provisions for new obj location:
obj/*/mt_dll
2008-11-11 03:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_b32.mak
* make_vc.mak

17
harbour/common.mak
View File

@@ -111,20 +111,17 @@ BIN_DIR = bin\$(HB_CC_NAME)
OBJ_DIR = obj\$(HB_CC_NAME)
LIB_DIR = lib\$(HB_CC_NAME)
MT_OBJ_DIR = obj\$(HB_CC_NAME)_mt
DLL_ROOTDIR = obj\dll
DLL_OBJ_DIR = $(DLL_ROOTDIR)\$(HB_CC_NAME)
MT_OBJ_DIR = obj\$(HB_CC_NAME)\mt
MTDLL_OBJ_DIR = obj\$(HB_CC_NAME)\mt_dll
DLL_OBJ_DIR = obj\$(HB_CC_NAME)\dll
# Targets Destination Directories
HB_DEST_DIRS = \
$(BIN_DIR) \
$(OBJ_DIR) \
$(LIB_DIR) \
$(BIN_DIR) \
$(OBJ_DIR) \
$(LIB_DIR) \
\
$(MT_OBJ_DIR) \
\
$(DLL_ROOTDIR) \
$(MT_OBJ_DIR) \
$(DLL_OBJ_DIR)
MAIN_DIR = source\main

3
harbour/make_b32.mak
View File

@@ -634,6 +634,9 @@ doClean:
@if exist $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
@if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
@if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
@if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul
@if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul
@if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul
@if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
@if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
@if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul

5
harbour/make_gcc.mak
View File

@@ -551,10 +551,13 @@ doClean:
-$(DEL) $(MT_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(MT_OBJ_DIR)/*.c
-$(DEL) $(MT_OBJ_DIR)/*.h
-$(DEL) $(INCLUDE_DIR)/hbverbld.h
-$(DEL) $(MTDLL_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(MTDLL_OBJ_DIR)/*.c
-$(DEL) $(MTDLL_OBJ_DIR)/*.h
-$(DEL) $(DLL_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(DLL_OBJ_DIR)/*.c
-$(DEL) $(DLL_OBJ_DIR)/*.h
-$(DEL) $(INCLUDE_DIR)/hbverbld.h
-$(DEL) inst_$(HB_CC_NAME).log
-$(DEL) common.cf

11
harbour/make_vc.mak
View File

@@ -87,9 +87,9 @@ MKLIB = lib.exe
# Nmake does not support macros in string
# substitution, so we have to hardcode it
DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc)
DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll)
VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc_mt)
VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc\mt)
!if "$(HB_BUILD_WINCE)" == "yes"
HARBOURFLAGS = $(HARBOURFLAGS) -gc0
@@ -903,7 +903,7 @@ $(STANDARD_SYSLIBS)
#**********************************************************
# DLL EXECUTABLE Targets
#**********************************************************
HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc)
HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\vc\dll)
$(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS)
$(LINKER) @<<
$(LDFLAGS)
@@ -914,7 +914,7 @@ $(HARBOUR_DLL:.dll=.lib)
$(COMMON_LIB)
<<$(HB_KEEPSTATE)
#**********************************************************
HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\dll\vc)
HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\vc\dll)
$(HBRUNDLL_EXE) : $(HARBOUR_DLL) $(HBRUNDLL_OBJS)
$(LINKER) @<<
$(LDFLAGS)
@@ -1018,6 +1018,9 @@ doClean:
@if exist $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
@if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
@if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
@if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul
@if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul
@if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul
@if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
@if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
@if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul