Browse Source

rbug: fix make process on Linux Mint 13 x64.

Previously, rbug_*.c would fail to compile with incomplete prototype
errors when make was run from the command line on my machine. My IDE
always built fine, and still does after this patch (Netbeans 7.1.2).

Most of the includes from files in gallium/auxiliary/rbug/* were
assuming an rbug/ subdirectory, while the headers are actually in the
same directory as the .c files.

The build error was also previously a problem for me on Ubuntu 11.10
and Mint 12.

Fixes build for the following configuration: ./autogen.sh
--enable-debug --enable-texture-float --with-gallium-drivers=r600
--with-dri-drivers=radeon --enable-r600-llvm-compiler

Signed-off-by: Brian Paul <brianp@vmware.com>
tags/instanced_arrays-v2
Aaron Watry 13 years ago
parent
commit
fc3bac8a40

+ 5
- 5
src/gallium/auxiliary/rbug/rbug.h View File

@@ -26,8 +26,8 @@
* Include all for users the remote debugger protocol code.
*/

#include "rbug/rbug_core.h"
#include "rbug/rbug_shader.h"
#include "rbug/rbug_context.h"
#include "rbug/rbug_texture.h"
#include "rbug/rbug_connection.h"
#include "rbug_core.h"
#include "rbug_shader.h"
#include "rbug_context.h"
#include "rbug_texture.h"
#include "rbug_connection.h"

+ 2
- 2
src/gallium/auxiliary/rbug/rbug_connection.c View File

@@ -22,8 +22,8 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include "rbug/rbug.h"
#include "rbug/rbug_internal.h"
#include "rbug.h"
#include "rbug_internal.h"

#include "util/u_network.h"


+ 1
- 1
src/gallium/auxiliary/rbug/rbug_connection.h View File

@@ -30,7 +30,7 @@
#ifndef _RBUG_CONNECTION_H_
#define _RBUG_CONNECTION_H_

#include "rbug/rbug_proto.h"
#include "rbug_proto.h"

struct rbug_connection * rbug_from_socket(int socket);


+ 1
- 1
src/gallium/auxiliary/rbug/rbug_context.c View File

@@ -35,7 +35,7 @@
*/

#include "rbug_internal.h"
#include "rbug/rbug_context.h"
#include "rbug_context.h"

int rbug_send_context_list(struct rbug_connection *__con,
uint32_t *__serial)

+ 2
- 2
src/gallium/auxiliary/rbug/rbug_context.h View File

@@ -38,8 +38,8 @@
#ifndef _RBUG_PROTO_CONTEXT_H_
#define _RBUG_PROTO_CONTEXT_H_

#include "rbug/rbug_proto.h"
#include "rbug/rbug_core.h"
#include "rbug_proto.h"
#include "rbug_core.h"

typedef enum
{

+ 1
- 1
src/gallium/auxiliary/rbug/rbug_core.c View File

@@ -35,7 +35,7 @@
*/

#include "rbug_internal.h"
#include "rbug/rbug_core.h"
#include "rbug_core.h"

int rbug_send_noop(struct rbug_connection *__con,
uint32_t *__serial)

+ 1
- 1
src/gallium/auxiliary/rbug/rbug_core.h View File

@@ -38,7 +38,7 @@
#ifndef _RBUG_PROTO_CORE_H_
#define _RBUG_PROTO_CORE_H_

#include "rbug/rbug_proto.h"
#include "rbug_proto.h"

typedef uint64_t rbug_shader_t;
typedef uint64_t rbug_context_t;

+ 1
- 1
src/gallium/auxiliary/rbug/rbug_internal.h View File

@@ -30,7 +30,7 @@
#ifndef _RBUG_INTERNAL_H_
#define _RBUG_INTERNAL_H_

#include "rbug/rbug_proto.h"
#include "rbug_proto.h"

#include "util/u_memory.h"
#include "util/u_debug.h"

+ 1
- 1
src/gallium/auxiliary/rbug/rbug_shader.c View File

@@ -35,7 +35,7 @@
*/

#include "rbug_internal.h"
#include "rbug/rbug_shader.h"
#include "rbug_shader.h"

int rbug_send_shader_list(struct rbug_connection *__con,
rbug_context_t context,

+ 2
- 2
src/gallium/auxiliary/rbug/rbug_shader.h View File

@@ -38,8 +38,8 @@
#ifndef _RBUG_PROTO_SHADER_H_
#define _RBUG_PROTO_SHADER_H_

#include "rbug/rbug_proto.h"
#include "rbug/rbug_core.h"
#include "rbug_proto.h"
#include "rbug_core.h"

struct rbug_proto_shader_list
{

+ 1
- 1
src/gallium/auxiliary/rbug/rbug_texture.c View File

@@ -35,7 +35,7 @@
*/

#include "rbug_internal.h"
#include "rbug/rbug_texture.h"
#include "rbug_texture.h"

int rbug_send_texture_list(struct rbug_connection *__con,
uint32_t *__serial)

+ 2
- 2
src/gallium/auxiliary/rbug/rbug_texture.h View File

@@ -38,8 +38,8 @@
#ifndef _RBUG_PROTO_TEXTURE_H_
#define _RBUG_PROTO_TEXTURE_H_

#include "rbug/rbug_proto.h"
#include "rbug/rbug_core.h"
#include "rbug_proto.h"
#include "rbug_core.h"

struct rbug_proto_texture_list
{

Loading…
Cancel
Save