1. gsockmsw.c compiles in Unicode mode
2. wxBase project files updated/added 3. more fixes to tmake scripts: now work for any combination of lib/dll unicode/ansi settings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,8 +58,14 @@
|
||||
# pragma warning(default:4115) /* named type definition in parentheses */
|
||||
#endif
|
||||
|
||||
/* VZ: I don't know if _T() macro is always defined here? */
|
||||
#ifdef _UNICODE
|
||||
#define CLASSNAME L"_GSocket_Internal_Window_Class"
|
||||
#define WINDOWNAME L"_GSocket_Internal_Window_Name"
|
||||
#else /* !Unicode */
|
||||
#define CLASSNAME "_GSocket_Internal_Window_Class"
|
||||
#define WINDOWNAME "_GSocket_Internal_Window_Name"
|
||||
#endif /* Unicode/!Unicode */
|
||||
|
||||
/* Maximum number of different GSocket objects at a given time.
|
||||
* This value can be modified at will, but it CANNOT be greater
|
||||
|
||||
@@ -13,10 +13,18 @@
|
||||
|
||||
#ifdef _DEBUG
|
||||
#define DLL_FLAGS 0x1L
|
||||
#define DLL_SUFFIX "d"
|
||||
#ifdef _UNICODE
|
||||
#define DLL_SUFFIX "ud"
|
||||
#else
|
||||
#define DLL_SUFFIX "d"
|
||||
#endif
|
||||
#else
|
||||
#define DLL_FLAGS 0x0L
|
||||
#define DLL_SUFFIX ""
|
||||
#ifdef _UNICODE
|
||||
#define DLL_SUFFIX "u"
|
||||
#else
|
||||
#define DLL_SUFFIX ""
|
||||
#endif
|
||||
#endif
|
||||
|
||||
1 VERSIONINFO
|
||||
@@ -43,7 +51,9 @@ BEGIN
|
||||
VALUE "PrivateBuild", "\0"
|
||||
VALUE "ProductName", "wxWindows\0"
|
||||
VALUE "ProductVersion", "2.2.1\0"
|
||||
VALUE "SpecialBuild", "\0"
|
||||
#ifdef _UNICODE
|
||||
VALUE "SpecialBuild", "Unicode build\0"
|
||||
#endif
|
||||
END
|
||||
END
|
||||
END
|
||||
|
||||
Reference in New Issue
Block a user