From b83d95b9ee906a2590f767f9d92312078ab69ad6 Mon Sep 17 00:00:00 2001 From: VincentWei Date: Wed, 1 Nov 2017 10:05:09 +0800 Subject: [PATCH] cleanup; resolve most of warnings (not used variables) --- CMakeLists.txt | 1 - configure.ac | 43 ++++++++++++++++---------------- include/common.h | 4 +++ minigui.pc.in | 2 +- src/client/Makefile.am | 2 +- src/control/Makefile.am | 2 +- src/control/bidiedit.c | 14 +++++++---- src/control/button.c | 10 +++++--- src/control/combobox.c | 12 +++++---- src/control/edit.c | 10 +++++--- src/control/menubutton.c | 6 ++--- src/control/propsheet.c | 2 ++ src/control/scrollbar.c | 2 -- src/control/scrolled.c | 9 ++++--- src/control/scrollview.c | 4 ++- src/ex_ctrl/Makefile.am | 2 +- src/ex_ctrl/listview.c | 43 ++++++++++++++++++++------------ src/ex_ctrl/monthcalendar.c | 8 +++--- src/font/Makefile.am | 4 +-- src/font/bitmapfont.c | 3 ++- src/font/bitmapfont.h | 4 +-- src/font/charset-arabic.c | 4 +-- src/font/in-core/Makefile.am | 2 +- src/gui/Makefile.am | 2 +- src/gui/lf_classic.c | 8 +----- src/gui/lf_flat.c | 12 +-------- src/gui/lf_skin.c | 9 +------ src/gui/menu.c | 8 +++--- src/gui/window.c | 16 ++++-------- src/ial/Makefile.am | 2 +- src/ial/dlcustom/Makefile.am | 2 +- src/ial/native/Makefile.am | 2 +- src/ial/netial/Makefile.am | 2 +- src/ial/nexusial/Makefile.am | 2 +- src/ial/pcxvfbial.c | 6 ++--- src/image/Makefile.am | 2 +- src/ime/Makefile.am | 2 +- src/kernel/Makefile.am | 2 +- src/kernel/desktop.c | 4 +-- src/libc/Makefile.am | 2 +- src/main/Makefile.am | 2 +- src/misc/Makefile.am | 2 +- src/mybmp/Makefile.am | 2 +- src/newgal/Makefile.am | 2 +- src/newgal/bf533/Makefile.am | 2 +- src/newgal/commlcd/Makefile.am | 2 +- src/newgal/dfb/Makefile.am | 3 +-- src/newgal/dummy/Makefile.am | 2 +- src/newgal/em85xxosd/Makefile.am | 2 +- src/newgal/em85xxyuv/Makefile.am | 2 +- src/newgal/em86gfx/Makefile.am | 2 +- src/newgal/fbcon/Makefile.am | 3 +-- src/newgal/gdl/Makefile.am | 3 +-- src/newgal/hisi/Makefile.am | 2 +- src/newgal/mb93493/Makefile.am | 3 +-- src/newgal/mlshadow/Makefile.am | 2 +- src/newgal/mstar/Makefile.am | 2 +- src/newgal/nexus/Makefile.am | 2 +- src/newgal/pcxvfb/Makefile.am | 2 +- src/newgal/qvfb/Makefile.am | 2 +- src/newgal/rtos_xvfb/Makefile.am | 2 +- src/newgal/s3c6410/Makefile.am | 2 +- src/newgal/shadow/Makefile.am | 2 +- src/newgal/sigma8654/Makefile.am | 2 +- src/newgal/stgfb/Makefile.am | 2 +- src/newgal/svpxxosd/Makefile.am | 2 +- src/newgal/utpmc/Makefile.am | 2 +- src/newgal/wvfb/Makefile.am | 2 +- src/newgal/xlib/Makefile.am | 2 +- src/newgdi/Makefile.am | 2 +- src/server/Makefile.am | 2 +- src/standalone/Makefile.am | 2 +- src/sysres/Makefile.am | 2 +- src/sysres/bmp/Makefile.am | 2 +- src/sysres/cursor/Makefile.am | 2 +- src/sysres/font/Makefile.am | 2 +- src/sysres/icon/Makefile.am | 2 +- src/textedit/Makefile.am | 2 +- 78 files changed, 177 insertions(+), 179 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5fb7ab8..f8ea70b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,7 +554,6 @@ set (prefix ${CMAKE_INSTALL_PREFIX}) set (exec_prefix "\${prefix}") set (libdir "\${exec_prefix}/lib") set (includedir "\${prefix}/include") -set (MiniGUI_VERSION ${MINIGUI_VERSION}) configure_file( "${PROJECT_SOURCE_DIR}/minigui.pc.in" "${PROJECT_BINARY_DIR}/${PROJECT_NICKNAME}.pc") diff --git a/configure.ac b/configure.ac index 73bab339..c4238994 100644 --- a/configure.ac +++ b/configure.ac @@ -14,26 +14,26 @@ dnl Set various version strings - taken gratefully from the SDL sources # if backwards compatibility has been broken, # set MINIGUI_BINARY_AGE and MINIGUI_INTERFACE_AGE to 0. # -MiniGUI_MAJOR_VERSION=3 -MiniGUI_MINOR_VERSION=0 -MiniGUI_MICRO_VERSION=13 -MiniGUI_INTERFACE_AGE=0 -MiniGUI_BINARY_AGE=0 -MiniGUI_VERSION=$MiniGUI_MAJOR_VERSION.$MiniGUI_MINOR_VERSION.$MiniGUI_MICRO_VERSION +MINIGUI_MAJOR_VERSION=3 +MINIGUI_MINOR_VERSION=0 +MINIGUI_MICRO_VERSION=13 +MINIGUI_INTERFACE_AGE=0 +MINIGUI_BINARY_AGE=0 +MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION -AC_SUBST(MiniGUI_MAJOR_VERSION) -AC_SUBST(MiniGUI_MINOR_VERSION) -AC_SUBST(MiniGUI_MICRO_VERSION) -AC_SUBST(MiniGUI_INTERFACE_AGE) -AC_SUBST(MiniGUI_BINARY_AGE) -AC_SUBST(MiniGUI_VERSION) +AC_SUBST(MINIGUI_MAJOR_VERSION) +AC_SUBST(MINIGUI_MINOR_VERSION) +AC_SUBST(MINIGUI_MICRO_VERSION) +AC_SUBST(MINIGUI_INTERFACE_AGE) +AC_SUBST(MINIGUI_BINARY_AGE) +AC_SUBST(MINIGUI_VERSION) dnl ======================================================================== dnl libtool versioning -LT_RELEASE=$MiniGUI_MAJOR_VERSION.$MiniGUI_MINOR_VERSION -LT_CURRENT=`expr $MiniGUI_MICRO_VERSION - $MiniGUI_INTERFACE_AGE` -LT_REVISION=$MiniGUI_INTERFACE_AGE -LT_AGE=`expr $MiniGUI_BINARY_AGE - $MiniGUI_INTERFACE_AGE` +LT_RELEASE=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION +LT_CURRENT=`expr $MINIGUI_MICRO_VERSION - $MINIGUI_INTERFACE_AGE` +LT_REVISION=$MINIGUI_INTERFACE_AGE +LT_AGE=`expr $MINIGUI_BINARY_AGE - $MINIGUI_INTERFACE_AGE` AC_SUBST(LT_RELEASE) AC_SUBST(LT_CURRENT) @@ -1386,15 +1386,15 @@ if test "x$build_png_support" != "xno"; then build_png_support=no, -lz -lm) fi -AC_DEFINE_UNQUOTED(MINIGUI_MAJOR_VERSION, $MiniGUI_MAJOR_VERSION, +AC_DEFINE_UNQUOTED(MINIGUI_MAJOR_VERSION, $MINIGUI_MAJOR_VERSION, [Major version of MiniGUI]) -AC_DEFINE_UNQUOTED(MINIGUI_MINOR_VERSION, $MiniGUI_MINOR_VERSION, +AC_DEFINE_UNQUOTED(MINIGUI_MINOR_VERSION, $MINIGUI_MINOR_VERSION, [Minor version of MiniGUI]) -AC_DEFINE_UNQUOTED(MINIGUI_MICRO_VERSION, $MiniGUI_MICRO_VERSION, +AC_DEFINE_UNQUOTED(MINIGUI_MICRO_VERSION, $MINIGUI_MICRO_VERSION, [Micro version of MiniGUI]) -AC_DEFINE_UNQUOTED(MINIGUI_INTERFACE_AGE, $MiniGUI_INTERFACE_AGE, +AC_DEFINE_UNQUOTED(MINIGUI_INTERFACE_AGE, $MINIGUI_INTERFACE_AGE, [Interface age of MiniGUI]) -AC_DEFINE_UNQUOTED(MINIGUI_BINARY_AGE, $MiniGUI_BINARY_AGE, +AC_DEFINE_UNQUOTED(MINIGUI_BINARY_AGE, $MINIGUI_BINARY_AGE, [Binary age of MiniGUI]) dnl ======================================================================== @@ -2543,3 +2543,4 @@ if [[ $? -ne 0 ]]; then else echo "Done." fi + diff --git a/include/common.h b/include/common.h index d72a312c..4c0ec176 100644 --- a/include/common.h +++ b/include/common.h @@ -56,12 +56,16 @@ # endif # endif # else +# undef PACKAGE +# undef VERSION # undef PACKAGE_BUGREPORT # undef PACKAGE_NAME # undef PACKAGE_STRING # undef PACKAGE_TARNAME # undef PACKAGE_VERSION # include "mgconfig.h" +# undef PACKAGE +# undef VERSION # undef PACKAGE_BUGREPORT # undef PACKAGE_NAME # undef PACKAGE_STRING diff --git a/minigui.pc.in b/minigui.pc.in index b1076bbe..9f2b89f3 100644 --- a/minigui.pc.in +++ b/minigui.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: MiniGUI Description: A windowing system for embedded system. -Version: @MiniGUI_VERSION@ +Version: @MINIGUI_VERSION@ Requires: Libs: -L${libdir} -lminigui_@MGLIB_SUFFIX@ @MINIGUI_LIBRARIES_LIST@ Libs.private: diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 2be8e1f8..d9e10f20 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libclient.la diff --git a/src/control/Makefile.am b/src/control/Makefile.am index 23c8c2c0..06f57cf1 100644 --- a/src/control/Makefile.am +++ b/src/control/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libcontrol.la diff --git a/src/control/bidiedit.c b/src/control/bidiedit.c index dec33452..05fec871 100644 --- a/src/control/bidiedit.c +++ b/src/control/bidiedit.c @@ -409,7 +409,7 @@ static BOOL check_sel_edge(int* p, int* num, PBIDISLEDITDATA sled) return FALSE; } - if(!*num > 1) return TRUE; + if (!(*num > 1)) return TRUE; if(sled->selStart == p[0] && (sled->selEnd+1) == p[1]){ p[1] -= 1; } @@ -596,7 +596,9 @@ sleSetSel (HWND hWnd, PBIDISLEDITDATA sled, int sel_start, int sel_end) */ static void set_caret_pos (HWND hWnd, PBIDISLEDITDATA sled, int x, BOOL bSel) { +#ifdef _DEBUG int out_chars = 0; +#endif int out_glyphs = 0; HDC hdc; SIZE txtsize; @@ -606,15 +608,19 @@ static void set_caret_pos (HWND hWnd, PBIDISLEDITDATA sled, int x, BOOL bSel) sleWindowToContent (sled, &x); if (x - sled->startx <= 0) { +#ifdef _DEBUG out_chars = 0; +#endif txtsize.cx = 0; } else { out_glyphs = GetGlyphsExtentPoint (hdc, GLYPHS, GLYPHSLEN, x - sled->startx, &txtsize); +#ifdef _DEBUG if(out_glyphs <= GLYPHSLEN){ out_chars = get_glyph_text_index(sled, out_glyphs); } +#endif _MG_PRINTF ("editPos=%d,out_chars=%d\n", out_glyphs, out_chars); } if (!bSel) { @@ -2101,13 +2107,13 @@ static void esleft_input_char_refresh (HWND hWnd, PBIDISLEDITDATA sled, char *charBuffer, int chars) { - int old_caretpos_x, cur_caretpos_x; + int old_caretpos_x; int old_sel_start, old_sel_end; int old_sel_start_x, old_sel_end_x, cur_sel_start_x; RECT scroll_rc, refresh_rc; int scroll_len; int old_edit_pos_x, cur_edit_pos_x; - int old_nContX, cur_ncontx; + int old_nContX; //char_size is width of input chars; sel_size is width of the selected area int char_size, sel_size; int glyphs_len_x; @@ -2128,8 +2134,6 @@ esleft_input_char_refresh (HWND hWnd, calc_glyph_pos_cx(hWnd, sled, sled->editPos, &cur_edit_pos_x); calc_glyph_pos_cx(hWnd, sled, old_sel_start, &cur_sel_start_x); - cur_ncontx = sled->nContX; - cur_caretpos_x = get_caretpos_x(hWnd); char_size = cur_edit_pos_x - cur_sel_start_x; sel_size = abs(old_sel_start_x - old_sel_end_x); diff --git a/src/control/button.c b/src/control/button.c index 08c4a686..58bfd7d8 100644 --- a/src/control/button.c +++ b/src/control/button.c @@ -462,11 +462,13 @@ static void paint_content_focus(HDC hdc, PCONTROL pctrl, RECT* prc_cont) BOOL is_get_fmt = FALSE; gal_pixel old_pixel; RECT focus_rc; - int status, type; const WINDOW_ELEMENT_RENDERER* win_rdr; + /* Not used vars. + int status, type; status = BUTTON_STATUS (pctrl); type = BUTTON_TYPE (pctrl); + */ win_rdr = GetWindowInfo((HWND)pctrl)->we_rdr; /*draw button content*/ @@ -592,16 +594,18 @@ static int ctrlst_rdrst[12] = { static void paint_check_radio_btn (HDC hdc, PCONTROL pctrl) { const WINDOW_ELEMENT_RENDERER* win_rdr; - gal_pixel text_pixel; int rdr_st; RECT rcClient; RECT rcContent; RECT rcBitmap; - win_rdr = GetWindowInfo((HWND)pctrl)->we_rdr; + + /* Not used vars + gal_pixel text_pixel; text_pixel = GetWindowElementPixelEx((HWND)pctrl, hdc, WE_FGC_WINDOW); + */ rdr_st = ctrlst_rdrst [ BUTTON_STATUS (pctrl) & (BST_POSE_MASK|BST_CHECK_MASK) ]; diff --git a/src/control/combobox.c b/src/control/combobox.c index 42fa28ef..f7290f72 100644 --- a/src/control/combobox.c +++ b/src/control/combobox.c @@ -84,11 +84,10 @@ static void ComboBoxDrawSpinButton (HWND hwnd, HDC hdc , int which, int status) PCOMBOBOXDATA pData; PCONTROL pCtrl; const WINDOWINFO *win_info; - DWORD main_3d, fg_3d; + DWORD fg_3d; BOOL bGetDC = FALSE; - if(hdc == 0) - { + if (hdc == 0) { bGetDC = TRUE; hdc = GetClientDC(hwnd); } @@ -97,8 +96,11 @@ static void ComboBoxDrawSpinButton (HWND hwnd, HDC hdc , int which, int status) win_info = GetWindowInfo(hwnd); pData = (PCOMBOBOXDATA)pCtrl->dwAddData2; - main_3d = GetWindowElementAttr(hwnd,WE_MAINC_THREED_BODY); - fg_3d = GetWindowElementAttr(hwnd,WE_FGC_THREED_BODY); + /* not used var + DWORD main_3d; + main_3d = GetWindowElementAttr(hwnd, WE_MAINC_THREED_BODY); + */ + fg_3d = GetWindowElementAttr(hwnd, WE_FGC_THREED_BODY); if(which == 0) status = LFRDR_BTN_STATUS_NORMAL; diff --git a/src/control/edit.c b/src/control/edit.c index 3e298b05..52b0e465 100644 --- a/src/control/edit.c +++ b/src/control/edit.c @@ -963,7 +963,6 @@ static void esright_backspace_refresh(HWND hWnd, PSLEDITDATA sled, int del) scroll_rc.right = sled->rcVis.right; old_caret_x = get_caretpos_x(hWnd); - sleInsertText_refresh (hWnd, sled, NULL, del); edtSetCaretPos (hWnd, sled); cur_caret_x = get_caretpos_x(hWnd); @@ -1648,13 +1647,13 @@ static void esleft_input_char_refresh (HWND hWnd, PSLEDITDATA sled, char *charBuffer, int chars) { - int old_caretpos_x, cur_caretpos_x; + int old_caretpos_x; int old_sel_start, old_sel_end; int old_sel_start_x, old_sel_end_x, cur_sel_start_x; RECT scroll_rc, refresh_rc; int scroll_len; int old_edit_pos_x, cur_edit_pos_x; - int old_nContX, cur_ncontx; + int old_nContX; //char_size is width of input chars; sel_size is width of the selected area int char_size, sel_size; int txtlen_x; @@ -1675,8 +1674,13 @@ esleft_input_char_refresh (HWND hWnd, calc_charpos_cx(hWnd, sled, sled->editPos, &cur_edit_pos_x); calc_charpos_cx(hWnd, sled, old_sel_start, &cur_sel_start_x); + + /* Not used var + int cur_caretpos_x, cur_ncontx; cur_ncontx = sled->nContX; cur_caretpos_x = get_caretpos_x(hWnd); + */ + char_size = cur_edit_pos_x - cur_sel_start_x; sel_size = abs(old_sel_start_x - old_sel_end_x); diff --git a/src/control/menubutton.c b/src/control/menubutton.c index d32a97a4..0b8804cf 100644 --- a/src/control/menubutton.c +++ b/src/control/menubutton.c @@ -299,7 +299,7 @@ static PMBITEM mbRemoveItem (PMENUBTNDATA mb_data, int* pos) #else static PMBITEM mbRemoveItem (PMENUBTNDATA mb_data, int* pos) { - int index = 0, found = 0; + int index = 0; PMBITEM pmbi, prev; if (!mb_data->first_item) @@ -319,7 +319,6 @@ static PMBITEM mbRemoveItem (PMENUBTNDATA mb_data, int* pos) pmbi = mb_data->first_item; while (pmbi->next) { if (*pos == index) { - found = 1; break; } @@ -328,7 +327,6 @@ static PMBITEM mbRemoveItem (PMENUBTNDATA mb_data, int* pos) index ++; } - //if (found == 1 || *pos == index) { if (*pos <= index) { prev->next = pmbi->next; return pmbi; @@ -839,7 +837,7 @@ static int MenuButtonCtrlProc (HWND hWnd, int message, WPARAM wParam, LPARAM lPa fg_color = GetWindowElementAttr (hWnd, WE_FGC_WINDOW); fc = RGBA2Pixel (hdc, GetRValue(fg_color), GetGValue(fg_color), GetBValue(fg_color), GetAValue(fg_color)); - SetTextColor (hdc, fg_color); + SetTextColor (hdc, fc); DrawText (hdc, text, -1, &rcText, uFormat); } } diff --git a/src/control/propsheet.c b/src/control/propsheet.c index 4b9c4da3..1a38797e 100644 --- a/src/control/propsheet.c +++ b/src/control/propsheet.c @@ -310,8 +310,10 @@ scroll_tab_right (HWND hwnd, PCONTROL ctrl, PPROPSHEETDATA propsheet) static void scroll_tab_left (HWND hwnd, PCONTROL ctrl, PPROPSHEETDATA propsheet) { + /* not used vars PPROPPAGE page; page = propsheet->first_display_page; + */ if (propsheet->active == propsheet->head) { return; diff --git a/src/control/scrollbar.c b/src/control/scrollbar.c index c6a27f1b..9e81bf1d 100644 --- a/src/control/scrollbar.c +++ b/src/control/scrollbar.c @@ -978,7 +978,6 @@ static int ScrollBarCtrlProc (HWND hwnd, int message, WPARAM wParam, LPARAM lPar { int pos = (int)wParam; BOOL redraw = (BOOL)lParam; - int old_pos; data = (PSCROLLBARDATA) GetWindowAdditionalData2 (hwnd); if (pos == data->curPos) @@ -994,7 +993,6 @@ static int ScrollBarCtrlProc (HWND hwnd, int message, WPARAM wParam, LPARAM lPar pos = data->maxPos; } - old_pos = data->curPos; data->curPos = pos; if (data->curPos == data->minPos) diff --git a/src/control/scrolled.c b/src/control/scrolled.c index ca078c14..23927fd1 100644 --- a/src/control/scrolled.c +++ b/src/control/scrolled.c @@ -277,19 +277,20 @@ int scrolled_content_to_visible (PSCRDATA pscrdata, int *x, int *y) /* recalc visible area and container area, then set scrollbar */ void scrolled_recalc_areas (HWND hWnd, PSCRDATA pscrdata, int new_w, int new_h) { - int old_vw, old_vh; - if (!pscrdata || new_w <= 0 || new_h <= 0) return; - old_vw = pscrdata->visibleWidth; - old_vh = pscrdata->visibleHeight; /* reset viewport as client - margin */ pscrdata->visibleWidth = new_w; pscrdata->visibleHeight = new_h; scrolled_set_visible (hWnd, pscrdata); /* + int old_vw, old_vh; + + old_vw = pscrdata->visibleWidth; + old_vh = pscrdata->visibleHeight; + if (pscrdata->nContWidth == old_vw) { pscrdata->nContWidth = pscrdata->visibleWidth; //should refresh the whole window diff --git a/src/control/scrollview.c b/src/control/scrollview.c index fca09d90..295e5f33 100644 --- a/src/control/scrollview.c +++ b/src/control/scrollview.c @@ -433,11 +433,13 @@ void scrollview_destroy (PSVDATA psvdata) int ScrollViewCtrlProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam) { PSVDATA psvdata = NULL; - PSVLIST psvlist = NULL; if (message != MSG_CREATE) { psvdata = (PSVDATA) GetWindowAdditionalData2 (hWnd); + /* not used vars + PSVLIST psvlist = NULL; psvlist = &psvdata->svlist; + */ } switch (message) { diff --git a/src/ex_ctrl/Makefile.am b/src/ex_ctrl/Makefile.am index ec20ea8b..46a9af19 100644 --- a/src/ex_ctrl/Makefile.am +++ b/src/ex_ctrl/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/control/ -I$(abs_top_srcdir)/src/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/control/ -I$(abs_top_srcdir)/src/include noinst_LTLIBRARIES = libexctrl.la diff --git a/src/ex_ctrl/listview.c b/src/ex_ctrl/listview.c index 1b04b17d..fa053f03 100644 --- a/src/ex_ctrl/listview.c +++ b/src/ex_ctrl/listview.c @@ -314,9 +314,11 @@ static void alvDrawSubItem (HWND hWnd, PLVDATA plvdata, PLSTHDR ph; UINT text_format; int nItemHeight; - DWORD fg_color, bg_color; + DWORD bg_color, fg_color; gal_pixel bc, fc; +#ifdef __TARGET_MSTUDIO__ int index; +#endif if ( !(psub = lvGetSubItemByCol(&pItem->subqueue, nCols)) ) return; @@ -326,32 +328,39 @@ static void alvDrawSubItem (HWND hWnd, PLVDATA plvdata, ph = lvGetHdrByCol (&plvdata->hdrqueue, nCols); LV_GET_SUBITEM_RECT(rcItem, nCols, rect); +#ifdef __TARGET_MSTUDIO__ index = scrollview_get_item_index(hWnd, (HSVITEM)pItem->addData); +#endif + if (!scrollview_is_item_hilight(hWnd, (HSVITEM)pItem->addData)) { + + /* NUV fg_color = GetWindowElementAttr (hWnd, WE_FGC_WINDOW); fc = RGBA2Pixel (hdc, GetRValue(fg_color), GetGValue(fg_color), GetBValue(fg_color), GetAValue(fg_color)); + */ SetTextColor (hdc, psub->nTextColor); #ifdef __TARGET_MSTUDIO__ // for mStudio only bg_color = GetWindowElementAttr (hWnd, WE_LFFLAT_TAB_NRMLCLR); - if (bg_color != -1 && index%2 == 1) { + if (bg_color != -1 && index % 2 == 1) { SetBrushColor (hdc, DWORD2PIXEL(hdc, bg_color)); FillBox (hdc, rect.left, rect.top, RECTW(rect), RECTH(rect)); } #endif } else { - fg_color = GetWindowElementAttr (hWnd, WE_FGC_HIGHLIGHT_ITEM); bg_color = GetWindowElementAttr (hWnd, WE_BGC_HIGHLIGHT_ITEM); bc = RGBA2Pixel (hdc, GetRValue(bg_color), GetGValue(bg_color), GetBValue(bg_color), GetAValue(bg_color)); + + fg_color = GetWindowElementAttr (hWnd, WE_FGC_HIGHLIGHT_ITEM); fc = RGBA2Pixel (hdc, GetRValue(fg_color), GetGValue(fg_color), GetBValue(fg_color), GetAValue(fg_color)); SetBrushColor (hdc, bc); - SetTextColor (hdc, psub->nTextColor); + SetTextColor (hdc, fc); FillBox (hdc, rect.left, rect.top, RECTW(rect), RECTH(rect)); } @@ -459,7 +468,6 @@ static void lvDrawHeader (HWND hWnd, HDC hdc) PLSTHDR p1 = NULL; PLVDATA plvdata; RECT rcClient, rcButton; - DWORD flags = DF_3DBOX_NORMAL; UINT format; list_t *me; int item_w = 0; @@ -475,8 +483,11 @@ static void lvDrawHeader (HWND hWnd, HDC hdc) plvdata = (PLVDATA) GetWindowAdditionalData2 (hWnd); GetClientRect (hWnd, &rcClient); + /* not used vars + DWORD flags = DF_3DBOX_NORMAL; if (LVSTATUS(hWnd) & LVST_HEADCLICK && LVSTATUS(hWnd) & LVST_INHEAD) flags = DF_3DBOX_PRESSED; + */ SetBkMode (hdc, BM_TRANSPARENT); @@ -1563,21 +1574,21 @@ static int ListViewCtrlProc (HWND hWnd, int message, WPARAM wParam, LPARAM lPara } else if (LVSTATUS(hWnd) & LVST_ITEMDRAG && GetWindowStyle(hWnd) & LVS_UPNOTIFY) { - HSVITEM hsvi; - int idx; + // NUV HSVITEM hsvi; + // NUV int idx; - idx = isInLVItem (mouseX, mouseY, NULL, plvdata, NULL); - hsvi = scrollview_get_item_by_index (&plvdata->svdata, idx); + // NUV idx = isInLVItem (mouseX, mouseY, NULL, plvdata, NULL); + // NUV hsvi = scrollview_get_item_by_index (&plvdata->svdata, idx); NotifyParent (hWnd, GetDlgCtrlID(hWnd), LVN_CLICKED); - /* LVS_UPNOTIFY only affects LVN_CLICKED - if (hsvi && hsvi != scrollview_get_hilighted_item + /* LVS_UPNOTIFY only affects LVN_CLICKED + if (hsvi && hsvi != scrollview_get_hilighted_item (&plvdata->svdata)) { - if ( GetWindowStyle(hWnd) & LVS_UPNOTIFY ) { - NotifyParent (hWnd, GetDlgCtrlID(hWnd), LVN_SELCHANGE); - } - } - */ + if ( GetWindowStyle(hWnd) & LVS_UPNOTIFY ) { + NotifyParent (hWnd, GetDlgCtrlID(hWnd), LVN_SELCHANGE); + } + } + */ } break; diff --git a/src/ex_ctrl/monthcalendar.c b/src/ex_ctrl/monthcalendar.c index 56824331..ca5df2d0 100644 --- a/src/ex_ctrl/monthcalendar.c +++ b/src/ex_ctrl/monthcalendar.c @@ -427,9 +427,9 @@ static void mcDrawDay (HWND hWnd, HDC hdc, PMONCALDDATA mc_data, RECT* prcMDay, int newday) { RECT rcPItemDay, rcItemDay; - PMCCOLORINFO pmcci; + // NUV PMCCOLORINFO pmcci; - pmcci = (PMCCOLORINFO) mc_data->dwClrData; + // NUV pmcci = (PMCCOLORINFO) mc_data->dwClrData; mcGetCurRect (prcMDay, &rcPItemDay, mc_data); mcUnHilightRect (hWnd, mc_data, hdc, &rcPItemDay, mc_data->cur_day); @@ -597,7 +597,7 @@ static void mcDrawCalendar (HWND hWnd, HDC hdc, PMONCALDDATA mc_data) RECT rcAML, rcAMR, rcAYL, rcAYR; DWORD dwStyle; PMCCOLORINFO pmcci; - UINT uFormat; + // NUV UINT uFormat; WINDOWINFO *info = (WINDOWINFO*)GetWindowInfo (hWnd); DWORD color; @@ -640,7 +640,7 @@ static void mcDrawCalendar (HWND hWnd, HDC hdc, PMONCALDDATA mc_data) const char* pchMon; int oldcolor; - uFormat = DT_SINGLELINE | DT_CENTER | DT_VCENTER; + // NUV uFormat = DT_SINGLELINE | DT_CENTER | DT_VCENTER; if ((dwStyle & MCS_LANG) == MCS_CHN) pchMon = chMon_C[mc_data->cur_month-1]; else if ((dwStyle & MCS_LANG) == MCS_ENG_L) diff --git a/src/font/Makefile.am b/src/font/Makefile.am index f2d71612..8fff2a84 100644 --- a/src/font/Makefile.am +++ b/src/font/Makefile.am @@ -17,8 +17,8 @@ HDR_FILES = charset.h rawbitmap.h varbitmap.h freetype.h freetype2.h qpf.h \ EXTRA_DIST = convgbmap.c jisunimap.c $(SRC_FILES) $(HDR_FILES) \ makefile.ng makefile.msvc -INCLUDES = $(FT1_INC_DIR) $(FT2_INC_DIR) -INCLUDES += -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = $(FT1_INC_DIR) $(FT2_INC_DIR) +AM_CPPFLAGS += -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include libfont_la_SOURCES = $(SRC_FILES) $(HDR_FILES) diff --git a/src/font/bitmapfont.c b/src/font/bitmapfont.c index 043d1dcb..eec306b9 100644 --- a/src/font/bitmapfont.c +++ b/src/font/bitmapfont.c @@ -543,7 +543,8 @@ BOOL AddGlyphsToBMPFont (DEVFONT* dev_font, BITMAP* glyph_bmp, info->max_width = glyph_width; info->ave_width = (info->ave_width * info->node_cnt + glyph_width)/ - (++info->node_cnt); + (info->node_cnt + 1); + info->node_cnt++; } return TRUE; diff --git a/src/font/bitmapfont.h b/src/font/bitmapfont.h index b22e7d0f..b3e77874 100644 --- a/src/font/bitmapfont.h +++ b/src/font/bitmapfont.h @@ -35,7 +35,7 @@ extern FONTOPS __mg_bitmap_font_ops; typedef struct _BMPFONTINFO { - char name[LEN_UNIDEVFONT_NAME]; /* font name */ + char name[LEN_UNIDEVFONT_NAME + 1]; /* font name */ int height; /* character height. */ int ave_width; /* average width of character */ int max_width; /* max width of character */ @@ -43,7 +43,7 @@ typedef struct _BMPFONTINFO GLYPHTREENODE* tree; /* The pointer to glyph tree */ int node_cnt; /* The node count of AVL tree */ -} BMPFONTINFO; +} BMPFONTINFO; #ifdef __cplusplus } diff --git a/src/font/charset-arabic.c b/src/font/charset-arabic.c index 335405eb..99b5a73a 100644 --- a/src/font/charset-arabic.c +++ b/src/font/charset-arabic.c @@ -520,7 +520,7 @@ Glyph32 iso8859_6_char_glyph_value (const unsigned char* prev_mchar, int prev_le int char_index, prev_index; int final, initial, medial, ligature; int ignore; - char next_char = 0, prev_char = 0; + char next_char = 0; // NUV , prev_char = 0; /*ascii*/ if(*mchar < 0x7f) return *mchar; @@ -536,7 +536,7 @@ Glyph32 iso8859_6_char_glyph_value (const unsigned char* prev_mchar, int prev_le if(prev_mchar){ prev_index = get_table_index(*prev_mchar); prev_affects_joining = ( prev_index >= 0 || is_char_transparent(*prev_mchar)) && (shape_info[prev_index].medial); - prev_char = *prev_mchar; + // NUV prev_char = *prev_mchar; /*houhh 20080505, check if ligature. */ if(prev_affects_joining) { ligature = get_ligature(prev_mchar, prev_len, 1, &ignore); diff --git a/src/font/in-core/Makefile.am b/src/font/in-core/Makefile.am index 4ad64937..2f331ec2 100644 --- a/src/font/in-core/Makefile.am +++ b/src/font/in-core/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/font/ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/font/ noinst_LTLIBRARIES = libincore.la diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 0a9e869c..0a4c158c 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libgui.la diff --git a/src/gui/lf_classic.c b/src/gui/lf_classic.c index 30fde8b2..92b6a32e 100644 --- a/src/gui/lf_classic.c +++ b/src/gui/lf_classic.c @@ -848,7 +848,7 @@ static void draw_arrow (HWND hWnd, HDC hdc, const RECT* pRect, DWORD color, int if(status & LFRDR_ARROW_NOFILL) { - old_pen_color = SetPenColor(hdc, RGBA2Pixel(hdc,GetRValue(color), + old_pen_color = SetPenColor(hdc, RGBA2Pixel(hdc, GetRValue(color), GetGValue(color), GetBValue(color), GetAValue(color))); MoveTo(hdc, p1.x, p1.y); LineTo(hdc, p2.x, p2.y); @@ -2374,8 +2374,6 @@ static void draw_caption (HWND hWnd, HDC hdc, BOOL is_active) const WINDOWINFO *win_info = NULL; RECT rect; RECT icon_rect = {0,0,0,0}; - int win_w; - int border; int ncbutton_w = 0; RECT rcTmp = {0}; @@ -2413,10 +2411,6 @@ static void draw_caption (HWND hWnd, HDC hdc, BOOL is_active) if (win_info->spCaption) { - border = get_window_border (hWnd, win_info->dwStyle, - lf_get_win_type(hWnd)); - win_w = win_info->right - win_info->left; - SetBkMode(hdc, BM_TRANSPARENT); old_font = SelectFont(hdc, cap_font); font_h = GetFontHeight(hdc); diff --git a/src/gui/lf_flat.c b/src/gui/lf_flat.c index 37fa7e94..1ba18e05 100644 --- a/src/gui/lf_flat.c +++ b/src/gui/lf_flat.c @@ -603,7 +603,6 @@ static void draw_checkbox (HDC hdc, const RECT* pRect, DWORD color, int status) int i, j, w, h, side_len, boundary; int box_l, box_t, box_r, box_b; int cross_l, cross_t, cross_r, cross_b; - int border_cut; gal_pixel color_pixel, pen_color_old, bru_color_old; if (pRect == NULL) @@ -618,7 +617,6 @@ static void draw_checkbox (HDC hdc, const RECT* pRect, DWORD color, int status) side_len = w>=h ? h : w; boundary = w>=h ? (w-h)>>1: (h-w)>>1; - border_cut = (side_len+1)>>3; color_pixel = RGBA2Pixel (hdc, GetRValue(color), GetGValue(color), GetBValue(color), GetAValue(color)); @@ -728,7 +726,6 @@ static void draw_checkmark (HDC hdc, const RECT* pRect, DWORD color, int status) int i, j, w, h, side_len, boundary; int box_l, box_t, box_r, box_b; int hook_l, hook_t, hook_r, hook_b; - int border_cut; gal_pixel color_pixel, pen_color_old, bru_color_old; if (pRect == NULL) @@ -743,7 +740,6 @@ static void draw_checkmark (HDC hdc, const RECT* pRect, DWORD color, int status) side_len = w>=h ? h : w; boundary = w>=h ? (w-h)>>1: (h-w)>>1; - border_cut = (side_len+1)>>3; color_pixel = RGBA2Pixel (hdc, GetRValue(color), GetGValue(color), GetBValue(color), GetAValue(color)); @@ -2375,7 +2371,6 @@ static void draw_caption (HWND hWnd, HDC hdc, BOOL is_active) int font_h, font_offy; gal_pixel caption_active_bgc, caption_inact_bgc, text_active_color, text_inact_color, - border_color, old_brush_color, old_text_color; PLOGFONT cap_font, old_font; const WINDOWINFO *win_info = NULL; @@ -2407,15 +2402,11 @@ static void draw_caption (HWND hWnd, HDC hdc, BOOL is_active) { old_brush_color = SetBrushColor (hdc, caption_active_bgc); old_text_color = SetTextColor (hdc, text_active_color); - border_color = GetWindowElementPixelEx - (hWnd, hdc, WE_FGC_ACTIVE_WND_BORDER); } else { old_brush_color = SetBrushColor (hdc, caption_inact_bgc); old_text_color = SetTextColor(hdc,text_inact_color); - border_color = GetWindowElementPixelEx - (hWnd, hdc, WE_FGC_INACTIVE_WND_BORDER); } /*Draw full background*/ @@ -2704,11 +2695,10 @@ static void draw_scrollbar (HWND hWnd, HDC hdc, int sb_pos) { RECT rect; int sb_status = 0; - DWORD color_3d, fgc_3d, fgc_dis; + DWORD fgc_3d, fgc_dis; BOOL isCtrl = FALSE; /** if TRUE it is scrollbar control else not */ const WINDOWINFO *info = GetWindowInfo (hWnd); - color_3d = GetWindowElementAttr(hWnd, WE_MAINC_THREED_BODY); fgc_3d = GetWindowElementAttr(hWnd, WE_FGC_THREED_BODY); fgc_dis = GetWindowElementAttr(hWnd, WE_FGC_DISABLED_ITEM); diff --git a/src/gui/lf_skin.c b/src/gui/lf_skin.c index 5c06dae6..6bab07a1 100644 --- a/src/gui/lf_skin.c +++ b/src/gui/lf_skin.c @@ -900,7 +900,6 @@ draw_checkmark (HDC hdc, const RECT* pRect, DWORD color, int status) int i, w, h, side_len, boundary; int box_l, box_t, box_r, box_b; int hook_l, hook_t, hook_r, hook_b; - int border_cut; gal_pixel _pixel, old_pixel; if (!pRect) @@ -917,7 +916,6 @@ draw_checkmark (HDC hdc, const RECT* pRect, DWORD color, int status) side_len = w>h ? h : w; boundary = ABS(w-h)>>1; - border_cut = (side_len+1)>>3; _pixel = RGBA2Pixel (hdc, GetRValue(color), GetGValue(color), @@ -1824,13 +1822,11 @@ static int calc_we_area (HWND hWnd, int which, RECT* we_area) int cap_h; int menu_h; const WINDOWINFO* win_info = NULL; - const WINDOW_ELEMENT_RENDERER * rdr = NULL; int win_w = 0; int win_h = 0; win_info = GetWindowInfo (hWnd); - rdr = win_info->we_rdr; win_w = win_info->right - win_info->left; win_h = win_info->bottom - win_info->top; @@ -3182,7 +3178,7 @@ draw_tab (HWND hWnd, HDC hdc, RECT *pRect, char *title, DWORD color, int flag, H SIZE size; DWORD file; int eff_chars, eff_len; - int x, ty, by, text_extent; + int x, ty, text_extent; const BITMAP* bitmap; LFSKIN_BMPINFO bmp_info; @@ -3208,15 +3204,12 @@ draw_tab (HWND hWnd, HDC hdc, RECT *pRect, char *title, DWORD color, int flag, H if (flag & LFRDR_TAB_BOTTOM) { bmp_info.flip = TRUE; ty -= 2; - by = pRect->bottom - 2; } else { ty += 2; - by = pRect->bottom; } } else { bmp_info.idx_line = 2; - by = pRect->bottom; if (flag & LFRDR_TAB_BOTTOM) { bmp_info.flip = TRUE; diff --git a/src/gui/menu.c b/src/gui/menu.c index 770372a9..63df8320 100644 --- a/src/gui/menu.c +++ b/src/gui/menu.c @@ -3069,7 +3069,7 @@ static void mnuHiliteMenuItem (PTRACKMENUINFO ptmi, PMENUITEM pmi, BOOL bHilite) /** the menu item rect to be drawn*/ RECT rect; - int inter; + // NUV int inter; int mioffx; int marginlx, marginrx; int offy; @@ -3085,7 +3085,7 @@ static void mnuHiliteMenuItem (PTRACKMENUINFO ptmi, PMENUITEM pmi, BOOL bHilite) if (pmi->type == TYPE_PPPMENU) return; - inter = LFRDR_INTERMENUITEMY; + // NUV inter = LFRDR_INTERMENUITEMY; mioffx = LFRDR_MENUITEMOFFX; marginlx = LFRDR_MENULEFTMARGIN; marginrx = LFRDR_MENURIGHTMARGIN; @@ -3441,13 +3441,13 @@ static void cursor_block_down(PTRACKMENUINFO pcurtmi, PMENUITEM pcurmi) static void cursor_block_up(PTRACKMENUINFO pcurtmi, PMENUITEM pcurmi) { PMENUITEM pnewmi; - int y; + // NUV int y; if (pcurmi == NULL) return; pnewmi = mnuGetPrevMenuItem (pcurtmi, pcurmi); - y = get_menu_item_y_from_pstart(pcurtmi, pcurmi); + // NUV y = get_menu_item_y_from_pstart(pcurtmi, pcurmi); if (pcurtmi->rc.bottom > g_rcScr.bottom){ if (pnewmi == mnuGetPrevMenuItem(pcurtmi, pcurtmi->pmi)){ diff --git a/src/gui/window.c b/src/gui/window.c index e1fbb6b4..5b75b4b4 100644 --- a/src/gui/window.c +++ b/src/gui/window.c @@ -643,7 +643,7 @@ BOOL wndGetHScrollBarRect (const MAINWIN* pWin, void update_secondary_dc (PMAINWIN pWin, HDC secondary_dc, HDC real_dc, const RECT* rc, DWORD flags) { - PDC pdc_main, pdc_child; + PDC pdc_main; RECT wnd_rc, clip_rc, client_rc; if (!dc_IsVisible((PDC)secondary_dc)) @@ -653,7 +653,6 @@ void update_secondary_dc (PMAINWIN pWin, HDC secondary_dc, } pdc_main = dc_HDC2PDC(real_dc); - pdc_child = dc_HDC2PDC(secondary_dc); /* calculate offset postion. */ if (flags == HT_CLIENT){ @@ -1554,7 +1553,6 @@ static void wndHandleCustomHotspot (PMAINWIN pWin, static int DefaultNCMouseMsgHandler(PMAINWIN pWin, int message, int location, int x, int y) { - static PMAINWIN downWin = NULL; static int downCode = HT_UNKNOWN; static int moveCode = HT_UNKNOWN; static int hiliteCode = HT_UNKNOWN; @@ -1627,7 +1625,6 @@ static int DefaultNCMouseMsgHandler(PMAINWIN pWin, int message, downCode = location; moveCode = location; hiliteCode = HT_UNKNOWN; - downWin = pWin; wndDrawNCButton (pWin, downCode, LFRDR_BTN_STATUS_PRESSED); } @@ -1704,7 +1701,6 @@ static int DefaultNCMouseMsgHandler(PMAINWIN pWin, int message, downCode = HT_UNKNOWN; moveCode = HT_UNKNOWN; hiliteCode = HT_UNKNOWN; - downWin = NULL; break; #ifdef _MGHAVE_MENU @@ -4147,11 +4143,10 @@ void GUIAPI ScreenToWindow (HWND hWnd, int* x, int* y) void GUIAPI WindowToClient (HWND hWnd, int* x, int* y) { - PCONTROL pParent; PCONTROL pCtrl; MG_CHECK (MG_IS_NORMAL_WINDOW(hWnd)); - pParent = pCtrl = MG_GET_CONTROL_PTR (hWnd); + pCtrl = MG_GET_CONTROL_PTR (hWnd); *x -= pCtrl->cl - pCtrl->left; *y -= pCtrl->ct - pCtrl->top; @@ -4159,11 +4154,10 @@ void GUIAPI WindowToClient (HWND hWnd, int* x, int* y) void GUIAPI ClientToWindow (HWND hWnd, int* x, int* y) { - PCONTROL pParent; PCONTROL pCtrl; MG_CHECK (MG_IS_NORMAL_WINDOW(hWnd)); - pParent = pCtrl = MG_GET_CONTROL_PTR (hWnd); + pCtrl = MG_GET_CONTROL_PTR (hWnd); *x += pCtrl->cl - pCtrl->left; *y += pCtrl->ct - pCtrl->top; @@ -5787,8 +5781,8 @@ static RECT4MASK* CalcXYBannedRects (HDC hdc, const void* mask, int * rect_size, int w = 0, h = 0; BYTE* bits = NULL; Uint32 transparent = 0; - unsigned sA= 0; - unsigned sR, sG, sB;//, sA; + unsigned sA = 0; + unsigned sR, sG, sB; if (!mask) return NULL; diff --git a/src/ial/Makefile.am b/src/ial/Makefile.am index 617b0a25..9f16a82f 100644 --- a/src/ial/Makefile.am +++ b/src/ial/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libial.la diff --git a/src/ial/dlcustom/Makefile.am b/src/ial/dlcustom/Makefile.am index 737505c4..687b2d46 100644 --- a/src/ial/dlcustom/Makefile.am +++ b/src/ial/dlcustom/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libdlcustom.la diff --git a/src/ial/native/Makefile.am b/src/ial/native/Makefile.am index acba6ffa..366bc44b 100644 --- a/src/ial/native/Makefile.am +++ b/src/ial/native/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES=libnative.la diff --git a/src/ial/netial/Makefile.am b/src/ial/netial/Makefile.am index 49475634..e79cdf52 100644 --- a/src/ial/netial/Makefile.am +++ b/src/ial/netial/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES=libnetial.la diff --git a/src/ial/nexusial/Makefile.am b/src/ial/nexusial/Makefile.am index d4c4df24..f0c10683 100644 --- a/src/ial/nexusial/Makefile.am +++ b/src/ial/nexusial/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES=libnexusial.la diff --git a/src/ial/pcxvfbial.c b/src/ial/pcxvfbial.c index d7ba8424..e1089e17 100644 --- a/src/ial/pcxvfbial.c +++ b/src/ial/pcxvfbial.c @@ -222,7 +222,7 @@ static void default_cb(void *user_data, const char* str) /******************** Low Level Input Operations ******************/ -static BOOL if_record_ial () +static BOOL if_record_ial (void) { #ifdef WIN32 /* TODO: */ @@ -232,7 +232,7 @@ static BOOL if_record_ial () #endif } -static long long int getcurtime() +static long long int getcurtime(void) { #ifdef WIN32 /* TODO: */ @@ -262,7 +262,7 @@ static void write_rec (const void* buf, size_t n) #endif } -static void flush_rec () +static void flush_rec (void) { #ifdef WIN32 /* TODO: */ diff --git a/src/image/Makefile.am b/src/image/Makefile.am index fcb6e871..b56bbbd4 100644 --- a/src/image/Makefile.am +++ b/src/image/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libimage.la diff --git a/src/ime/Makefile.am b/src/ime/Makefile.am index 79919730..2fa240a9 100644 --- a/src/ime/Makefile.am +++ b/src/ime/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libime.la diff --git a/src/kernel/Makefile.am b/src/kernel/Makefile.am index c5695f04..87ae70bc 100644 --- a/src/kernel/Makefile.am +++ b/src/kernel/Makefile.am @@ -1,5 +1,5 @@ # also for makefile.ng and makefile.msvc -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libkernel.la diff --git a/src/kernel/desktop.c b/src/kernel/desktop.c index 4a10517d..53684580 100644 --- a/src/kernel/desktop.c +++ b/src/kernel/desktop.c @@ -2060,7 +2060,7 @@ int dskDestroyTopZOrderNode (int cli, int idx_znode) int dskSetTopForEver(int cli, int idx_znode, BOOL show) { - DWORD type; + // NUV DWORD type; ZORDERINFO* zi = _get_zorder_info (cli); ZORDERNODE* nodes; @@ -2076,7 +2076,7 @@ int dskSetTopForEver(int cli, int idx_znode, BOOL show) #endif nodes = GET_ZORDERNODE(zi); - type = nodes [idx_znode].flags & ZOF_TYPE_MASK; + // NUV type = nodes [idx_znode].flags & ZOF_TYPE_MASK; /* lock zi for change */ lock_zi_for_change (zi); diff --git a/src/libc/Makefile.am b/src/libc/Makefile.am index 7e30599f..94932c05 100644 --- a/src/libc/Makefile.am +++ b/src/libc/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/ +AM_CPPFLAGS = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/ noinst_LTLIBRARIES = liblibc.la diff --git a/src/main/Makefile.am b/src/main/Makefile.am index c8a6deda..aed583e1 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,5 +1,5 @@ # also for makefile.ng and makefile.msvc -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libmain.la diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index a0b9fda1..6c6ce130 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/include noinst_LTLIBRARIES = libmisc.la EXTRA_DIST= misc.c systext.c rwops.c endianrw.c nposix.c clipboard.c \ diff --git a/src/mybmp/Makefile.am b/src/mybmp/Makefile.am index 1699e008..f2f59d7f 100644 --- a/src/mybmp/Makefile.am +++ b/src/mybmp/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libmybmp.la diff --git a/src/newgal/Makefile.am b/src/newgal/Makefile.am index baa2dc89..4ea6a770 100644 --- a/src/newgal/Makefile.am +++ b/src/newgal/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the NEWGAL library -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libnewgal.la diff --git a/src/newgal/bf533/Makefile.am b/src/newgal/bf533/Makefile.am index 9dd3b312..52547909 100644 --- a/src/newgal/bf533/Makefile.am +++ b/src/newgal/bf533/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the bf533 video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ SRC_FILES = \ bf533video.c diff --git a/src/newgal/commlcd/Makefile.am b/src/newgal/commlcd/Makefile.am index 2deca077..8a189786 100644 --- a/src/newgal/commlcd/Makefile.am +++ b/src/newgal/commlcd/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ SRC_FILES = commlcd.c extern.c \ diff --git a/src/newgal/dfb/Makefile.am b/src/newgal/dfb/Makefile.am index 2b6182f8..3d71c693 100644 --- a/src/newgal/dfb/Makefile.am +++ b/src/newgal/dfb/Makefile.am @@ -1,7 +1,6 @@ - ## Makefile.am for the video driver on DirectFB -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ diff --git a/src/newgal/dummy/Makefile.am b/src/newgal/dummy/Makefile.am index 11035e89..f164b454 100644 --- a/src/newgal/dummy/Makefile.am +++ b/src/newgal/dummy/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for the null video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_null.la diff --git a/src/newgal/em85xxosd/Makefile.am b/src/newgal/em85xxosd/Makefile.am index 23318e11..6d18db38 100644 --- a/src/newgal/em85xxosd/Makefile.am +++ b/src/newgal/em85xxosd/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/EM85xx_with_GUI/kernelmodule noinst_LTLIBRARIES = libvideo_em85xxosd.la diff --git a/src/newgal/em85xxyuv/Makefile.am b/src/newgal/em85xxyuv/Makefile.am index 8539a880..b88e4f73 100644 --- a/src/newgal/em85xxyuv/Makefile.am +++ b/src/newgal/em85xxyuv/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/EM85xx_with_GUI/kernelmodule noinst_LTLIBRARIES = libvideo_em85xxyuv.la diff --git a/src/newgal/em86gfx/Makefile.am b/src/newgal/em86gfx/Makefile.am index 5179a301..b374ee58 100644 --- a/src/newgal/em86gfx/Makefile.am +++ b/src/newgal/em86gfx/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_em86gfx.la diff --git a/src/newgal/fbcon/Makefile.am b/src/newgal/fbcon/Makefile.am index 84cdb7d7..bdeab5d3 100644 --- a/src/newgal/fbcon/Makefile.am +++ b/src/newgal/fbcon/Makefile.am @@ -1,7 +1,6 @@ - ## Makefile.am for MiniGUI using the framebuffer console video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_fbcon.la diff --git a/src/newgal/gdl/Makefile.am b/src/newgal/gdl/Makefile.am index 59ccc91d..afbf1e7e 100644 --- a/src/newgal/gdl/Makefile.am +++ b/src/newgal/gdl/Makefile.am @@ -1,7 +1,6 @@ - ## Makefile.am for MiniGUI using the Intel GDL video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/usr/include/ noinst_LTLIBRARIES = libvideo_gdl.la diff --git a/src/newgal/hisi/Makefile.am b/src/newgal/hisi/Makefile.am index f5e65919..8e5edbae 100644 --- a/src/newgal/hisi/Makefile.am +++ b/src/newgal/hisi/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ SRC_FILES = hi3510_fbvideo.c gal_hi3560a.c hi3560_fbvideo.c pix_array.c tde.c diff --git a/src/newgal/mb93493/Makefile.am b/src/newgal/mb93493/Makefile.am index c5eb3055..fdc7f6b2 100644 --- a/src/newgal/mb93493/Makefile.am +++ b/src/newgal/mb93493/Makefile.am @@ -1,7 +1,6 @@ - ## Makefile.am for the mb93493 video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_mb93493.la diff --git a/src/newgal/mlshadow/Makefile.am b/src/newgal/mlshadow/Makefile.am index c4b7c7d8..5ec6b639 100644 --- a/src/newgal/mlshadow/Makefile.am +++ b/src/newgal/mlshadow/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ SRC_FILES = mlshadow-ths.c mlshadow-proc.c diff --git a/src/newgal/mstar/Makefile.am b/src/newgal/mstar/Makefile.am index f9f6bf80..1a798a1a 100644 --- a/src/newgal/mstar/Makefile.am +++ b/src/newgal/mstar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_mstar.la libvideo_mstar_la_SOURCES = mstar_video.c mstar_video.h diff --git a/src/newgal/nexus/Makefile.am b/src/newgal/nexus/Makefile.am index bc666bde..536aab41 100644 --- a/src/newgal/nexus/Makefile.am +++ b/src/newgal/nexus/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for the NEXUS video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_nexus.la diff --git a/src/newgal/pcxvfb/Makefile.am b/src/newgal/pcxvfb/Makefile.am index fc4078b5..35181148 100644 --- a/src/newgal/pcxvfb/Makefile.am +++ b/src/newgal/pcxvfb/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for MiniGUI using the Qt virtual framebuffer video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/usr/include/ noinst_LTLIBRARIES = libvideo_pcxvfb.la diff --git a/src/newgal/qvfb/Makefile.am b/src/newgal/qvfb/Makefile.am index 9d509831..ea045470 100644 --- a/src/newgal/qvfb/Makefile.am +++ b/src/newgal/qvfb/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for MiniGUI using the Qt virtual framebuffer video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/usr/include/ noinst_LTLIBRARIES = libvideo_qvfb.la diff --git a/src/newgal/rtos_xvfb/Makefile.am b/src/newgal/rtos_xvfb/Makefile.am index 0472206e..a46ac9b9 100644 --- a/src/newgal/rtos_xvfb/Makefile.am +++ b/src/newgal/rtos_xvfb/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for MiniGUI using the RTOS virtual framebuffer video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/usr/include/ noinst_LTLIBRARIES = libvideo_rtos_xvfb.la diff --git a/src/newgal/s3c6410/Makefile.am b/src/newgal/s3c6410/Makefile.am index 513180c0..deda69d0 100644 --- a/src/newgal/s3c6410/Makefile.am +++ b/src/newgal/s3c6410/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for the S3C6410 video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_s3c6410.la diff --git a/src/newgal/shadow/Makefile.am b/src/newgal/shadow/Makefile.am index 1430bb97..134afda9 100644 --- a/src/newgal/shadow/Makefile.am +++ b/src/newgal/shadow/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ SRC_FILES = shadow.c shadow_refresh_msb_right.c shadow_refresh_msb_left.c diff --git a/src/newgal/sigma8654/Makefile.am b/src/newgal/sigma8654/Makefile.am index 4334f344..dbaaf5d8 100644 --- a/src/newgal/sigma8654/Makefile.am +++ b/src/newgal/sigma8654/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_sigma8654.la diff --git a/src/newgal/stgfb/Makefile.am b/src/newgal/stgfb/Makefile.am index 0fd5b307..cb854120 100644 --- a/src/newgal/stgfb/Makefile.am +++ b/src/newgal/stgfb/Makefile.am @@ -2,7 +2,7 @@ ## Makefile.am for the video driver on ST FrameBuffer TOP_DIR=../../.. -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I$(abs_top_srcdir)/src/newgal/stgfb/st_include diff --git a/src/newgal/svpxxosd/Makefile.am b/src/newgal/svpxxosd/Makefile.am index f7632608..5951fcd6 100644 --- a/src/newgal/svpxxosd/Makefile.am +++ b/src/newgal/svpxxosd/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I/opt/winbond/workdir/swlinux/include SRC_FILES=svpxxosd.c diff --git a/src/newgal/utpmc/Makefile.am b/src/newgal/utpmc/Makefile.am index 01e43fd5..e2d7f5b7 100644 --- a/src/newgal/utpmc/Makefile.am +++ b/src/newgal/utpmc/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the UTStarcom PocketMedia video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ noinst_LTLIBRARIES = libvideo_utpmc.la diff --git a/src/newgal/wvfb/Makefile.am b/src/newgal/wvfb/Makefile.am index 401bab1e..0ce0c6f9 100644 --- a/src/newgal/wvfb/Makefile.am +++ b/src/newgal/wvfb/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for MiniGUI using the Windows virtual framebuffer video driver -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/newgal/ -I$(abs_top_srcdir)/ noinst_LTLIBRARIES = libvideo_wvfb.la diff --git a/src/newgal/xlib/Makefile.am b/src/newgal/xlib/Makefile.am index fd946481..94b38bb4 100644 --- a/src/newgal/xlib/Makefile.am +++ b/src/newgal/xlib/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for MiniGUI using the X virtual framebuffer video driver -INCLUDES=-I/usr/include -I../../../include -I../../include -I../ +AM_CPPFLAGS=-I/usr/include -I../../../include -I../../include -I../ noinst_LTLIBRARIES = libvideo_xlib.la libvideo_xlib_la_SOURCES = $(XXVFB_SRCS) diff --git a/src/newgdi/Makefile.am b/src/newgdi/Makefile.am index 1c53ca83..32c839ca 100644 --- a/src/newgdi/Makefile.am +++ b/src/newgdi/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libnewgdi.la diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 168771e6..60b0100d 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libserver.la diff --git a/src/standalone/Makefile.am b/src/standalone/Makefile.am index 398a5252..a4309246 100644 --- a/src/standalone/Makefile.am +++ b/src/standalone/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libstandalone.la diff --git a/src/sysres/Makefile.am b/src/sysres/Makefile.am index 3c2d34f8..445d3bab 100644 --- a/src/sysres/Makefile.am +++ b/src/sysres/Makefile.am @@ -1,5 +1,5 @@ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include SUBDIRS = bmp icon font cursor if MG_ENABLE_SPLASH if MG_ENABLE_SCREENSAVER diff --git a/src/sysres/bmp/Makefile.am b/src/sysres/bmp/Makefile.am index d4027cf8..fd0c3e5e 100644 --- a/src/sysres/bmp/Makefile.am +++ b/src/sysres/bmp/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/sysres/ noinst_LTLIBRARIES=libincorebmps.la diff --git a/src/sysres/cursor/Makefile.am b/src/sysres/cursor/Makefile.am index a91e881e..f4a2cf89 100644 --- a/src/sysres/cursor/Makefile.am +++ b/src/sysres/cursor/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/sysres/ noinst_LTLIBRARIES=libincorecursors.la diff --git a/src/sysres/font/Makefile.am b/src/sysres/font/Makefile.am index e9710a43..67e6f13c 100644 --- a/src/sysres/font/Makefile.am +++ b/src/sysres/font/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/sysres/ -I$(abs_top_srcdir)/src/font/ noinst_LTLIBRARIES=libincorefonts.la diff --git a/src/sysres/icon/Makefile.am b/src/sysres/icon/Makefile.am index 6b25b3dd..1a35dd05 100644 --- a/src/sysres/icon/Makefile.am +++ b/src/sysres/icon/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/src/sysres/ noinst_LTLIBRARIES = libincoreicons.la diff --git a/src/textedit/Makefile.am b/src/textedit/Makefile.am index 0af8b77c..09586a6c 100644 --- a/src/textedit/Makefile.am +++ b/src/textedit/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include +AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include noinst_LTLIBRARIES = libtextedit.la