Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Allow building in unicode mode with just "make -f makefile.g95 UNICODE=1"

Browse Source 
without requiring setup.h modifications.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-29 19:37:10 +00:00
parent 9a718b8623
commit e13f128877
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/gccpriv.h
View File

@@ -48,7 +48,8 @@
// Mingw runtime 1.0-20010604 has some missing _tXXXX functions, // Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
// so let's define them ourselves: // so let's define them ourselves:
#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \
&& !wxCHECK_W32API_VERSION( 1, 1 )
#ifndef _tsetlocale #ifndef _tsetlocale
#if wxUSE_UNICODE #if wxUSE_UNICODE
#define _tsetlocale _wsetlocale #define _tsetlocale _wsetlocale

4
include/wx/msw/setup0.h
View File

@@ -168,7 +168,9 @@
// Default is 0 // Default is 0
// //
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#define wxUSE_UNICODE 0 #ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0
#endif
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This // and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This

11
src/makeg95.env
View File

@@ -188,6 +188,13 @@ DLLTOOL = dlltool
########################## Compiler flags ############################# ########################## Compiler flags #############################
# Unicode defines
ifeq ($(UNICODE),1)
UNICODE_OPT = -D_UNICODE -DUNICODE -DwxUSE_UNICODE=1
else
UNICODE_OPT =
endif
# Miscellaneous compiler options # Miscellaneous compiler options
OPTIONS = -DSTRICT $(_USE_W32API_HEADER_IF_SUPPORTED) OPTIONS = -DSTRICT $(_USE_W32API_HEADER_IF_SUPPORTED)
@@ -367,9 +374,9 @@ ALL_CPPFLAGS = $(XINCLUDE) $(INC) $(CPPFLAGS) $(EXTRACPPFLAGS)
# C and C++ compiler flags for compatibility with old gcc versions # C and C++ compiler flags for compatibility with old gcc versions
REQUIRED_GCC_FLAGS = $(_STRUCT_RETURN_WORKAROUND) $(_THUNK_WORKAROUND) REQUIRED_GCC_FLAGS = $(_STRUCT_RETURN_WORKAROUND) $(_THUNK_WORKAROUND)
# C++ compiler flags # C++ compiler flags
ALL_CXXFLAGS = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CXXFLAGS) ALL_CXXFLAGS = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CXXFLAGS)
# C compiler flags # C compiler flags
ALL_CFLAGS = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CFLAGS) ALL_CFLAGS = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CFLAGS)
# Linker flags # Linker flags
ALL_LDFLAGS = $(COMMON_THREADFLAGS) $(WINDOWSLDFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS) ALL_LDFLAGS = $(COMMON_THREADFLAGS) $(WINDOWSLDFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS)
# under Cygwin, Dlls must not be linked with subsystem=windows # under Cygwin, Dlls must not be linked with subsystem=windows