Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 650982 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-13 / +8 lines)
Line  Link Here
0
-- Makefile
0
++ Makefile
Lines 11-17 Link Here
11
CC=g++
11
CC=g++
12
LD=g++
12
LD=g++
13
PROGNAME=blackvoxel
13
PROGNAME=blackvoxel
14
CFLAGS=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
14
CFLAGS+=-I "src/sc_Squirrel3/include"  -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
15
SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
15
SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
16
OBJ= $(SRC:src/%.cpp=obj/%.o)
16
OBJ= $(SRC:src/%.cpp=obj/%.o)
17
17
Lines 19-26 Link Here
19
19
20
ifeq ($(OS),Windows_NT)
20
ifeq ($(OS),Windows_NT)
21
  CPU_BITS=32
21
  CPU_BITS=32
22
  CFLAGS+= -O3 -c -fmessage-length=0 -march=i686
22
  LDFLAGS+=  -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
23
  LDFLAGS= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
24
else
23
else
25
  # Unix like operating systems
24
  # Unix like operating systems
26
  CPU_BITS= $(shell getconf LONG_BIT)
25
  CPU_BITS= $(shell getconf LONG_BIT)
Lines 28-46 Link Here
28
  KERNELNAME =$(shell uname -s)
27
  KERNELNAME =$(shell uname -s)
29
28
30
  ifeq ($(KERNELNAME),Linux)
29
  ifeq ($(KERNELNAME),Linux)
31
    CFLAGS+= -O3 -c -fmessage-length=0
30
    LDFLAGS+= -s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
32
    LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
33
  else ifeq ($(KERNELNAME), FreeBSD)
31
  else ifeq ($(KERNELNAME), FreeBSD)
34
    # To be done...
32
    # To be done...
35
    CFLAGS+= -O3 -c -fmessage-length=0
33
    LDFLAGS+= -s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
36
    LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
37
  else ifeq ($(KERNELNAME), Darwin)
34
  else ifeq ($(KERNELNAME), Darwin)
38
    CFLAGS+= -O3 -c -fmessage-length=0
35
    LDFLAGS+= -s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
39
    LDFLAGS=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
40
  else
36
  else
41
    # Unknow kernel... trying default flags
37
    # Unknow kernel... trying default flags
42
    CFLAGS+= -O3 -c -fmessage-length=0
38
    LDFLAGS+= -s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
43
    LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
44
  endif
39
  endif
45
endif
40
endif
46
41
Lines 57-63 Link Here
57
52
58
53
59
squirrel: 
54
squirrel: 
60
	cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
55
	+make -C src/sc_Squirrel3 sq$(CPU_BITS)
61
56
62
clean:
57
clean:
63
	@rm -rf obj
58
	@rm -rf obj

Return to bug 650982