Author: greg.ercolano
Date: 2009-08-29 20:45:52 -0700 (Sat, 29 Aug 2009)
New Revision: 6846
Log:
Solves STR #2244.

See also, fltk.general newgroup thread:
    Subject: "probelm to build fltk 1.3 svn using msys, gcc3.4 and cmake"
    (Dates 08/28/09 - 08/29/09)

Applied Yostane's zip file mods to the two CMakeLists.txt to support 
msys/gcc3.4/cmake environment. Verified consistency, fixed indents.



Modified:
   branches/branch-1.3/CMakeLists.txt
   branches/branch-1.3/src/CMakeLists.txt

Modified: branches/branch-1.3/CMakeLists.txt
===================================================================
--- branches/branch-1.3/CMakeLists.txt  2009-08-28 20:14:41 UTC (rev 6845)
+++ branches/branch-1.3/CMakeLists.txt  2009-08-30 03:45:52 UTC (rev 6846)
@@ -76,7 +76,7 @@
 
 IF(MINGW)
   ADD_DEFINITIONS(-DWIN32)
-  SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid wsock32 gdi32 comdlg32)
+  SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 gdi32 comdlg32)
 ENDIF(MINGW)
 
 INCLUDE(CheckIncludeFiles)

Modified: branches/branch-1.3/src/CMakeLists.txt
===================================================================
--- branches/branch-1.3/src/CMakeLists.txt      2009-08-28 20:14:41 UTC (rev 
6845)
+++ branches/branch-1.3/src/CMakeLists.txt      2009-08-30 03:45:52 UTC (rev 
6846)
@@ -30,7 +30,7 @@
   Fl_Menu.cxx
   Fl_Menu_.cxx
   Fl_Menu_Bar.cxx
-       Fl_Sys_Menu_Bar.cxx
+  Fl_Sys_Menu_Bar.cxx
   Fl_Menu_Button.cxx
   Fl_Menu_Window.cxx
   Fl_Menu_add.cxx
@@ -124,7 +124,8 @@
   fl_show_colormap.cxx
   fl_symbols.cxx
   fl_vertex.cxx
-       screen_xywh.cxx
+  screen_xywh.cxx
+  fl_utf8.cxx
   )
 SET(FLCPPFILES
   forms_compatability.cxx
@@ -164,6 +165,13 @@
   scandir.c
   numericsort.c
   vsnprintf.c
+  xutf8/is_right2left.c
+  xutf8/is_spacing.c
+  xutf8/case.c
+  xutf8/utf8Input.c
+  xutf8/utf8Utils.c
+  xutf8/utf8Wrap.c
+  fl_utf.c
   )
 
 ADD_LIBRARY(fltk ${CPPFILES} ${CFILES})

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to