Commit 023fa076 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Reverts [24530] & [24531] (preprocessing related) , add $(DEFS)...

Reverts [24530] & [24531] (preprocessing related) , add $(DEFS) (-DHAVE_CONFIG_H) to moc command line
parent 04a4bec2
...@@ -71,7 +71,7 @@ resources.cpp: res.qrc ...@@ -71,7 +71,7 @@ resources.cpp: res.qrc
$(RCC) -name vlc -o $@ $< $(RCC) -name vlc -o $@ $<
.hpp.moc.cpp: .hpp.moc.cpp:
$(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $< $(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
.ui.h: .ui.h:
mkdir -p -- ui mkdir -p -- ui
......
...@@ -116,7 +116,7 @@ private: ...@@ -116,7 +116,7 @@ private:
private slots: private slots:
void lastfm_Changed( int ); void lastfm_Changed( int );
void updateAudioOptions( int ); void updateAudioOptions( int );
#ifdef SYS_MINGW32 #ifdef WIN32
void assoDialog(); void assoDialog();
void saveAsso(); void saveAsso();
#endif #endif
......
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
#ifndef _HELP_DIALOG_H_ #ifndef _HELP_DIALOG_H_
#define _HELP_DIALOG_H_ #define _HELP_DIALOG_H_
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
......
...@@ -25,14 +25,16 @@ ...@@ -25,14 +25,16 @@
#ifndef _VLM_DIALOG_H_ #ifndef _VLM_DIALOG_H_
#define _VLM_DIALOG_H_ #define _VLM_DIALOG_H_
#ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_vlm.h>
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#include <vlc_vlm.h>
#include "ui/vlm.h" #include "ui/vlm.h"
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment