Fixed|Server: Fixed compilation issues on Linux

skyjake · Dec 30, 2012 · f6dfe93 · f6dfe93
1 parent 72dc958
commit f6dfe93
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/doomsday/engine/api/dd_vectorgraphic.h b/doomsday/engine/api/dd_vectorgraphic.h
@@ -35,12 +35,20 @@ typedef struct def_svgline_s {
     const Point2Rawf* points;
 } def_svgline_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void R_NewSvg(svgid_t svgId, const def_svgline_t* lines, uint numLines);
 
 void GL_DrawSvg(svgid_t svgId, const Point2Rawf* origin);
 void GL_DrawSvg2(svgid_t svgId, const Point2Rawf* origin, float scale);
 void GL_DrawSvg3(svgid_t svgId, const Point2Rawf* origin, float scale, float angle);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 ///@}
 
 #endif /* LIBDENG_API_VECTORGRAPHIC_H */
diff --git a/doomsday/engine/include/de_platform.h b/doomsday/engine/include/de_platform.h
@@ -85,6 +85,7 @@ const char* strcasestr(const char* text, const char* sub);
  */
 #if defined(UNIX)
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 
 #ifdef __GNUC__

diff --git a/doomsday/engine/include/gl/gl_deferredapi.h b/doomsday/engine/include/gl/gl_deferredapi.h
@@ -29,6 +29,8 @@
 #ifndef LIBDENG_DEFERRED_GL_API_H
 #define LIBDENG_DEFERRED_GL_API_H
 
+#ifdef __CLIENT__
+
 /**
  * @def LIBDENG_DISABLE_DEFERRED_GL_API
  * Disables the automatic rerouting of GL API calls to the deferring queue.
@@ -60,5 +62,7 @@ void Deferred_glFogfv(GLenum p, const GLfloat* v);
 } // extern "C"
 #endif
 
+#endif // __CLIENT__
+
 #endif // LIBDENG_DISABLE_DEFERRED_GL_API
 #endif // LIBDENG_DEFERRED_GL_API_H
diff --git a/doomsday/engine/include/gl/sys_opengl.h b/doomsday/engine/include/gl/sys_opengl.h
@@ -56,7 +56,9 @@
 #    include <GL/glu.h>
 #    include <OpenGL/OpenGL.h>
 #  else
-#    include <SDL.h>
+#    ifdef __CLIENT__
+#      include <SDL.h>
+#    endif
 #    include <GL/gl.h>
 #    include <GL/glext.h>
 #    include <GL/glu.h>

diff --git a/doomsday/engine/src/filesys/sys_direc.c b/doomsday/engine/src/filesys/sys_direc.c
@@ -37,8 +37,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "de_platform.h"
 #include "de_base.h"
+#include "de_platform.h"
 #include "de_system.h"
 #include "m_misc.h"
 
@@ -206,7 +206,7 @@ static void resolveHomeRelativeDirectives(char* path, size_t maxLen)
     }
     else
     {
-        char userName[PATH_MAX], *end = NULL;
+        char userName[4096], *end = NULL;
         struct passwd *pw;
 
         end = strchr(path + 1, '/');

diff --git a/doomsday/server/include/server_dummies.h b/doomsday/server/include/server_dummies.h
@@ -34,7 +34,7 @@
 #include "dd_gl.h"
 
 #ifndef __SERVER__
-#  error Attempted to include server's header in a non-server build
+#  error "Attempted to include server's header in a non-server build"
 #endif
 
 DENG_EXTERN_C void ClMobj_EnableLocalActions(struct mobj_s *mo, boolean enable);

diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro
@@ -43,9 +43,13 @@ win32 {
 else:macx {
 }
 else {
+    DEFINES += __USE_BSD _GNU_SOURCE=1
+
     # Generic Unix.
     QMAKE_LFLAGS += -rdynamic
 
+    LIBS += -lX11 # TODO: Get rid of this! -jk
+
     !freebsd-*: LIBS += -ldl
 }