diff options
| author | Greg Ercolano <erco@seriss.com> | 2009-08-30 03:45:52 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2009-08-30 03:45:52 +0000 |
| commit | af570d2be4acd55ef6c7ac0c087d271103093479 (patch) | |
| tree | e24dc3a0e8f8ef22fd463a0bef50f99c9b7ac991 | |
| parent | 41cef82137b76855cfc02f0d4c6d68162de691da (diff) | |
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.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24826dafb..18f71582f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ ENDIF(CYGWIN) 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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba964451e..5aaafc150 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,7 +30,7 @@ SET(CPPFILES 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 @@ SET(CPPFILES 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 @@ SET(CFILES 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}) |