[Bug 3429] New: Changes to main Makefile for SunOS(Solaris)

[bugzilla-daemon at icculus.org]

http://bugzilla.icculus.org/show_bug.cgi?id=3429

           Summary: Changes to main Makefile for SunOS(Solaris)
           Product: Quake 3
           Version: SVN HEAD
          Platform: Sun
        OS/Version: Solaris
            Status: NEW
          Severity: normal
          Priority: P3
         Component: Platform
        AssignedTo: zakk at icculus.org
        ReportedBy: vincent at cojot.name
         QAContact: quake3-bugzilla at icculus.org
                CC: vincent at cojot.name


current SVN HEAD 1212 doesn't compile on Solaris because:
- uname -p must be used for sunos too.
- libversioncheck doesn't work properly with the default 'grep' and 'cpp'.

I patched it this way (please tell me if it may be acceptable)
Index: quake3-Solaris_SVN1212/trunk/Makefile
===================================================================
--- quake3-Solaris_SVN1212/trunk/Makefile       (revision 1212)
+++ quake3-Solaris_SVN1212/trunk/Makefile       (working copy)
@@ -13,6 +13,11 @@
   COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
 endif

+ifeq ($(COMPILE_PLATFORM),sunos)
+  # SunOS is a tad different..
+  COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
+endif
+
 ifeq ($(COMPILE_PLATFORM),mingw32)
   ifeq ($(COMPILE_ARCH),i386)
     COMPILE_ARCH=x86
@@ -92,6 +97,10 @@
 USE_CURL=1
 endif

+ifndef USE_SDL_VERSION_CHECK
+USE_SDL_VERSION_CHECK=1
+endif
+
 ifndef USE_CURL_DLOPEN
   ifeq ($(PLATFORM),mingw32)
     USE_CURL_DLOPEN=0
@@ -664,6 +673,7 @@
   INSTALL=ginstall
   MKDIR=gmkdir
   COPYDIR="/usr/local/share/games/quake3"
+  USE_SDL_VERSION_CHECK=0

   ifneq (,$(findstring i86pc,$(shell uname -m)))
     ARCH=i386
@@ -866,7 +876,11 @@

 # Create the build directories, check libraries and print out
 # an informational message, then start building
+ifeq ($(USE_SDL_VERSION_CHECK=1),1)
 targets: makedirs libversioncheck
+else
+targets: makedirs
+endif
        @echo ""
        @echo "Building ioquake3 in $(B):"
        @echo "  PLATFORM: $(PLATFORM)"


-- 
Configure bugmail: http://bugzilla.icculus.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug, or are watching the QA contact.