From b6bde2e4569aa617c8a6af64947c688c624ed7f8 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 10 Sep 2008 23:56:49 +0000 Subject: Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- visualc/fltk.dsw | 12 +++++++ visualc/fltk.lib.dsp | 20 +++++++++++ visualc/fltkdll.dsp | 32 +++++++++++++---- visualc/utf8.dsp | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 visualc/utf8.dsp (limited to 'visualc') diff --git a/visualc/fltk.dsw b/visualc/fltk.dsw index 980bb999c..30259cf69 100644 --- a/visualc/fltk.dsw +++ b/visualc/fltk.dsw @@ -1350,6 +1350,18 @@ Package=<4> ############################################################################### +Project: "utf8"=".\utf8.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "valuators"=".\valuators.dsp" - Package Owner=<4> Package=<5> diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp index 8b60e4cb5..0e8955328 100644 --- a/visualc/fltk.lib.dsp +++ b/visualc/fltk.lib.dsp @@ -83,6 +83,10 @@ LIB32=link.exe -lib # Name "fltk - Win32 Debug" # Begin Source File +SOURCE=..\src\xutf8\case.c +# End Source File +# Begin Source File + SOURCE=..\src\filename_absolute.cxx # End Source File # Begin Source File @@ -531,6 +535,14 @@ SOURCE=..\src\Fl_Tooltip.cxx # End Source File # Begin Source File +SOURCE=..\src\fl_utf.c +# End Source File +# Begin Source File + +SOURCE=..\src\fl_utf8.cxx +# End Source File +# Begin Source File + SOURCE=..\src\Fl_Valuator.cxx # End Source File # Begin Source File @@ -595,6 +607,14 @@ SOURCE=..\src\flstring.c # End Source File # Begin Source File +SOURCE=..\src\xutf8\is_right2left.c +# End Source File +# Begin Source File + +SOURCE=..\src\xutf8\is_spacing.c +# End Source File +# Begin Source File + SOURCE=..\src\numericsort.c # End Source File # Begin Source File diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp index 5ac8a97f9..bb64f805d 100644 --- a/visualc/fltkdll.dsp +++ b/visualc/fltkdll.dsp @@ -91,6 +91,10 @@ LINK32=link.exe # Name "fltkdll - Win32 Debug" # Begin Source File +SOURCE=..\src\xutf8\case.c +# End Source File +# Begin Source File + SOURCE=..\src\filename_absolute.cxx DEP_CPP_FILEN=\ "..\fl\filename.h"\ @@ -2123,6 +2127,14 @@ DEP_CPP_FL_TO=\ # End Source File # Begin Source File +SOURCE=..\src\fl_utf.c +# End Source File +# Begin Source File + +SOURCE=..\src\fl_utf8.cxx +# End Source File +# Begin Source File + SOURCE=..\src\Fl_Valuator.cxx DEP_CPP_FL_VA=\ "..\fl\enumerations.h"\ @@ -2621,7 +2633,7 @@ DEP_CPP_FORMS_T=\ # Begin Source File SOURCE=..\src\freeglut_geometry.cxx -DEP_CPP_GL_DR=\ +DEP_CPP_FREEG=\ "..\FL\gl.h"\ "..\FL\glut.h"\ "..\src\flstring.h"\ @@ -2631,7 +2643,7 @@ DEP_CPP_GL_DR=\ # Begin Source File SOURCE=..\src\freeglut_stroke_mono_roman.cxx -DEP_CPP_GL_DR=\ +DEP_CPP_FREEGL=\ "..\FL\gl.h"\ "..\FL\glut.h"\ "..\src\flstring.h"\ @@ -2641,7 +2653,7 @@ DEP_CPP_GL_DR=\ # Begin Source File SOURCE=..\src\freeglut_stroke_roman.cxx -DEP_CPP_GL_DR=\ +DEP_CPP_FREEGLU=\ "..\FL\gl.h"\ "..\FL\glut.h"\ "..\src\flstring.h"\ @@ -2651,7 +2663,7 @@ DEP_CPP_GL_DR=\ # Begin Source File SOURCE=..\src\freeglut_teapot.cxx -DEP_CPP_GL_DR=\ +DEP_CPP_FREEGLUT=\ "..\FL\gl.h"\ "..\FL\glut.h"\ "..\src\flstring.h"\ @@ -2711,7 +2723,7 @@ DEP_CPP_GLUT_=\ "..\fl\fl_menu_item.h"\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ - "..\fl\glut.h"\ + "..\FL\glut.h"\ ".\config.h"\ # End Source File @@ -2727,12 +2739,20 @@ DEP_CPP_GLUT_F=\ "..\fl\fl_widget.h"\ "..\fl\fl_window.h"\ "..\FL\gl.h"\ - "..\fl\glut.h"\ + "..\FL\glut.h"\ ".\config.h"\ # End Source File # Begin Source File +SOURCE=..\src\xutf8\is_right2left.c +# End Source File +# Begin Source File + +SOURCE=..\src\xutf8\is_spacing.c +# End Source File +# Begin Source File + SOURCE=..\src\numericsort.c DEP_CPP_NUMER=\ "..\fl\filename.h"\ diff --git a/visualc/utf8.dsp b/visualc/utf8.dsp new file mode 100644 index 000000000..39bdb73e3 --- /dev/null +++ b/visualc/utf8.dsp @@ -0,0 +1,97 @@ +# Microsoft Developer Studio Project File - Name="utf8" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=utf8 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "utf8.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "utf8.mak" CFG="utf8 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "utf8 - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "utf8 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "utf8 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/utf8.exe" /libpath:"..\lib" +# SUBTRACT LINK32 /pdb:none /incremental:yes + +!ELSEIF "$(CFG)" == "utf8 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "utf8_" +# PROP BASE Intermediate_Dir "utf8_" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "utf8_" +# PROP Intermediate_Dir "utf8_" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 fltkd.lib imm32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/utf8d.exe" /pdbtype:sept /libpath:"..\lib" +# SUBTRACT LINK32 /pdb:none /incremental:no + +!ENDIF + +# Begin Target + +# Name "utf8 - Win32 Release" +# Name "utf8 - Win32 Debug" +# Begin Source File + +SOURCE=..\test\utf8.cxx +# End Source File +# End Target +# End Project -- cgit v1.2.3