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

Collapse All | Expand All

(-)flobopuyo-0.20/Makefile (-4 / +7 lines)
Lines 49-55 LDFLAGS= Link Here
49
49
50
ifneq ($(PLATFORM), $(CYGWIN_VERSION))
50
ifneq ($(PLATFORM), $(CYGWIN_VERSION))
51
CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
51
CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
52
LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
52
LDFLAGS:=$(LDFLAGS)
53
LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
53
endif
54
endif
54
55
55
HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
56
HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
Lines 78-84 endif Link Here
78
# Win32
79
# Win32
79
ifeq ($(PLATFORM), $(CYGWIN_VERSION))
80
ifeq ($(PLATFORM), $(CYGWIN_VERSION))
80
CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
81
CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
81
LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
82
LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
83
LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
82
endif
84
endif
83
85
84
ifeq ($(ENABLE_AUDIO), true)
86
ifeq ($(ENABLE_AUDIO), true)
Lines 90-96 ifeq ($(ENABLE_OPENGL), true) Link Here
90
CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
92
CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
91
OBJFILES:=$(OBJFILES) glSDL.o
93
OBJFILES:=$(OBJFILES) glSDL.o
92
ifeq ($(PLATFORM), Linux)
94
ifeq ($(PLATFORM), Linux)
93
LDFLAGS:=$(LDFLAGS) -lGL
95
LDFLAGS:=$(LDFLAGS)
96
LIBS:=$(LIBS) -lGL
94
endif
97
endif
95
endif
98
endif
96
99
Lines 110-116 CXXFLAGS=${CFLAGS} Link Here
110
all: prelude flobopuyo
113
all: prelude flobopuyo
111
114
112
flobopuyo: ${OBJFILES}
115
flobopuyo: ${OBJFILES}
113
	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
116
	@echo "[flobopuyo]" && $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
114
	@echo "--------------------------------------"
117
	@echo "--------------------------------------"
115
	@echo " Compilation finished"
118
	@echo " Compilation finished"
116
	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
119
	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true

Return to bug 126835