public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/mandelbulber/files: mandelbulber-1.10-qa.patch
@ 2012-01-14 17:53 Kacper Kowalik (xarthisius)
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2012-01-14 17:53 UTC (permalink / raw
  To: gentoo-commits

xarthisius    12/01/14 17:53:11

  Added:                mandelbulber-1.10-qa.patch
  Log:
  Version bump
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch?rev=1.1&content-type=text/plain

Index: mandelbulber-1.10-qa.patch
===================================================================
Respect CXX,CXXFLAGS, fix linking order

Patch written by Kacper Kowalik <xarthisius@gentoo.org>
--- a/makefiles/src/subdir.mk
+++ b/makefiles/src/subdir.mk
@@ -63,12 +63,14 @@
 ./src/undo.d \
 ./src/cl_support.d 
 
+CXX ?= g++
+CXXFLAGS ?= -O2 -ffast-math
 
 # Each subdirectory must supply rules for building sources it contributes
 src/%.o: ../src/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
--- a/makefiles/makefile
+++ b/makefiles/makefile
@@ -5,6 +5,7 @@
 -include ../makefile.init
 
 RM := rm -rf
+CXX ?= g++
 
 # All of the sources participating in the build are defined here
 -include sources.mk
@@ -44,7 +45,7 @@
 mandelbulber: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C++ Linker'
-	g++ -L/usr/lib/x86_64-linux-gnu/ `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber"$(OBJS) $(USER_OBJS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o"mandelbulber" $(OBJS) $(USER_OBJS) `pkg-config --libs gtk+-2.0 gthread-2.0` $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-gfx/mandelbulber/files: mandelbulber-1.10-qa.patch
@ 2012-08-03  8:35 Kacper Kowalik (xarthisius)
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2012-08-03  8:35 UTC (permalink / raw
  To: gentoo-commits

xarthisius    12/08/03 08:35:40

  Removed:              mandelbulber-1.10-qa.patch
  Log:
  Version bump, drop old
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-08-03  8:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-03  8:35 [gentoo-commits] gentoo-x86 commit in media-gfx/mandelbulber/files: mandelbulber-1.10-qa.patch Kacper Kowalik (xarthisius)
  -- strict thread matches above, loose matches on Subject: below --
2012-01-14 17:53 Kacper Kowalik (xarthisius)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox