Skip to content

Commit

Permalink
* Solaris patch from Vincent S. Cojot
Browse files Browse the repository at this point in the history
  • Loading branch information
timangus committed Dec 6, 2005
1 parent 9415f5f commit 2499d9b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion code/client/qal.c
Expand Up @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define SYMLOAD(x,y) GetProcAddress(x,y)
#define OBJFREE(x) FreeLibrary(x)

#elif defined __linux__ || defined __FreeBSD__ || defined MACOS_X
#elif defined __linux__ || defined __FreeBSD__ || defined MACOS_X || defined __sun
#include <dlfcn.h>
#define OBJTYPE void *
#define OBJLOAD(x) dlopen(x, RTLD_LAZY | RTLD_GLOBAL)
Expand Down
19 changes: 10 additions & 9 deletions code/unix/Makefile
Expand Up @@ -524,7 +524,7 @@ ifeq ($(PLATFORM),SunOS)
endif


BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe

ifeq ($(USE_SDL),1)
BASE_CFLAGS += -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
Expand All @@ -533,22 +533,23 @@ ifeq ($(PLATFORM),SunOS)
GL_CFLAGS = -I/usr/openwin/include
endif

OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
OPTIMIZE = -O3 -ffast-math -funroll-loops

ifeq ($(ARCH),sparc)
OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \
OPTIMIZE = -O0 -ffast-math -falign-loops=2 \
-falign-jumps=2 -falign-functions=2 -fstrength-reduce \
-mtune=ultrasparc -mv8plus -munaligned-doubles \
-funroll-loops
BASE_CFLAGS += -DNO_VM_COMPILED
else
ifeq ($(ARCH),i386)
OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \
OPTIMIZE = -O3 -march=i686 -ffast-math \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-funroll-loops -fstrength-reduce
endif
endif

DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0

RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)

Expand Down Expand Up @@ -586,8 +587,8 @@ ifeq ($(PLATFORM),SunOS)
$(B)/baseq3/vm/ui.qvm \
$(B)/missionpack/vm/qagame.qvm \
$(B)/missionpack/vm/cgame.qvm \
$(B)/missionpack/vm/ui.qvm
# $(B)/$(PLATFORM)quake3-smp
$(B)/missionpack/vm/ui.qvm \
$(B)/$(PLATFORM)quake3-smp
else
TARGETS=\
$(B)/$(PLATFORM)quake3 \
Expand All @@ -603,8 +604,8 @@ ifeq ($(PLATFORM),SunOS)
$(B)/baseq3/vm/ui.qvm \
$(B)/missionpack/vm/qagame.qvm \
$(B)/missionpack/vm/cgame.qvm \
$(B)/missionpack/vm/ui.qvm
# $(B)/$(PLATFORM)quake3-smp
$(B)/missionpack/vm/ui.qvm \
$(B)/$(PLATFORM)quake3-smp

endif

Expand Down

0 comments on commit 2499d9b

Please sign in to comment.