Changeset 848c1c1f12aaab8c20755462b7f37c226c04473a

Show
Ignore:
Timestamp:
12/10/07 14:23:37 (8 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1197293017 +0000
git-parent:

[b3c57df09056355270142e6f9683290b95dc2ea0]

git-author:
Rafaël Carré <funman@videolan.org> 1197293017 +0000
Message:

vlc-config: don't store optimisation cflags in cppflags (preprocessor flags), revive --cppflags
qt4: use preprocessor flags with moc, so it finds the headers in the right place

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/Modules.am

    r9538c17 r848c1c1  
    7171 
    7272.hpp.moc.cpp: 
    73     $(MOC) -o $@ $< 
     73    $(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $< 
    7474 
    7575.ui.h: 

  • vlc-config.in.in

    rad9ca44 r848c1c1  
    134134fi 
    135135if [ "${optim}" = size ]; then 
    136   cppflags="${cppflags} ${cflags_optim_size} ${cflags_tuning}" 
     136  cflags="${cflags} ${cflags_optim_size} ${cflags_tuning}" 
     137  cxxflags="${cxxflags} ${cflags_optim_size} ${cflags_tuning}" 
     138  objcflags="${objcflags} ${cflags_optim_size} ${cflags_tuning}" 
    137139  if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then 
    138     cppflags="${cppflags} ${cflags_optim_nodebug}" 
     140    cflags="${cflags} ${cflags_optim_nodebug}" 
     141    cxxflags="${cxxflags} ${cflags_optim_nodebug}" 
     142    objcflags="${objcflags} ${cflags_optim_nodebug}" 
    139143  fi 
    140144elif [ "${optim}" = speed ]; then 
    141   cppflags="${cppflags} ${cflags_optim_speed} ${cflags_tuning}" 
     145  cflags="${cflags} ${cflags_optim_speed} ${cflags_tuning}" 
     146  cxxflags="${cxxflags} ${cflags_optim_speed} ${cflags_tuning}" 
     147  objcflags="${objcflags} ${cflags_optim_speed} ${cflags_tuning}" 
    142148  if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then 
    143     cppflags="${cppflags} ${cflags_optim_nodebug}" 
     149    cflags="${cflags} ${cflags_optim_nodebug}" 
     150    cxxflags="${cxxflags} ${cflags_optim_nodebug}" 
     151    objcflags="${objcflags} ${cflags_optim_nodebug}" 
    144152  fi 
    145153else 
    146   cppflags="${cppflags} ${cflags_nooptim}" 
     154  cflags="${cflags} ${cflags_nooptim}" 
     155  cxxflags="${cxxflags} ${cflags_nooptim}" 
     156  objcflags="${objcflags} ${cflags_nooptim}" 
    147157fi 
    148158 
    …… 
    188198    --cflags) 
    189199      echo_cflags=yes 
     200      ;; 
     201    --cppflags) 
     202      echo_cppflags=yes 
    190203      ;; 
    191204    --cxxflags)