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

2009-04-07 17:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_gnu_xmingwce.sh
  * doc/man/hbmk.1
  * bin/hb-mkdyn.sh
  * bin/postinst.bat
  * bin/hb-func.sh
  * bin/postinst.sh
  * bin/hb-mkdyn.bat
  * external/sqlite3/Makefile
  * external/libhpdf/Makefile
  * external/libpng/Makefile
  * make_gnu.bat
  * contrib/gtalleg/Makefile
  * contrib/hbsqlit3/Makefile
  * contrib/hbqt/Makefile
  * contrib/hbfbird/Makefile
  * source/vm/Makefile
  * source/vm/vmmt/Makefile
  * utils/hbmk2/hbmk2.prg
  - config/win/mingwce.cf
  - config/win/poccce.cf
  - config/win/msvcce.cf
    - Deleted targets: win/msvcce, win/mingwce, win/poccce.
      Use these instead: wce/msvcarm, wce/mingwarm, wce/poccarm
This commit is contained in:
Viktor Szakats
2009-04-07 15:41:53 +00:00
parent 7aae130f29
commit 8d7a4d4b6f
22 changed files with 69 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/ChangeLog
View File

@@ -8,6 +8,31 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-07 17:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_gnu_xmingwce.sh
* doc/man/hbmk.1
* bin/hb-mkdyn.sh
* bin/postinst.bat
* bin/hb-func.sh
* bin/postinst.sh
* bin/hb-mkdyn.bat
* external/sqlite3/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* make_gnu.bat
* contrib/gtalleg/Makefile
* contrib/hbsqlit3/Makefile
* contrib/hbqt/Makefile
* contrib/hbfbird/Makefile
* source/vm/Makefile
* source/vm/vmmt/Makefile
* utils/hbmk2/hbmk2.prg
- config/win/mingwce.cf
- config/win/poccce.cf
- config/win/msvcce.cf
- Deleted targets: win/msvcce, win/mingwce, win/poccce.
Use these instead: wce/msvcarm, wce/mingwarm, wce/poccarm
2009-04-07 16:55 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Regression fixed after latest poccarm support additions.

18
harbour/bin/hb-func.sh
View File

@@ -89,7 +89,7 @@ mk_hbgetlibs()
if [ -z "$@" ]
then
libs=""
if [ "$HB_COMPILER" != "mingwce" ] && [ "$HB_ARCHITECTURE" != "wce" ]
if [ "$HB_ARCHITECTURE" != "wce" ]
then
libs="$libs gtwin"
fi
@@ -106,7 +106,7 @@ mk_hbgetlibsctb()
if [ -z "$@" ]
then
libs=""
if [ "$HB_COMPILER" = "mingwce" ] || [ "$HB_ARCHITECTURE" = "wce" ]
if [ "$HB_ARCHITECTURE" = "wce" ]
then
libs="$libs gtwin"
fi
@@ -192,8 +192,7 @@ mk_hbtools()
[ "${HB_COMPILER}" = "mingw64" ]; then
HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"
HB_WITHOUT_X11="yes"
elif [ "${HB_COMPILER}" = "mingwce" ] || \
[ "${HB_COMPILER}" = "mingwarm" ]; then
elif [ "${HB_COMPILER}" = "mingwarm" ]; then
HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32"
HB_WITHOUT_X11="yes"
elif [ "${HB_COMPILER}" = "djgpp" ]; then
@@ -586,8 +585,7 @@ if [ "\${HB_COMPILER}" = "mingw" ] || [ "\${HB_COMPILER}" = "mingw64" ]; then
elif [ "\${HB_MODE}" = "std" ]; then
l="hbmainstd"
fi
elif [ "\${HB_COMPILER}" = "mingwce" ] || \
[ "\${HB_COMPILER}" = "mingwarm" ]; then
elif [ "\${HB_COMPILER}" = "mingwarm" ]; then
if [ "\${HB_MODE}" = "std" ]; then
l="hbmainstd"
else
@@ -603,7 +601,7 @@ l="hbfm"
[ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt"
if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && \\
( [ -n "\${HB_FM_REQ}" ] || [ "\${HB_STATIC}" = "yes" ] ) && \\
( [ "\${HB_COMPILER}" != "mingwce" ] || [ "\${HB_FM_REQ}" = "STAT" ] ); then
( [ "\${HB_ARCHITECTURE}" != "wce" ] || [ "\${HB_FM_REQ}" = "STAT" ] ); then
if [ "\${HB_STATIC}" = "yes" ] && [ "\${HB_FM_REQ}" = "STAT" ]; then
HARBOUR_LIBS="-l\${l} \${HARBOUR_LIBS}"
else
@@ -767,8 +765,7 @@ mk_hblibso()
fi
if [ "${HB_COMPILER}" = "mingw" ] || [ "${HB_COMPILER}" = "mingw64" ]; then
linker_options="${linker_options} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"
elif [ "${HB_COMPILER}" = "mingwce" ] || \
[ "${HB_COMPILER}" = "mingwarm" ]; then
elif [ "${HB_COMPILER}" = "mingwarm" ]; then
linker_options="${linker_options} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32"
elif [ "${HB_COMPILER}" = "djgpp" ]; then
linker_options="${linker_options}"
@@ -844,8 +841,7 @@ mk_hblibso()
if [ "${HB_COMPILER}" = "mingw64" ]; then
full_lib_name="${name}-${hb_ver}-x64${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}-x64${lib_ext}"
elif [ "${HB_COMPILER}" = "mingwce" ] || \
[ "${HB_COMPILER}" = "mingwarm" ]; then
elif [ "${HB_COMPILER}" = "mingwarm" ]; then
full_lib_name="${name}-${hb_ver}-arm${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}-arm${lib_ext}"
else

28
harbour/bin/hb-mkdyn.bat
View File

@@ -26,27 +26,21 @@ set HB_DLL_LIBS_ST=hbvm
set HB_DLL_LIBS_MT=hbvmmt
if "%HB_ARCHITECTURE%" == "wce" set HB_DLL_LIBS_WIN=
if "%HB_COMPILER%" == "msvcce" set HB_DLL_LIBS_WIN=
if "%HB_COMPILER%" == "mingwce" set HB_DLL_LIBS_WIN=
if "%HB_COMPILER%" == "poccce" set HB_DLL_LIBS_WIN=
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_icc" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcce" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm" goto DO_MSVC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw" goto DO_GCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64" goto DO_GCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingwce" goto DO_GCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" goto DO_GCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_cygwin" goto DO_GCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_bcc" goto DO_BCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_owatcom" goto DO_OWATCOM
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" goto DO_POCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" goto DO_POCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" goto DO_POCC
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm" goto DO_POCC
echo Platform %HB_ARCHITECTURE% / %HB_COMPILER% isn't supported.
@@ -128,8 +122,6 @@ if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64" set _DST_NAME_ST=harbour-
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-ia64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcce" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcce" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
@@ -137,9 +129,8 @@ if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64" set _DST_NAME_MT=harbourm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-ia64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-ia64
set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcce" set _SYSLIBS=wininet.lib ws2.lib
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm" set _SYSLIBS=wininet.lib ws2.lib
if "%HB_ARCHITECTURE%" == "win" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib
if "%HB_ARCHITECTURE%" == "wce" set _SYSLIBS=wininet.lib ws2.lib
echo Making %_DST_NAME_ST%.dll... && %_BIN_LINK% /nologo /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll" @_hboneut.txt @_hbost.txt %_SYSLIBS% %HB_DLLIBS%
echo Making %_DST_NAME_MT%.dll... && %_BIN_LINK% /nologo /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll" @_hboneut.txt @_hbomt.txt %_SYSLIBS% %HB_DLLIBS%
@@ -388,15 +379,11 @@ if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _DST_NAME_ST=harbour-
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_poccce" set _SYSLIBS=wininet.lib ws2.lib
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm" set _SYSLIBS=wininet.lib ws2.lib
if "%HB_ARCHITECTURE%" == "win" set _SYSLIBS=user32.lib ws2_32.lib advapi32.lib gdi32.lib
if "%HB_ARCHITECTURE%" == "wce" set _SYSLIBS=wininet.lib ws2.lib
echo Making %_DST_NAME_ST%.dll... && polink /nologo /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll" @_hboneut.txt @_hbost.txt %_SYSLIBS% %HB_DLLIBS%
echo Making %_DST_NAME_MT%.dll... && polink /nologo /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll" @_hboneut.txt @_hbomt.txt %_SYSLIBS% %HB_DLLIBS%
@@ -479,14 +466,11 @@ if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw" set _DST_NAME_ST=harbour-
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingwce" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingwce" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-arm
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-arm
set _SYSLIBS=-luser32 -lws2_32 -ladvapi32 -lgdi32
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingwce" set _SYSLIBS=-lwininet -lws2
if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _SYSLIBS=-lwininet -lws2
if "%HB_ARCHITECTURE%" == "win" set _SYSLIBS=-luser32 -lws2_32 -ladvapi32 -lgdi32
if "%HB_ARCHITECTURE%" == "wce" set _SYSLIBS=-lwininet -lws2
echo Making %_DST_NAME_ST%.dll... && %HB_CCPREFIX%gcc -shared -o "%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll" %_HBOST% %HB_USER_LDFLAGS% %_SYSLIBS% %HB_DLLIBS% -Wl,--output-def,"%HB_BIN_INSTALL%\%_DST_NAME_ST%.def"
echo Making %_DST_NAME_MT%.dll... && %HB_CCPREFIX%gcc -shared -o "%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll" %_HBOMT% %HB_USER_LDFLAGS% %_SYSLIBS% %HB_DLLIBS% -Wl,--output-def,"%HB_BIN_INSTALL%\%_DST_NAME_MT%.def"

3
harbour/bin/hb-mkdyn.sh
View File

@@ -133,8 +133,7 @@ if [ "${SLIB_EXT}" = ".dylib" ]; then
ln -sf "${FULLNAME}" "${DSTDIR}${BASE}${SLIB_EXT}"
elif [ "${SLIB_EXT}" = ".dll" ]; then
FULLNAME="${LIB_NAME}${SLIB_EXT}"
if [ "$HB_COMPILER" = "mingwce" ] || \
[ "$HB_COMPILER" = "mingwarm" ]; then
if [ "$HB_COMPILER" = "mingwarm" ]; then
SYSLIBS=" -lwininet -lws2"
else
SYSLIBS="-luser32 -lws2_32 -ladvapi32 -lgdi32"

1
harbour/bin/postinst.bat
View File

@@ -30,7 +30,6 @@ if not "%OS%" == "Windows_NT" goto end
if "%HB_COMPILER%" == "mingw" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingw64" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingwce" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingwarm" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "cygwin" set HB_DYNLIB=yes

2
harbour/bin/postinst.sh
View File

@@ -44,7 +44,6 @@ if [ "$HB_COMPILER" = "gcc" ] || \
[ "$HB_COMPILER" = "gpp" ] || \
[ "$HB_COMPILER" = "mingw" ] || \
[ "$HB_COMPILER" = "mingw64" ] || \
[ "$HB_COMPILER" = "mingwce" ] || \
[ "$HB_COMPILER" = "mingwarm" ] || \
[ "$HB_COMPILER" = "cygwin" ] || \
[ "$HB_COMPILER" = "djgpp" ] || \
@@ -102,7 +101,6 @@ then
[ "$HB_COMPILER" = "gpp" ] || \
[ "$HB_COMPILER" = "mingw" ] || \
[ "$HB_COMPILER" = "mingw64" ] || \
[ "$HB_COMPILER" = "mingwce" ] || \
[ "$HB_COMPILER" = "mingwarm" ] || \
[ "$HB_COMPILER" = "icc" ]; then
mk_hblibso "${hb_root}"

155
harbour/config/win/mingwce.cf
View File

@@ -1,155 +0,0 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
HB_FLAGSEXTRA = -D__PLATFORM__WINCE
OBJ_EXT = .o
EXE_EXT = .exe
LIB_PREF = lib
LIB_EXT = .a
# Favor size for CE builds.
HB_GCMODE=0
CC = $(HB_CCPREFIX)gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
# Use -O2 instead of -O3 here.
CFLAGS += -O2
CFLAGS += -fomit-frame-pointer
endif
ifeq ($(HB_BUILD_DEBUG),yes)
CFLAGS += -g
endif
LD = $(HB_CCPREFIX)gcc
LD_OUT = -o
LINKPATHS =
LDLIBS =
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += -L$(LIB_DIR)
else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LDLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
LDLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang
# HB_SCREEN_LIB=ncurses
# HB_SCREEN_LIB=slang
ifneq ($(HB_SCREEN_LIB),)
LDLIBS += -l$(HB_SCREEN_LIB)
endif
# Add the optional user path(s)
ifneq ($(LNK_USR_PATH),)
LINKPATHS += $(foreach path, $(LNK_USR_PATH), -L$(path))
endif
# Add the optional user libarary (or libraries)
ifneq ($(LNK_USR_LIB),)
LDLIBS += $(foreach lib, $(LNK_USR_LIB), -l$(lib))
endif
SYSLIBS = -lwininet -lws2
# for contribs
SYSLIBS += -lcommdlg -lcommctrl -luuid -lole32
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# It causes that every echo command will be separated by LF
define lib_object
echo. ADDMOD $(file) >> __lib__.tmp
endef
# We have to use script to overcome the DOS limit of max 128 characters
# in commmand line
define create_library
echo. CREATE $(LIB_DIR)/$@ > __lib__.tmp
$(foreach file, $(^F), $(lib_object))
echo. SAVE >> __lib__.tmp
echo. END >> __lib__.tmp
$(AR) $(ARFLAGS) -M < __lib__.tmp
endef
# NOTE: The empty line below HAVE TO exist!
define link_file
echo. $(file) >> __link__.tmp
endef
define search_dir
echo. SEARCH_DIR($(file)) >> __link__.tmp
endef
ifneq ($(strip $(LDLIBS)),)
define libs_list
echo. GROUP( >> __link__.tmp
$(foreach file, $(LDLIBS), $(link_file))
echo. ) >> __link__.tmp
endef
else
libs_list=
endif
define link_exe_file
echo. INPUT( >> __link__.tmp
$(foreach file, $(^F), $(link_file))
echo. ) >> __link__.tmp
$(libs_list)
$(foreach file, $(subst -L,,$(LINKPATHS)), $(search_dir))
echo. GROUP( >> __link__.tmp
$(foreach file, $(SYSLIBS), $(link_file))
echo. ) >> __link__.tmp
-$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp
endef
LDFLAGS =
AR = $(HB_CCPREFIX)ar
ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(HB_CCPREFIX)ranlib
ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
ifneq ($(OS),Windows_NT)
AR_RULE = $(create_library)
LD_RULE = $(link_exe_file)
endif
endif
ifeq ($(AR_RULE),)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR)/$@
# our libs have a lot of cross referenced now and we have to group them
# until we won't have cleaned them
LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)
endif
include $(TOP)$(ROOT)config/rules.cf

90
harbour/config/win/msvcce.cf
View File

@@ -1,90 +0,0 @@
#
# $Id$
#
# Work in progress. Please test.
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
HB_FLAGSEXTRA = -D__PLATFORM__WINCE
OBJ_EXT = .obj
EXE_EXT = .exe
LIB_PREF =
LIB_EXT = .lib
# Favor size for CE builds.
HB_GCMODE=0
ifeq ($(HB_VISUALC_VER_PRE80),)
CC = cl.exe
else
CC = clarm.exe
endif
CC_IN = -c
CC_OUT = -Fo
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -nologo -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
ifeq ($(HB_BUILD_MODE),c)
CFLAGS += -TC
endif
ifeq ($(HB_BUILD_MODE),cpp)
CFLAGS += -TP
endif
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -W4
endif
ifneq ($(HB_BUILD_OPTIM),no)
ifeq ($(HB_VISUALC_VER_PRE80),)
CFLAGS += -Od -Os -Gy -GS- -EHsc- -Gm -Zi -GR-
else
CFLAGS += -Oxsb1 -EHsc -YX -GF
endif
endif
ifeq ($(HB_BUILD_DEBUG),yes)
CFLAGS += -Zi
endif
ifeq ($(HB_VISUALC_VER_PRE80),)
LD = cl.exe
else
LD = clarm.exe
endif
LD_OUT = -Fe
LINKPATHS += /link
LINKPATHS += /subsystem:windowsce,4.20 /machine:arm /armpadcode /stack:65536,4096 /nodefaultlib:"oldnames.lib"
LINKPATHS += /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf
ifeq ($(HB_VISUALC_VER_PRE80),)
LINKPATHS += /manifest:no
endif
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += /libpath:$(LIB_DIR)
else
LINKPATHS += /libpath:$(HB_LIB_COMPILE)
endif
# Add all libraries specified in CONTRIBS and LIBS.
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif
LDFLAGS = $(LINKPATHS)
AR = lib.exe
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

80
harbour/config/win/poccce.cf
View File

@@ -1,80 +0,0 @@
#
# $Id$
#
# GNU Make file for Pelles ISO C Compiler for WinCE
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
HB_FLAGSEXTRA = -D__PLATFORM__WINCE
OBJ_EXT = .obj
EXE_EXT = .exe
LIB_PREF =
LIB_EXT = .lib
# Favor size for CE builds.
HB_GCMODE=0
CC = pocc.exe
CC_IN = -c
CC_OUT = -Fo
CPPFLAGS = -I.
CPPFLAGS += -Ze -Go
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -W1
endif
ifneq ($(HB_BUILD_OPTIM),no)
CPPFLAGS += -Ot
# -Ox: can cause GPF in 4.50/5.00, so it's disabled.
endif
# For Pocket PC and ARM processors (including XScale)
CPPFLAGS += -Tarm-coff -D_M_ARM -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE
ifneq ($(HB_INC_COMPILE),)
CPPFLAGS += -I$(HB_INC_COMPILE)
endif
ifeq ($(HB_BUILD_DEBUG),yes)
CPPFLAGS += -Zi
endif
CFLAGS =
LD = polink.exe
LD_OUT = -OUT:
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += -LIBPATH:$(LIB_DIR)
else
LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif
LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib
ifeq ($(HB_GT_LIB),gtgui)
LDFLAGS += /SUBSYSTEM:WINDOWS
endif
AR = polib.exe
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/contrib/gtalleg/Makefile
View File

@@ -8,12 +8,10 @@ LIBNAME=gtalleg
ifneq ($(HB_COMPILER),pocc)
ifneq ($(HB_COMPILER),pocc64)
ifneq ($(HB_COMPILER),poccce)
ifneq ($(HB_COMPILER),poccarm)
ifneq ($(HB_COMPILER),xcc)
ifneq ($(HB_COMPILER),dmc)
ifneq ($(HB_COMPILER),owatcom)
ifneq ($(HB_COMPILER),mingwce)
ifneq ($(HB_COMPILER),mingwarm)
ifeq ($(HB_INC_ALLEGRO),)

1
harbour/contrib/hbfbird/Makefile
View File

@@ -7,7 +7,6 @@ ROOT = ../../
LIBNAME=hbfbird
ifneq ($(HB_COMPILER),pocc64)
ifneq ($(HB_COMPILER),poccce)
ifneq ($(HB_COMPILER),poccarm)
ifeq ($(HB_INC_FIREBIRD),)

3
harbour/contrib/hbqt/Makefile
View File

@@ -29,9 +29,6 @@ endif
ifeq ($(HB_COMPILER),pocc64)
HB_WITH_QT=no
endif
ifeq ($(HB_COMPILER),poccce)
HB_WITH_QT=no
endif
ifeq ($(HB_COMPILER),poccarm)
HB_WITH_QT=no
endif

1
harbour/contrib/hbsqlit3/Makefile
View File

@@ -8,7 +8,6 @@ LIBNAME=hbsqlit3
ifneq ($(HB_COMPILER),pocc)
ifneq ($(HB_COMPILER),pocc64)
ifneq ($(HB_COMPILER),poccce)
ifneq ($(HB_COMPILER),poccarm)
ifeq ($(HB_INC_SQLITE3),)

5
harbour/doc/man/hbmk.1
View File

@@ -121,9 +121,10 @@ Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}
Defaults and feature support vary by architecture/compiler.
Supported <comp> values for each supported <arch> value:
linux: gcc, gpp, owatcom, icc, mingw, mingwce
linux: gcc, gpp, owatcom, icc
darwin: gcc
win: mingw, msvc, bcc, owatcom, icc, pocc, cygwin, mingwce, msvc64, msvcia64, msvcce, pocc64, poccce
win: mingw, msvc, bcc, owatcom, icc, pocc, cygwin, msvc64, msvcia64, pocc64
wce: mingwarm, msvcarm, poccarm
os2: gcc, owatcom
dos: djgpp, owatcom
bsd, hpux, sunos: gcc

6
harbour/external/libhpdf/Makefile vendored
View File

@@ -18,12 +18,6 @@ endif
ifeq ($(HB_COMPILER),pocc64)
HB_WITH_LIBHPDF=no
endif
ifeq ($(HB_COMPILER),poccce)
HB_WITH_LIBHPDF=no
endif
ifeq ($(HB_COMPILER),mingwce)
HB_WITH_LIBHPDF=no
endif
ifeq ($(HB_ARCHITECTURE),wce)
HB_WITH_LIBHPDF=no
endif

3
harbour/external/libpng/Makefile vendored
View File

@@ -22,9 +22,6 @@ endif
ifeq ($(HB_ARCHITECTURE),dos)
HB_WITH_LIBPNG=yes
endif
ifeq ($(HB_COMPILER),poccce)
HB_WITH_LIBPNG=no
endif
ifeq ($(HB_COMPILER),poccarm)
HB_WITH_LIBPNG=no
endif

12
harbour/external/sqlite3/Makefile vendored
View File

@@ -5,15 +5,6 @@
HB_BUILD_WARN = no
HB_BUILD_MODE = c
ifeq ($(HB_COMPILER),mingwce)
HB_USER_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_COMPILER),msvcce)
HB_USER_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_COMPILER),poccce)
HB_USER_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_ARCHITECTURE),wce)
HB_USER_CFLAGS += -D_WIN32_WCE
endif
@@ -35,9 +26,6 @@ endif
ifeq ($(HB_COMPILER),bcc)
HB_WITH_SQLITE3=no
endif
ifeq ($(HB_COMPILER),poccce)
HB_WITH_SQLITE3=no
endif
ifeq ($(HB_COMPILER),poccarm)
HB_WITH_SQLITE3=no
endif

1
harbour/make_gnu.bat
View File

@@ -119,7 +119,6 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
if "%HB_COMPILER%" == "mingw" goto DO_GCC
if "%HB_COMPILER%" == "mingw64" goto DO_GCC
if "%HB_COMPILER%" == "mingwce" goto DO_GCC
if "%HB_COMPILER%" == "mingwarm" goto DO_GCC
if "%HB_COMPILER%" == "cygwin" goto DO_GCC

4
harbour/make_gnu_xmingwce.sh
View File

@@ -17,8 +17,8 @@ UNAME=`uname`
UNAMEL=`echo "$UNAME"|tr A-Z a-z`
UNAMEU=`echo "$UNAME"|tr a-z A-Z`
export HB_ARCHITECTURE=win
export HB_COMPILER=mingwce
export HB_ARCHITECTURE=wce
export HB_COMPILER=mingwarm
if [ "$OSTYPE" = "msdosdjgpp" ]; then
HB_HOST_ARCH="dos"

6
harbour/source/vm/Makefile
View File

@@ -8,11 +8,7 @@ ifeq ($(HB_ARCHITECTURE),win)
ifeq ($(HB_COMPILER),mingw)
C_MAIN = mainwin.c
else
ifeq ($(HB_COMPILER),mingwce)
C_MAIN = mainwin.c
else
C_MAIN = mainstd.c mainwin.c
endif
C_MAIN = mainstd.c mainwin.c
endif
DIRS = mainstd mainwin maindllh maindllp
else

6
harbour/source/vm/vmmt/Makefile
View File

@@ -11,11 +11,7 @@ ifeq ($(HB_ARCHITECTURE),win)
ifeq ($(HB_COMPILER),mingw)
C_MAIN = mainwin.c
else
ifeq ($(HB_COMPILER),mingwce)
C_MAIN = mainwin.c
else
C_MAIN = mainstd.c mainwin.c
endif
C_MAIN = mainstd.c mainwin.c
endif
else
ifeq ($(HB_ARCHITECTURE),wce)

86
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -484,7 +484,7 @@ PROCEDURE Main( ... )
DO CASE
CASE t_cARCH $ "bsd|hpux|sunos|linux" .OR. t_cARCH == "darwin" /* Separated to avoid match with 'win' */
IF t_cARCH == "linux"
aCOMPSUP := { "gcc", "gpp", "owatcom", "icc", "mingw", "mingwce" }
aCOMPSUP := { "gcc", "gpp", "owatcom", "icc" }
ELSE
aCOMPSUP := { "gcc" }
ENDIF
@@ -538,8 +538,7 @@ PROCEDURE Main( ... )
{ {|| FindInPath( "cygstart" ) != NIL }, "cygwin" },;
{ {|| FindInPath( "xcc" ) != NIL }, "xcc" } }
aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "icc", "pocc", "xcc", "cygwin",;
"mingw64", "msvc64", "msvcia64", "iccia64", "pocc64",;
"mingwce", "msvcce", "poccce" }
"mingw64", "msvc64", "msvcia64", "iccia64", "pocc64" }
cBin_CompPRG := "harbour" + t_cHBPOSTFIX + ".exe"
s_aLIBHBGT := { "gtwin", "gtwvt", "gtgui" }
t_cGTDEFAULT := "gtwin"
@@ -632,7 +631,6 @@ PROCEDURE Main( ... )
aCOMPDET_LOCAL := {;
{ {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw" , "" } ,;
{ {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw64" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-pc-mingw32-" } ,;
{ {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingwce" , "arm-wince-mingw32ce-" } ,;
{ {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-" } }
ENDIF
@@ -1200,12 +1198,6 @@ PROCEDURE Main( ... )
make it the first source file specified. */
DEFAULT s_cPROGNAME TO FN_NameGet( s_cFIRST )
IF t_cCOMP == "mingwce" .OR. ;
t_cCOMP == "msvcce" .OR. ;
t_cCOMP == "poccce"
t_cGTDEFAULT := "gtwvt"
ENDIF
IF s_cGT == t_cGTDEFAULT
s_cGT := NIL
ENDIF
@@ -1422,7 +1414,6 @@ PROCEDURE Main( ... )
CASE ( t_cARCH == "win" .AND. t_cCOMP == "gcc" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "mingw" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "mingw64" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "mingwce" ) .OR. ;
( t_cARCH == "wce" .AND. t_cCOMP == "mingwarm" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "cygwin" )
@@ -1442,7 +1433,7 @@ PROCEDURE Main( ... )
cBin_Lib := t_cCCPATH + "\" + cBin_Lib
cBin_CompC := t_cCCPATH + "\" + cBin_CompC
ENDIF
IF !( t_cCOMP == "mingwce" ) .AND. !( t_cARCH == "wce" )
IF !( t_cARCH == "wce" )
IF s_lGUI
cOpt_CompC += " -mwindows"
ELSE
@@ -1456,7 +1447,7 @@ PROCEDURE Main( ... )
AAdd( s_aLIBPATH, "{DB}" )
ENDIF
IF ! lStopAfterCComp
IF t_cCOMP $ "mingw|mingw64|mingwce|mingwarm"
IF t_cCOMP $ "mingw|mingw64|mingwarm"
cOpt_CompC += " -Wl,--start-group {LL} -Wl,--end-group"
ELSE
cOpt_CompC += " {LL}"
@@ -1475,20 +1466,12 @@ PROCEDURE Main( ... )
AAdd( s_aOPTC, "-o{OE}" )
ENDIF
IF ! s_lSHARED
IF t_cCOMP == "mingwce"
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl" } )
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "uuid", "ole32" } )
ELSE
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
ENDIF
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
ENDIF
DO CASE
CASE t_cCOMP == "mingw64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64",;
"harbour-" + cDL_Version_Alter + "-x64" ) }
CASE t_cCOMP == "mingwce"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
"harbour-" + cDL_Version_Alter + "-arm" ) }
CASE t_cCOMP == "mingwarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
"harbour-" + cDL_Version_Alter + "-arm" ) }
@@ -1503,13 +1486,13 @@ PROCEDURE Main( ... )
AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) )
ENDIF
IF t_cCOMP $ "mingw|mingw64|mingwce|mingwarm" .AND. Len( s_aRESSRC ) > 0
IF t_cCOMP $ "mingw|mingw64|mingwarm" .AND. Len( s_aRESSRC ) > 0
IF Len( s_aRESSRC ) == 1
cBin_Res := t_cCCPREFIX + "windres"
cOpt_Res := "{LR} -o {LS}"
cResExt := ".o"
ELSE
OutErr( "hbmk: Warning: Resource files ignored. Multiple ones not supported with mingw/mingw64/mingwce/mingwarm." + hb_osNewLine() )
OutErr( "hbmk: Warning: Resource files ignored. Multiple ones not supported with mingw/mingw64/mingwarm." + hb_osNewLine() )
ENDIF
ENDIF
@@ -1778,10 +1761,9 @@ PROCEDURE Main( ... )
ENDIF
CASE ( t_cARCH == "win" .AND. t_cCOMP $ "msvc|msvc64|msvcia64|icc|iccia64" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "msvcce" ) .OR. ;
( t_cARCH == "wce" .AND. t_cCOMP == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */
IF s_lDEBUG
IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
IF t_cCOMP == "msvcarm"
AAdd( s_aOPTC, "-Zi" )
ELSE
AAdd( s_aOPTC, "-MTd -Zi" )
@@ -1814,7 +1796,7 @@ PROCEDURE Main( ... )
AAdd( s_aOPTC, "-Fm" )
AAdd( s_aOPTD, "-Fm" )
ENDIF
IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
IF t_cCOMP == "msvcarm"
/* NOTE: Copied from .cf. Probably needs cleaning. */
AAdd( s_aOPTC, "-D_WIN32_WCE=0x420" )
AAdd( s_aOPTC, "-DUNDER_CE=0x420" )
@@ -1854,12 +1836,7 @@ PROCEDURE Main( ... )
IF s_lSHARED
AAdd( s_aOPTL, "/libpath:{DB}" )
ENDIF
IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl" } )
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "uuid", "ole32" } )
ELSE
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
ENDIF
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
DO CASE
CASE t_cCOMP $ "msvc|icc"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + cLibExt,;
@@ -1870,7 +1847,7 @@ PROCEDURE Main( ... )
CASE t_cCOMP $ "msvcia64|iccia64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-ia64" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-ia64" + cLibExt ) }
CASE t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
CASE t_cCOMP == "msvcarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-arm" + cLibExt ) }
ENDCASE
@@ -1889,7 +1866,6 @@ PROCEDURE Main( ... )
CASE ( t_cARCH == "win" .AND. t_cCOMP == "pocc" ) .OR. ;
( t_cARCH == "win" .AND. t_cCOMP == "pocc64" ) .OR. ; /* NOTE: Cross-platform: win/amd64 on win/x86 */
( t_cARCH == "win" .AND. t_cCOMP == "poccce" ) .OR. ;
( t_cARCH == "wce" .AND. t_cCOMP == "poccarm" ) .OR. ; /* NOTE: Cross-platform: wce/ARM on win/x86 */
( t_cARCH == "win" .AND. t_cCOMP == "xcc" )
@@ -1922,7 +1898,7 @@ PROCEDURE Main( ... )
AAdd( s_aOPTC, "/Tx86-coff" )
CASE t_cCOMP == "pocc64"
AAdd( s_aOPTC, "/Tamd64-coff" )
CASE t_cCOMP == "poccce" .OR. t_cCOMP == "poccarm"
CASE t_cCOMP == "poccarm"
AAdd( s_aOPTC, "/Tarm-coff" )
ENDCASE
cOpt_Res := "{LR}"
@@ -1950,17 +1926,12 @@ PROCEDURE Main( ... )
IF s_lDEBUG
AAdd( s_aOPTL, "/debug" )
ENDIF
IF t_cCOMP == "poccce"
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl" } )
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "uuid", "ole32" } )
ELSE
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
ENDIF
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
DO CASE
CASE t_cCOMP == "pocc64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-x64" + cLibExt ) }
CASE t_cCOMP == "poccce" .OR. t_cCOMP == "poccarm"
CASE t_cCOMP == "poccarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-arm" + cLibExt ) }
OTHERWISE
@@ -1976,11 +1947,6 @@ PROCEDURE Main( ... )
/* TODO */
CASE t_cARCH == "linux" .AND. t_cCOMP == "icc"
CASE t_cARCH == "linux" .AND. t_cCOMP == "mingwce" /* NOTE: Cross-platform: wce/ARM on win/x86 */
IF ! s_lSHARED
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl" } )
s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "uuid", "ole32" } )
ENDIF
ENDCASE
IF lCreateDyn .AND. t_cARCH $ "win|wce"
@@ -2016,9 +1982,9 @@ PROCEDURE Main( ... )
"LNK4217: locally defined symbol ... imported in function ..."
if using 'dllimport'. [vszakats] */
tmp := ""
CASE t_cCOMP $ "gcc|mingw|mingw64|mingwce|mingwarm|cygwin" ; tmp := "__attribute__ (( dllimport ))"
CASE t_cCOMP $ "bcc|owatcom" ; tmp := "__declspec( dllimport )"
OTHERWISE ; tmp := "_declspec( dllimport )"
CASE t_cCOMP $ "gcc|mingw|mingw64|mingwarm|cygwin" ; tmp := "__attribute__ (( dllimport ))"
CASE t_cCOMP $ "bcc|owatcom" ; tmp := "__declspec( dllimport )"
OTHERWISE ; tmp := "_declspec( dllimport )"
ENDCASE
/* Create list of requested symbols */
@@ -2605,7 +2571,7 @@ STATIC FUNCTION ListCookLib( arraySrc, cPrefix, cExtNew )
LOCAL cDir
LOCAL cLibName
IF t_cCOMP $ "gcc|gpp|mingw|mingw64|mingwce|mingwarm|djgpp|cygwin"
IF t_cCOMP $ "gcc|gpp|mingw|mingw64|mingwarm|djgpp|cygwin"
FOR EACH cLibName IN array
hb_FNameSplit( cLibName, @cDir )
IF Empty( cDir )
@@ -2746,7 +2712,7 @@ STATIC FUNCTION PathSepToTarget( cFileName, nStart )
DEFAULT nStart TO 1
IF t_cARCH $ "win|wce|dos|os2" .AND. !( t_cCOMP $ "mingw|mingw64|mingwce|mingwarm|cygwin" )
IF t_cARCH $ "win|wce|dos|os2" .AND. !( t_cCOMP $ "mingw|mingw64|mingwarm|cygwin" )
RETURN Left( cFileName, nStart - 1 ) + StrTran( SubStr( cFileName, nStart ), "/", "\" )
ENDIF
@@ -3286,7 +3252,7 @@ STATIC FUNCTION getFirstFunc( cFile )
LOCAL cFuncList, cExecNM, cFuncName, cExt, cLine, n, c
cFuncName := ""
IF t_cCOMP $ "gcc|gpp|mingw|mingw64|mingwce|mingwarm|cygwin"
IF t_cCOMP $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin"
hb_FNameSplit( cFile,,, @cExt )
IF cExt == ".c"
FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) )
@@ -3333,10 +3299,7 @@ STATIC FUNCTION commandResult( cCommand, nResult )
PROCEDURE PlatformPRGFlags( aOPTPRG )
IF !( t_cARCH == hb_Version( HB_VERSION_BUILD_ARCH ) ) .OR. ;
t_cARCH == "wce" .OR. ;
t_cCOMP == "mingwce" .OR. ;
t_cCOMP == "poccce" .OR. ;
t_cCOMP == "msvcce"
t_cARCH == "wce"
#if defined( __PLATFORM__WINDOWS )
AAdd( aOPTPRG, "-undef:__PLATFORM__WINDOWS" )
@@ -3365,10 +3328,7 @@ PROCEDURE PlatformPRGFlags( aOPTPRG )
#endif
DO CASE
CASE t_cARCH == "wce" .OR. ;
t_cCOMP == "mingwce" .OR. ;
t_cCOMP == "poccce" .OR. ;
t_cCOMP == "msvcce"
CASE t_cARCH == "wce"
AAdd( aOPTPRG, "-D__PLATFORM__WINDOWS" )
AAdd( aOPTPRG, "-D__PLATFORM__WINCE" )
CASE t_cARCH == "win"
@@ -3731,7 +3691,7 @@ STATIC PROCEDURE ShowHelp( lLong )
" Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}" ,;
" - Defaults and feature support vary by architecture/compiler." ,;
" - Supported <comp> values for each supported <arch> value:" ,;
" linux : gcc, owatcom, icc, mingw, mingwce" ,;
" linux : gcc, owatcom, icc" ,;
" darwin : gcc" ,;
" win : mingw, msvc, bcc, owatcom, icc, pocc, cygwin," ,;
" mingw64, msvc64, msvcia64, iccia64, pocc64, xcc" ,;