[Timewarp-commit] makefile,1.18,1.19 client.ini,1.36,1.37

[Yura S. <yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689

Modified Files:
	makefile client.ini 
Log Message:
Fixed linux compilation issues. Code is compiling on amd64 now.


Index: client.ini
===================================================================
RCS file: /cvsroot/timewarp/client.ini,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** client.ini	2 Jun 2006 13:38:21 -0000	1.36
--- client.ini	18 Jun 2006 13:10:03 -0000	1.37
***************
*** 77,80 ****
  [Menu]
  skin = interfaces/gametest
! SelectGame = 19
  
--- 77,80 ----
  [Menu]
  skin = interfaces/gametest
! SelectGame = 11
  

Index: makefile
===================================================================
RCS file: /cvsroot/timewarp/makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** makefile	11 Jul 2005 00:25:01 -0000	1.18
--- makefile	18 Jun 2006 13:10:03 -0000	1.19
***************
*** 1,4 ****
  ##############################################################################
! # Compiling TimeWarp: make {win32=1} {debug=1} {NO_JGMOD=1}                  #
  #                                                                            #
  # Define win32=1    when compiling with Mingw32 gcc compiler for windows     #
--- 1,4 ----
  ##############################################################################
! # Compiling TimeWarp: make {win32=1} {debug=1}                               #
  #                                                                            #
  # Define win32=1    when compiling with Mingw32 gcc compiler for windows     #
***************
*** 15,19 ****
  ##############################################################################
  
! CC = g++
  LD = g++
  CFLAGS = -fsigned-char -Wall -Wno-deprecated-declarations
--- 15,20 ----
  ##############################################################################
  
! CXX = g++
! CC = gcc
  LD = g++
  CFLAGS = -fsigned-char -Wall -Wno-deprecated-declarations
***************
*** 22,29 ****
  
  VPATH = source source/ais source/games source/games/triggers source/melee \
!         source/newships source/other source/sc1ships source/sc2ships \
          source/sc3ships source/twgui source/util source/gamex \
          source/gamex/edit source/gamex/general source/gamex/stuff \
!         source/gamex/dialogs source/jpgalleg
  
  FILELIST= ${shell find source -type f "(" -name "*.c" -o -name "*.cpp" ")"}
--- 23,31 ----
  
  VPATH = source source/ais source/games source/games/triggers source/melee \
!         source/newships source/other source/ppiships source/sc1ships source/sc2ships \
          source/sc3ships source/twgui source/util source/gamex \
          source/gamex/edit source/gamex/general source/gamex/stuff \
!         source/gamex/dialogs source/jpgalleg source/jgmod source/menu \
!         source/alfont 
  
  FILELIST= ${shell find source -type f "(" -name "*.c" -o -name "*.cpp" ")"}
***************
*** 33,39 ****
  PDEPS = $(addsuffix .d,$(BASE_NAMES))
  
! ARCH = $(shell echo `arch`)
! ifeq ($(ARCH),ppc)
! ARCH    = powerpc
  endif
  
--- 35,48 ----
  PDEPS = $(addsuffix .d,$(BASE_NAMES))
  
! ifndef win32
! 	ARCH := $(shell echo `arch`)
! 	ifeq ($(ARCH),ppc)
! 		ARCH    = powerpc
! 	endif
! 	ifeq ($(ARCH),x86_64)
! 		ARCH	= k8
! 	endif
! else
! 	ARCH := i586
  endif
  
***************
*** 45,55 ****
  	NAME := ${addsuffix -debug,$(NAME)}
  else
! 	CFLAGS += -O -mcpu=$(ARCH) -s
! endif
! 
! ifdef NO_JGMOD
! 	CFLAGS += -DNO_JGMOD
! else
! 	LIBS = -ljgmod
  endif
  
--- 54,58 ----
  	NAME := ${addsuffix -debug,$(NAME)}
  else
! 	CFLAGS += -O -march=$(ARCH) -s
  endif
  
***************
*** 70,74 ****
  endif
  
! CFLAGS += -I./source 
  
  #CFLAGS += ${addprefix -I./, $(VPATH)}
--- 73,77 ----
  endif
  
! CFLAGS += -I./source -I./source/jgmod -I./source/alfont
  
  #CFLAGS += ${addprefix -I./, $(VPATH)}
***************
*** 99,103 ****
  
  $(OBJDIR)/%.o: %.cpp
! 	$(CC) -MMD $(CFLAGS) -c $< -o $@
  
  $(OBJDIR)/%.o: %.c
--- 102,106 ----
  
  $(OBJDIR)/%.o: %.cpp
! 	$(CXX) -MMD $(CFLAGS) -c $< -o $@
  
  $(OBJDIR)/%.o: %.c