Commit 6038883a authored by Sam Hocevar's avatar Sam Hocevar

* ALL: fixed a few include directories.

parent eb395af0
......@@ -23,8 +23,8 @@ SRC_C := $(filter %.c,$($(module_name)_SOURCES))
SRC_CPP := $(filter %.cpp,$($(module_name)_SOURCES))
SRC_M := $(filter %.m,$($(module_name)_SOURCES))
plugins_CFLAGS += -D__PLUGIN__ -I$(PARENT)/include -I$(PARENT)/extras
builtins_CFLAGS += -D__BUILTIN__ -I$(PARENT)/include -I$(PARENT)/extras
plugins_CFLAGS += -D__PLUGIN__ -I$(PARENT) -I$(PARENT)/include -I$(PARENT)/extras
builtins_CFLAGS += -D__BUILTIN__ -I$(PARENT) -I$(PARENT)/include -I$(PARENT)/extras
ifeq (lo,$(suff))
extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \
......
......@@ -199,7 +199,7 @@ CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
#
# C headers directories
#
CFLAGS += -Iinclude -Iextras
vlc_CFLAGS += -Iinclude -Iextras -I.
#
# C compiler flags: mainstream compilation
......
......@@ -2,7 +2,7 @@
* vlc.h: global header for vlc
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc.h,v 1.11 2002/08/26 01:01:13 sam Exp $
* $Id: vlc.h,v 1.12 2002/08/26 08:36:12 sam Exp $
*
* 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
......@@ -95,7 +95,7 @@ typedef int vlc_status_t;
* Required internal headers
*****************************************************************************/
#if defined( __VLC__ )
# include "../config.h"
# include "config.h"
# include "vlc_config.h"
# include "modules_inner.h"
# include "vlc_common.h"
......
......@@ -37,7 +37,7 @@ $(PLUGIN_OBJ): Makefile ../lib/libvlc.a $(BUILTIN_OBJ:%=../%) $(C_OBJ)
$(CC) -shared $(LDFLAGS) -L../lib $(mozilla_LDFLAGS) $(C_OBJ) -lvlc $(BUILTIN_OBJ:%=../%) $(builtins_LDFLAGS) -o $@
$(C_OBJ): %.o: %.c vlcplugin.h
$(CC) $(CFLAGS) -I../include $(mozilla_CFLAGS) -c $< -o $@
$(CC) $(CFLAGS) -I.. -I../include $(mozilla_CFLAGS) -c $< -o $@
../%:
@cd .. && $(MAKE) $(@:../%=%)
......
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