[libr] Treat ruamoko headers as system headers

Now that qfcc actually supports them properly.

ruamoko/gui/Group.r

@@ -1,6 +1,6 @@
-#include "gui/Group.h"
-#include "gui/Point.h"
-#include "Array.h"
+#include <gui/Group.h>
+#include <gui/Point.h>
+#include <Array.h>
 
 @implementation Group
 

ruamoko/gui/InputLine.r

@@ -1,6 +1,6 @@
-#include "draw.h"
-#include "gui/InputLine.h"
-#include "gui/Rect.h"
+#include <draw.h>
+#include <gui/InputLine.h>
+#include <gui/Rect.h>
 
 inputline_t InputLine_Create (int lines, int size, int prompt) = #0;
 void InputLine_SetPos (inputline_t il, int x, int y) = #0;

ruamoko/gui/Makefile.am

@@ -4,7 +4,10 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=$(AM_CPPFLAGS)
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 

ruamoko/gui/Pic.r

@@ -1,6 +1,6 @@
-#include "draw.h"
-#include "string.h"
-#include "gui/Pic.h"
+#include <draw.h>
+#include <string.h>
+#include <gui/Pic.h>
 
 @implementation Pic
 -(id)init

ruamoko/gui/Point.r

@@ -1,4 +1,4 @@
-#include "gui/Point.h"
+#include <gui/Point.h>
 
 Point makePoint (int x, int y)
 {

ruamoko/gui/Rect.r

@@ -1,7 +1,7 @@
-#include "Object.h"
-#include "gui/Point.h"
-#include "gui/Size.h"
-#include "gui/Rect.h"
+#include <Object.h>
+#include <gui/Point.h>
+#include <gui/Size.h>
+#include <gui/Rect.h>
 
 Rect makeRect (int x, int y, int w, int h)
 {

ruamoko/gui/Size.r

@@ -1,4 +1,4 @@
-#include "gui/Size.h"
+#include <gui/Size.h>
 
 Size makeSize (int width, int height)
 {

ruamoko/gui/Slider.r

@@ -1,7 +1,7 @@
-#include "draw.h"
+#include <draw.h>
 
-#include "gui/Slider.h"
-#include "gui/Rect.h"
+#include <gui/Slider.h>
+#include <gui/Rect.h>
 
 @implementation Slider
 

ruamoko/gui/Text.r

@@ -1,6 +1,6 @@
-#include "gui/Text.h"
-#include "string.h"
-#include "draw.h"
+#include <gui/Text.h>
+#include <string.h>
+#include <draw.h>
 
 @implementation Text
 - (id) init

ruamoko/gui/View.r

@@ -1,7 +1,7 @@
-#include "gui/Size.h"
-#include "gui/Point.h"
-#include "gui/Rect.h"
-#include "gui/View.h"
+#include <gui/Size.h>
+#include <gui/Point.h>
+#include <gui/Rect.h>
+#include <gui/View.h>
 
 @implementation View
 

ruamoko/include/Array.h

@@ -1,8 +1,8 @@
 #ifndef __ruamoko_Array_h
 #define __ruamoko_Array_h
 
-#include "Object.h"
-#include "runtime.h"
+#include <Object.h>
+#include <runtime.h>
 
 /**
 	The Array class is a general ordered collection class.

ruamoko/include/AutoreleasePool.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_AutoreleasePool_h
 #define __ruamoko_AutoreleasePool_h
 
-#include "Object.h"
+#include <Object.h>
 
 @class Array;
 

ruamoko/include/Entity.h

@@ -30,7 +30,7 @@
 #ifndef __ruamoko_Entity_h
 #define __ruamoko_Entity_h
 
-#include "Object.h"
+#include <Object.h>
 
 @interface Entity: Object
 {

ruamoko/include/Object.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_Object_h
 #define __ruamoko_Object_h
 
-#include "runtime.h"
+#include <runtime.h>
 
 @class Protocol;
 

ruamoko/include/PropertyList.h

@@ -1,8 +1,8 @@
 #ifndef __ruamoko_PropertyList_h
 #define __ruamoko_PropertyList_h
 
-#include "plist.h"
-#include "Object.h"
+#include <plist.h>
+#include <Object.h>
 
 @interface PLItem: Object
 {

ruamoko/include/Protocol.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_Protocol_h
 #define __ruamoko_Protocol_h
 
-#include "Object.h"
+#include <Object.h>
 
 struct obj_method_description {
 	string name;

ruamoko/include/draw.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_draw_h
 #define __ruamoko_draw_h
 
-#include "Object.h"
+#include <Object.h>
 
 struct _qpic_t {
 	int width;

ruamoko/include/gui/Group.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Group_h
 #define __ruamoko_gui_Group_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{

ruamoko/include/gui/InputLine.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_InputLine_h
 #define __ruamoko_gui_InputLine_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\defgroup inputline Low level intputline interface.
 	\ingroup gui

ruamoko/include/gui/Pic.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Pic_h
 #define __ruamoko_gui_Pic_h
 
-#include "gui/View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{

ruamoko/include/gui/Rect.h

@@ -1,8 +1,8 @@
 #ifndef __ruamoko_gui_Rect_h
 #define __ruamoko_gui_Rect_h
 
-#include "gui/Point.h"
-#include "gui/Size.h"
+#include <gui/Point.h>
+#include <gui/Size.h>
 
 /**	\addtogroup gui */
 ///@{

ruamoko/include/gui/Slider.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Slider_h
 #define __ruamoko_gui_Slider_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{

ruamoko/include/gui/Text.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Text_h
 #define __ruamoko_gui_Text_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{

ruamoko/include/gui/View.h

@@ -1,8 +1,8 @@
 #ifndef __ruamoko_gui_View_h
 #define __ruamoko_gui_View_h
 
-#include "Object.h"
-#include "gui/Rect.h"
+#include <Object.h>
+#include <gui/Rect.h>
 
 /**	\defgroup gui GUI goo for gooey chewing
 */

ruamoko/include/key.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_key_h
 #define __ruamoko_key_h
 
-#include "QF/keys.h"
+#include <QF/keys.h>
 
 @extern int Key_keydown (int keynum);
 @extern string Key_SetBinding (string imt, int keynum, string binding);

ruamoko/include/msgbuf.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_msgbuf_h
 #define __ruamoko_msgbuf_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 struct msgbuf_s;
 typedef struct msgbuf_s msgbuf_t;

ruamoko/include/plist.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_plist_h
 #define __ruamoko_plist_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 typedef struct plitem_s *plitem_t;
 typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t;	// possible types

ruamoko/include/qfs.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_qfs_h
 #define __ruamoko_qfs_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 struct _qfslist_t {
 	int count;

ruamoko/include/qw_message.h

@@ -1,7 +1,7 @@
 #ifndef __ruamoko_qw_message_h
 #define __ruamoko_qw_message_h
 
-#include "message.h"
+#include <message.h>
 
 @extern void multicast (vector where, float set);
 

ruamoko/lib/Array.r

@@ -1,7 +1,7 @@
-#include "math.h"
+#include <math.h>
 
-#include "Array.h"
-#include "runtime.h"
+#include <Array.h>
+#include <runtime.h>
 
 #define STANDARD_CAPACITY 16
 #define ARRAY_MAX_GRANULARITY 100

ruamoko/lib/AutoreleasePool.r

@@ -1,7 +1,6 @@
-#include "AutoreleasePool.h"
-#include "Array+Private.h"
+#include <AutoreleasePool.h>
 
-#include "Array.h"
+#include <Array.h>
 #include "Array+Private.h"
 
 @static Array	*poolStack;

ruamoko/lib/Entity.r

@@ -1,10 +1,10 @@
-#include "Entity.h"
+#include <Entity.h>
 
-#include "debug.h"
-#include "entities.h"
-#include "plist.h"
-#include "script.h"
-#include "string.h"
+#include <debug.h>
+#include <entities.h>
+#include <plist.h>
+#include <script.h>
+#include <string.h>
 
 typedef void () void_function;
 

ruamoko/lib/Makefile.am

@@ -4,7 +4,10 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror --no-default-paths
-QCPPFLAGS=$(AM_CPPFLAGS)
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 

ruamoko/lib/Object.r

@@ -1,5 +1,5 @@
-#include "Object.h"
-#include "AutoreleasePool.h"
+#include <Object.h>
+#include <AutoreleasePool.h>
 
 void *PR_FindGlobal (string name) = #0;	//FIXME where?
 

ruamoko/lib/PropertyList.r

@@ -1,4 +1,4 @@
-#include "PropertyList.h"
+#include <PropertyList.h>
 
 @implementation PLItem
 

ruamoko/lib/Protocol.r

@@ -1,4 +1,4 @@
-#include "Protocol.h"
+#include <Protocol.h>
 
 struct obj_protocol_list {
 	struct obj_protocol_list *next;

ruamoko/lib/Set.r

@@ -1,4 +1,4 @@
-#include "Set.h"
+#include <Set.h>
 
 void set_del_iter (set_iter_t *set_iter) = #0;
 set_t *set_new (void) = #0;

ruamoko/lib/cbuf.r

@@ -1,4 +1,4 @@
-#include "cbuf.h"
+#include <cbuf.h>
 
 void (string text) Cbuf_AddText = #0;
 void (string text) Cbuf_InsertText = #0;

ruamoko/lib/cmd.r

@@ -1,4 +1,4 @@
-#include "cmd.h"
+#include <cmd.h>
 
 void (string name, void () func) Cmd_AddCommand = #0;
 int () Cmd_Argc = #0;

ruamoko/lib/crudefile.r

@@ -1,4 +1,4 @@
-#include "crudefile.h"
+#include <crudefile.h>
 
 float (string path, string mode) cfopen = #0x000f0000 + 103;
 void (float desc) cfclose = #0x000f0000 + 104;

ruamoko/lib/cvar.r

@@ -1,4 +1,4 @@
-#include "cvar.h"
+#include <cvar.h>
 
 float (string s) cvar = #45;
 void (string var, string val) cvar_set = #72;

ruamoko/lib/debug.r

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include <debug.h>
 
 void abort (void) = #6;
 void coredump (void) = #28;

ruamoko/lib/draw.r

@@ -1,4 +1,4 @@
-#include "draw.h"
+#include <draw.h>
 
 void Draw_FreePic (qpic_t pic) = #0;
 qpic_t Draw_MakePic (int width, int heiight, string data) = #0;

ruamoko/lib/entities.r

@@ -1,4 +1,4 @@
-#include "entities.h"
+#include <entities.h>
 
 void setmodel (entity e, string m) = #3;
 void setorigin (entity e, vector o) = #2;

ruamoko/lib/gib.r

@@ -1,4 +1,4 @@
-#include "gib.h"
+#include <gib.h>
 
 void GIB_Builtin_Add (string name, void func (int argc, string *argv)) = #0;
 int (string value) GIB_Return = #0;

ruamoko/lib/hash.r

@@ -1,4 +1,4 @@
-#include "hash.h"
+#include <hash.h>
 
 hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
 void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;

ruamoko/lib/infokey.r

@@ -1,4 +1,4 @@
-#include "infokey.h"
+#include <infokey.h>
 
 string (entity e, string key) infokey = #80;
 void (entity ent, string key, string value) setinfokey = #0x000f0000 + 102;

ruamoko/lib/key.r

@@ -1,4 +1,4 @@
-#include "key.h"
+#include <key.h>
 
 int Key_keydown (int keynum) = #0;
 string (string imt, int keynum, string binding) Key_SetBinding = #0;

ruamoko/lib/math.r

@@ -1,4 +1,4 @@
-#include "math.h"
+#include <math.h>
 
 vector v_forward, v_up, v_right;
 

ruamoko/lib/message.r

@@ -1,4 +1,4 @@
-#include "message.h"
+#include <message.h>
 
 void (...) bprint = #23;
 void (entity client, string s) sprint = #24;

ruamoko/lib/msgbuf.r

@@ -1,4 +1,4 @@
-#include "msgbuf.h"
+#include <msgbuf.h>
 
 msgbuf_t *MsgBuf_New (int size) = #0;
 void MsgBuf_Delete (msgbuf_t *msgbuf) = #0;

ruamoko/lib/nq_message.r

@@ -1,3 +1,3 @@
-#include "nq_message.h"
+#include <nq_message.h>
 
 void (vector o, vector d, float color, float count) particle = #48;

ruamoko/lib/physics.r

@@ -1,4 +1,4 @@
-#include "physics.h"
+#include <physics.h>
 
 float		trace_allsolid;
 float		trace_startsolid;

ruamoko/lib/plist.r

@@ -1,4 +1,4 @@
-#include "plist.h"
+#include <plist.h>
 
 plitem_t PL_GetFromFile (QFile file) = #0;
 plitem_t PL_GetPropertyList (string str) = #0;

ruamoko/lib/qfile.r

@@ -1,4 +1,4 @@
-#include "qfile.h"
+#include <qfile.h>
 
 int Qrename (string old, string new) = #0;
 int Qremove (string path) = #0;

ruamoko/lib/qfs.r

@@ -1,4 +1,4 @@
-#include "qfs.h"
+#include <qfs.h>
 
 QFile QFS_Open (string path, string mode) = #0;
 QFile QFS_WOpen (string path, int zip) = #0;

ruamoko/lib/qw_message.r

@@ -1,3 +1,3 @@
-#include "qw_message.h"
+#include <qw_message.h>
 
 void (vector where, float set) multicast = #82;

ruamoko/lib/qw_physics.r

@@ -1,4 +1,4 @@
-#include "qw_physics.h"
+#include <qw_physics.h>
 
 entity (entity ent) testentitypos = #0x000f0000 + 92;
 void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #0x000f0000 + 98;

ruamoko/lib/qw_sys.r

@@ -1,3 +1,3 @@
-#include "qw_sys.h"
+#include <qw_sys.h>
 
 void (entity killer, entity killee) logfrag = #79;

ruamoko/lib/script.r

@@ -1,4 +1,4 @@
-#include "script.h"
+#include <script.h>
 
 script_t Script_New (void) = #0;
 void Script_Delete (script_t script) = #0;

ruamoko/lib/server.r

@@ -1,4 +1,4 @@
-#include "server.h"
+#include <server.h>
 
 void (string s) precache_sound = #19;
 void (string s) precache_model = #20;

ruamoko/lib/sound.r

@@ -1,3 +1,3 @@
-#include "sound.h"
+#include <sound.h>
 
 void  (string sound) S_LocalSound = #0;

ruamoko/lib/string.r

@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 string (float f) ftos = #26;
 string (vector v) vtos = #27;

ruamoko/lib/sv_sound.r

@@ -1,4 +1,4 @@
-#include "sound.h"
+#include <sound.h>
 
 void (entity e, float chan, string samp, float vol, float atten) sound = #8;
 void (vector pos, string samp, float vol, float atten) ambientsound = #74;

ruamoko/lib/system.r

@@ -1,4 +1,4 @@
-#include "system.h"
+#include <system.h>
 
 float time;