23ac606bcc
* src/vm/dlmalloc.c
! Fixed two potentially uninitialized variables, signaled by MSVC.
* src/common/hbgete.c
+ Changed to use native SetEnvironmentVariable() API instead of
forced ANSI one.
* src/common/hbwince.c
* include/hbwince.h
% Deleted unused ANSI Windows API stubs.
+ Added empty SetEnvironmentVariable() stub for WinCE
builds where it's missing.
* Reconfigured these stubs:
SetCurrentDirectory()
GetCurrentDirectory()
GetComputerName()
GetUserName()
* config/win/global.mk
* Comment updated.
* config/win/msvc.mk
+ Added -nxcompat and -dynamicbase to .dll link command.
(I'm unsure what -dynamicbase is good for in a .dll, but it's
accepted and set)
! Fixed to add -nxcompat/-dynamicbase for MSVC 2008 and upper.
(it's also possible to use it with MSVS 2005 SP1 though, but
build won't detect this case)
106 lines
2.4 KiB
Makefile
106 lines
2.4 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
OBJ_EXT := .obj
|
|
LIB_PREF :=
|
|
LIB_EXT := .lib
|
|
|
|
ifeq ($(HB_CPU),x86)
|
|
# Always compile in -UNICODE mode for MSVC 9.0 and upper
|
|
# These versions don't support Win9x anymore, so it's safe. [vszakats]
|
|
ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800),)
|
|
HB_CFLAGS += -DUNICODE
|
|
endif
|
|
endif
|
|
|
|
HB_DYN_COPT := -DHB_DYNLIB
|
|
|
|
CC := cl.exe
|
|
CC_IN := -c
|
|
CC_OUT := -Fo
|
|
|
|
CFLAGS += -I. -I$(HB_INC_COMPILE)
|
|
|
|
CFLAGS += -nologo
|
|
|
|
# MSVS 2005 SP1 also supports it, but we only enable it for 2008 and upper.
|
|
ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800),)
|
|
LDFLAGS += -nxcompat -dynamicbase -fixed:no
|
|
DFLAGS += -nxcompat -dynamicbase
|
|
endif
|
|
|
|
ifeq ($(HB_BUILD_MODE),c)
|
|
CFLAGS += -TC
|
|
endif
|
|
ifeq ($(HB_BUILD_MODE),cpp)
|
|
CFLAGS += -TP
|
|
endif
|
|
# Build in C++ mode by default
|
|
ifeq ($(HB_BUILD_MODE),)
|
|
CFLAGS += -TP
|
|
endif
|
|
|
|
ifneq ($(HB_BUILD_WARN),no)
|
|
CFLAGS += -W4 -wd4127
|
|
endif
|
|
|
|
ifneq ($(HB_BUILD_OPTIM),no)
|
|
ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
|
|
CFLAGS += -Ogt2yb1p -GX- -G6 -YX
|
|
else
|
|
CFLAGS += -Ot2b1 -EHs-c-
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(HB_BUILD_DEBUG),yes)
|
|
CFLAGS += -Zi
|
|
LDFLAGS += -debug
|
|
DFLAGS += -debug
|
|
endif
|
|
|
|
ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
|
|
ifeq ($(HB_BUILD_DEBUG),yes)
|
|
CFLAGS += -MTd
|
|
else
|
|
CFLAGS += -MT
|
|
endif
|
|
endif
|
|
|
|
# # NOTE: -GA flag should be disabled when building MT _.dlls_,
|
|
# # as it creates bad code according to MS docs [vszakats].
|
|
# ifneq ($(filter $(HB_COMPILER_VER),600),)
|
|
# CFLAGS += -GA
|
|
# endif
|
|
|
|
LD := link.exe
|
|
LD_OUT := -out:
|
|
|
|
LIBPATHS := -libpath:$(LIB_DIR)
|
|
LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
|
|
|
|
LDFLAGS += -nologo $(LIBPATHS)
|
|
|
|
AR := lib.exe
|
|
AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
|
|
|
|
DY := $(LD)
|
|
DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS)
|
|
DY_OUT := $(LD_OUT)
|
|
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
|
|
|
|
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
|
define dyn_object
|
|
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp
|
|
|
|
endef
|
|
define create_dynlib
|
|
$(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
|
|
$(foreach file,$^,$(dyn_object))
|
|
$(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)" -implib:"$(IMP_FILE)" @__dyn__.tmp $(DLIBS)
|
|
endef
|
|
|
|
DY_RULE = $(create_dynlib)
|
|
|
|
include $(TOP)$(ROOT)config/rules.mk
|