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

2009-08-15 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.cf
    + Added new plans for further setting cleanup.

  * config/global.cf
  * config/rules.cf
  * config/dos/watcom.cf
  * config/win/watcom.cf
  * config/os2/watcom.cf
    + Added HB_CFLAGS, HB_PRGFLAGS. These will now replace all
      Makefile level manipulation of flags. Should eventually
      replace all HB_USER_*FLAGS, HB_GCMODE, HB_INC_DEPEND,
      HB_CUNICODE, HB_CDBG and HB_FLAGSEXTRA variables, if everything
      goes well.

  * contrib/hbwin/wapi_winuser.c
    + Added WAPI_GETKEYSTATE().
This commit is contained in:
Viktor Szakats
2009-08-15 16:33:06 +00:00
parent fa8119350a
commit 57c051a829
7 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,24 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-15 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.cf
+ Added new plans for further setting cleanup.
* config/global.cf
* config/rules.cf
* config/dos/watcom.cf
* config/win/watcom.cf
* config/os2/watcom.cf
+ Added HB_CFLAGS, HB_PRGFLAGS. These will now replace all
Makefile level manipulation of flags. Should eventually
replace all HB_USER_*FLAGS, HB_GCMODE, HB_INC_DEPEND,
HB_CUNICODE, HB_CDBG and HB_FLAGSEXTRA variables, if everything
goes well.
* contrib/hbwin/wapi_winuser.c
+ Added WAPI_GETKEYSTATE().
2009-08-15 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/none.cf
* config/global.cf

2
harbour/config/dos/watcom.cf
View File

@@ -60,7 +60,7 @@ endif
ifeq ($(CC),wcc386)
ifneq ($(HB_HOST_ARCH),linux)
CPPFLAGS := $(subst /,\,$(CPPFLAGS))
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_CFLAGS)) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
endif
endif

32
harbour/config/global.cf
View File

@@ -212,20 +212,19 @@ ifeq ($(HB_INIT_DONE),)
# Some additional ones to be given a standard name:
# HB_HOST_BUILD [yes|all|lib] -> HB_BUILD_LIBONLY (rest is redundant and can be controlled by other means)
# HB_XBUILD -> HB_INC_NODEFAULT ?
# HB_XBUILD -> HB_BUILD_INCDEF
# HB_WITHOUT_* -> HB_HAS_*
# HB_REBUILD_PARSER -> HB_BUILD_PARSER
# HB_DB_DRVEXT -> -
# HB_COMMERCE
# HB_CRS_LIB
# HB_BUILD_VERBOSE ok
# HB_BIN_COMPILE
# HB_INC_COMPILE -> -
# HB_COMMERCE -> ?
# HB_CRS_LIB -> HB_LIB_CURSES
# HB_BUILD_VERBOSE [ OK ]
# HB_BIN_COMPILE -> HB_BUILD_BIN_DIR
# HB_INC_COMPILE -> - (HB_BUILD_INC_DIR)
# HB_GPM_MOUSE -> HB_HAS_GPM
# HB_POSTINST
# HB_ROOTPOSTINST
# HB_POSTINSTPARAM
# HB_GCMODE
# HB_POSTINST -> ?
# HB_ROOTPOSTINST -> ?
# HB_POSTINSTPARAM -> ?
# HB_GPM_NOICE_DISABLE -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE
# HB_GT_CRS_BCEHACK -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
# HB_NCURSES_194 -> HB_USER_CFLAGS=-DHB_NCURSES_194
@@ -649,6 +648,15 @@ else
HB_UNIX_COMPATIBLE := yes
endif
# Reserve variables for local compiler flags. Makefiles
# should only modify these instead of HB_USER_* variables
# as these can have bad side effects (doubly added values)
# caused by recursive GNU Make runs.
# Notice that even single lib/bin builds will currently
# result in recursive runs, see rule 'descend'. [vszakats]
HB_CFLAGS :=
HB_PRGFLAGS :=
HB_CROSS_BUILD :=
ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
ifeq ($(HB_BIN_COMPILE),)
@@ -732,7 +740,7 @@ ifeq ($(HB_COMMERCE),yes)
export HB_WITHOUT_GTSLN := yes
endif
# Detect OpenSSL
# Detect OpenSSL lib
ifeq ($(HB_HAS_OPENSSL),)
HB_HAS_OPENSSL := no
ifneq ($(HB_ARCHITECTURE),dos)
@@ -875,7 +883,7 @@ export HB_INSTALL_PREFIX
ifneq ($(HB_INSTALL_PREFIX_ORI),$(HB_INSTALL_PREFIX))
ifneq ($(MAKE_381),)
$(info ! HB_INSTALL_PREFIX set to $(HB_INSTALL_PREFIX))
$(info ! HB_INSTALL_PREFIX set to: $(HB_INSTALL_PREFIX))
endif
endif

2
harbour/config/os2/watcom.cf
View File

@@ -62,7 +62,7 @@ endif
ifeq ($(CC),wcc386)
ifneq ($(HB_HOST_ARCH),linux)
CPPFLAGS := $(subst /,\,$(CPPFLAGS))
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_CFLAGS)) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
endif
endif

8
harbour/config/rules.cf
View File

@@ -33,14 +33,14 @@ HB_RULE = $(HB) $? -n1 $(HB_INC_DEPEND) $(HB_FLAGS) -gc$(HB_GCMODE) $(HB_FLAGSEX
# The rule to compile a C source file.
ifeq ($(CC_RULE),)
CC_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
CC_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
ifneq ($(HB_BUILD_DLL),no)
ifeq ($(HB_DYN_COMPILE),yes)
ifneq ($(LIBNAME),)
ifneq ($(findstring $(LIBNAME),$(HB_DYN_LIBS)),)
define cc_comp_all
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=_dyn$(OBJ_EXT)) -DHB_DYNLIB $(CC_IN) $<
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=_dyn$(OBJ_EXT)) -DHB_DYNLIB $(CC_IN) $<
endef
CC_RULE = $(cc_comp_all)
@@ -52,7 +52,7 @@ endif
# The rule to compile a C++ source file.
ifeq ($(CPP_RULE),)
CPP_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
CPP_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(HB_CUNICODE) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
endif
# The rule to link an executable.

2
harbour/config/win/watcom.cf
View File

@@ -64,7 +64,7 @@ endif
ifeq ($(CC),wcc386)
ifneq ($(HB_HOST_ARCH),linux)
CPPFLAGS := $(subst /,\,$(CPPFLAGS))
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
CC_RULE = $(CC) $(subst /,\,$(HB_INC_DEPEND)) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_CFLAGS)) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CUNICODE) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
endif
endif

5
harbour/contrib/hbwin/wapi_winuser.c
View File

@@ -59,6 +59,11 @@
#include <winuser.h>
HB_FUNC( WAPI_GETKEYSTATE )
{
hb_retni( GetKeyState( hb_parni( 1 ) ) );
}
HB_FUNC( WAPI_GETDESKTOPWINDOW )
{
hb_retptr( GetDesktopWindow() );