[Cpri-develop] cpri/misc makefile.uni,1.5,1.6

[<ch...@pr...>]

Update of /cvsroot/cpri/cpri/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12319/misc

Modified Files:
	makefile.uni 
Log Message:
888646 Can't execute static built example on Linux


Index: makefile.uni
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.uni	1 Feb 2004 17:09:16 -0000	1.5
--- makefile.uni	1 Feb 2004 19:50:32 -0000	1.6
***************
*** 57,91 ****
  SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib
  
- 
- # -------- Find Allegro and makedoc. --------
- 
- ifdef NEED_MAKEDOC
- ifndef NEED_ALLEGRO
- ifeq ($(wildcard $(MAKEDOC_SOURCE)),)
- NEED_ALLEGRO = 1
- endif
- endif
- endif
- 
- ifdef NEED_ALLEGRO
- .PHONY: badalleg
- 
- ifdef ALLEGRO
- ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
- else
- badalleg:
- 	@echo Couldnt find Allegro!
- 	@echo Is your ALLEGRO environment variable set correctly? It should
- 	@echo point to the place where Allegro lives.
- endif
- 
- endif # ifdef NEED_ALLEGRO
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
- 
- 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
--- 57,60 ----
***************
*** 110,115 ****
  _default: default
  
- 
- 
  # -------- Decide what compiler options and libraries to use. --------
  
--- 79,82 ----
***************
*** 124,163 ****
  OFLAGS = -mcpu=pentium -O6 -ffast-math
  else
! ifdef PENTIUMONLY
! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
! else
! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
! endif
  endif
  
! ifdef STATICLINK_ALLEGRO
! ALLEGRO_CONFIG_FLAGS = --static
  else
! ALLEGRO_CONFIG_FLAGS = --shared
  endif
  
  ifdef DEBUGMODE
! # debugging build
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
! LFLAGS += -g
! LIB_FLAGS = -lcguid `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)`
! else
! ifdef PROFILEMODE
! # profiling build
! CFLAGS = $(WFLAGS) $(OFLAGS) -pg
! SFLAGS = $(WFLAGS)
! LFLAGS += -pg
! LIB_FLAGS = -lcgui `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)`
  else
! # optimised build
! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
! SFLAGS = $(WFLAGS)
! ifndef SYMBOLMODE
! LFLAGS += -s
! LIB_FLAGS = -lcgui `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)`
! endif
! endif
! endif
  
  ifdef CPRI_DEVELOPING
--- 91,128 ----
  OFLAGS = -mcpu=pentium -O6 -ffast-math
  else
!  ifdef PENTIUMONLY
!  OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!  OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
  endif
  
! ifdef STATICLINK
!  AL_CONF_OPTION = --static
!  LIB_FLAGS = -lcgui_s
  else
!  AL_CONF_OPTION = --shared
!  LIB_FLAGS = -lcgui
  endif
  
  ifdef DEBUGMODE
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS += -g
!  AL_CONF_LIB = debug
  else
!  ifdef PROFILEMODE
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS += -pg
!   AL_CONF_LIB = profile
!  else # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   AL_CONF_LIB = release
!  endif
! endif # DEBUGMODE
! 
! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)`
  
  ifdef CPRI_DEVELOPING