Commit 5d9c12fb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - Fix Compilation on CYGWin. This is a quick fix but not a solution....

Qt4 - Fix Compilation on CYGWin. This is a quick fix but not a solution. Again, MOC isn't given HAVE_CONFIG_H so it can't understand ENABLE_VLM or ENABLE_UPDATE. MOCFLAGs would fix that ?
parent e1992e2b
......@@ -112,7 +112,8 @@ SOURCES_qt4 = qt4.cpp \
components/playlist/playlist.cpp \
components/playlist/selector.cpp \
util/input_slider.cpp \
util/customwidgets.cpp
util/customwidgets.cpp \
util/registry.cpp
noinst_HEADERS = \
qt4.hpp \
......@@ -147,7 +148,8 @@ noinst_HEADERS = \
components/playlist/selector.hpp \
util/input_slider.hpp \
util/customwidgets.hpp \
util/qvlcframe.hpp
util/qvlcframe.hpp \
util/registry.cpp
EXTRA_DIST += \
res.qrc \
......
......@@ -24,11 +24,7 @@
#ifndef _HELP_DIALOG_H_
#define _HELP_DIALOG_H_
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc/vlc.h>
#include "config.h"
#include "util/qvlcframe.hpp"
......
......@@ -25,15 +25,14 @@
#ifndef _VLM_DIALOG_H_
#define _VLM_DIALOG_H_
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc/vlc.h>
#ifdef ENABLE_VLM
#include <vlc_vlm.h>
#ifdef ENABLE_VLM
#include "ui/vlm.h"
#include "util/qvlcframe.hpp"
......
// License GPLv2 or later
// COde by atmo
//
#error your license text is wrong and copyright is missing
/*****************************************************************************
* registry.cpp: Windows Registry Manipulation
****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id: input_slider.cpp 24525 2008-01-23 21:50:58Z courmisch $
*
* Authors: Andre Weber <WeberAndre # gmx - de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
......
// License GPLv2 or later
// Code from ATMO
/*****************************************************************************
* registry.hpp: Windows Registry Manipulation
****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id: input_slider.cpp 24525 2008-01-23 21:50:58Z courmisch $
*
* Authors: Andre Weber <WeberAndre # gmx - de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef QVLC_REGISTRY_H
#define QVLC_REGISTRY_H
......@@ -23,8 +42,8 @@ public:
char * ReadRegistryString(char *path, char *valueName, char *default_value);
double ReadRegistryDouble(char *path, char *valueName, double default_value);
int RegistryKeyExists(char *path);
int RegistryValueExists(char *path, char *valueName);
bool RegistryKeyExists(char *path);
bool RegistryValueExists(char *path, char *valueName);
};
#endif
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