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

2009-09-22 02:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/vm/maindllp.c
    ! Fixed for Unicode mode (msvc2010 x64).
This commit is contained in:
Viktor Szakats
2009-09-22 00:05:35 +00:00
parent 4551f563c3
commit 084c037d63
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -17,6 +17,10 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-22 02:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/vm/maindllp.c
! Fixed for Unicode mode (msvc2010 x64).
2009-09-22 00:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/win/global.mk
+ Enabled UNICODE mode for all 64-bit Windows targets.

44
harbour/source/vm/maindllp.c
View File

@@ -62,38 +62,38 @@
#define HB_DLLSTR_( n ) HB_DLLSTR__( n )
#define HB_DLLSTR__( n ) #n
#define HB_DLL_PREF "harbour"
#define HB_DLL_PREF_MT "harbourmt"
#define HB_DLL_VER "-" HB_DLLSTR_( HB_VER_MAJOR ) HB_DLLSTR_( HB_VER_MINOR )
#define HB_DLL_EXT ".dll"
#define HB_DLL_PREF TEXT( "harbour" )
#define HB_DLL_PREF_MT TEXT( "harbourmt" )
#define HB_DLL_VER TEXT( "-" ) TEXT( HB_DLLSTR_( HB_VER_MAJOR ) ) TEXT( HB_DLLSTR_( HB_VER_MINOR ) )
#define HB_DLL_EXT TEXT( ".dll" )
#define HB_DLL_NAME TEXT( HB_DLL_PREF HB_DLL_EXT )
#define HB_DLL_NAMEMT TEXT( HB_DLL_PREF_MT HB_DLL_EXT )
#define HB_DLL_NAME HB_DLL_PREF HB_DLL_EXT
#define HB_DLL_NAMEMT HB_DLL_PREF_MT HB_DLL_EXT
#if defined( HB_OS_WIN_CE ) && defined( HB_CPU_ARM )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-wce-arm" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-wce-arm" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce-arm" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce-arm" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_MIPS )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-wce-mips" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-wce-mips" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce-mips" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce-mips" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_SH )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-wce-sh" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-wce-sh" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce-sh" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce-sh" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_CE )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-wce" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-wce" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-wce" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-wce" ) HB_DLL_EXT
#elif defined( __BORLANDC__ )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-bcc" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-bcc" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-bcc" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-bcc" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_64 ) && defined( HB_CPU_X86_64 )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-x64" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-x64" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-x64" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-x64" ) HB_DLL_EXT
#elif defined( HB_OS_WIN_64 ) && defined( HB_CPU_IA_64 )
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER "-ia64" HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER "-ia64" HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER TEXT( "-ia64" ) HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER TEXT( "-ia64" ) HB_DLL_EXT
#else
#define HB_DLL_NAME2 TEXT( HB_DLL_PREF HB_DLL_VER HB_DLL_EXT )
#define HB_DLL_NAMEMT2 TEXT( HB_DLL_PREF_MT HB_DLL_VER HB_DLL_EXT )
#define HB_DLL_NAME2 HB_DLL_PREF HB_DLL_VER HB_DLL_EXT
#define HB_DLL_NAMEMT2 HB_DLL_PREF_MT HB_DLL_VER HB_DLL_EXT
#endif
#if defined( HB_OS_WIN_CE )