Changes necessary to build and run on Solaris 10 x86

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5383 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/common.h b/common.h
index 4cc520e34c12a571da720379bfdb463bed51a46c..599495c68848bc6572694f6ce7e6fbb0a7f38494 100644 (file)
--- a/common.h
+++ b/common.h
@@ -33,6 +33,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # define MACOSX
 #endif
 
+// Create our own define for Solaris
+#if defined(__sun__) && defined(__svr4__)
+# define SUNOS
+#endif
+
+#ifdef SUNOS
+# define FNDELAY O_NDELAY      // FNDELAY's equivalent on SunOS is O_NDELAY
+# define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h
+#endif
 
 //============================================================================
 
@@ -76,8 +85,16 @@ unsigned short CRC_Block(const qbyte *data, int size);
 # if defined(WIN32)
 #  define BYTE_ORDER LITTLE_ENDIAN
 # else
-#  warning "Unable to determine the CPU endianess. Defaulting to little endian"
-#  define BYTE_ORDER LITTLE_ENDIAN
+#  if defined(SUNOS)
+#   if defined(__i386) || defined(__amd64)
+#    define BYTE_ORDER LITTLE_ENDIAN
+#   else
+#    define BYTE_ORDER BIG_ENDIAN
+#   endif
+#  else
+#   warning "Unable to determine the CPU endianess. Defaulting to little endian"
+#   define BYTE_ORDER LITTLE_ENDIAN
+#  endif
 # endif
 #endif
 

diff --git a/makefile b/makefile
index 62d13e4eb7c64d1cc1dbf5e07936c9a0c8cac1fc..f4c054abfe21c1cb0d4e5dc9c0225479f479fdf4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -14,9 +14,13 @@ ifneq ($(filter %BSD,$(DP_ARCH)),)
 else
 ifeq ($(DP_ARCH), Darwin)
        DP_MAKE_TARGET=macosx
+else
+ifeq ($(DP_ARCH), SunOS)
+       DP_MAKE_TARGET=sunos
 else
        DP_MAKE_TARGET=linux
 
+endif  # ifeq ($(DP_ARCH), SunOS)
 endif  # ifeq ($(DP_ARCH), Darwin)
 endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
 endif  # ifdef windir
@@ -78,6 +82,25 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        EXE_SDL=$(EXE_UNIXSDL)
 endif
 
+# SunOS configuration (Solaris)
+ifeq ($(DP_MAKE_TARGET), sunos)
+       OBJ_SOUND=$(OBJ_SUNOSSOUND)
+       LIB_SOUND=$(LIB_SUNOSSOUND)
+       OBJ_CD=$(OBJ_SUNOSCD)
+
+       OBJ_CL=$(OBJ_GLX)
+
+       CFLAGS_EXTRA=$(CFLAGS_SUNOS)
+
+       LDFLAGS_CL=$(LDFLAGS_SUNOSCL)
+       LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
+       LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
+
+       EXE_CL=$(EXE_UNIXCL)
+       EXE_SV=$(EXE_UNIXSV)
+       EXE_SDL=$(EXE_UNIXSDL)
+endif
+
 # BSD configuration
 ifeq ($(DP_MAKE_TARGET), bsd)
 ifeq ($(DP_ARCH),FreeBSD)

diff --git a/makefile.inc b/makefile.inc
index 31055a992c6036165729de63cb1a56a4177adfb3..37fe92256cd619187a0117ff5d86742beef4bb52 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -186,6 +186,21 @@ LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
+##### SunOS specific variables #####
+
+OBJ_SUNOSSOUND=$(OBJ_OSSSOUND)
+LIB_SUNOSSOUND=$(LIB_OSSSOUND)
+
+# No CD support available
+OBJ_SUNOSCD=$(OBJ_NOCD)
+
+CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP
+
+# Link
+LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL)
+LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl
+LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
+
 
 ##### BSD specific variables #####
 
@@ -303,21 +318,21 @@ bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
                LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
                LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
                LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
        strip $(EXE)