File makefile_rpmoptflags_wxversion.patch of Package espeakedit

Overview Repositories Revisions Requests Users Attributes Meta

File makefile_rpmoptflags_wxversion.patch of Package espeakedit

--- ./src/Makefile.orig	2011-09-14 14:59:35.000000000 +0300
+++ ./src/Makefile	2012-05-24 08:57:37.070235001 +0300
@@ -10,23 +10,21 @@
 
 OBJS=$(patsubst %.cpp,%.o,$(SRCS))
 
-WX_LIBS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 \
-   -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6
-
+WX_VERSION = 2.8
+WX_LIBS = -pthread -L /usr/lib64/wx-$(WX_VERSION)-stl/ -lwx_gtk2u_xrc-$(WX_VERSION) -lwx_gtk2u_qa-$(WX_VERSION) -lwx_gtk2u_html-$(WX_VERSION) -lwx_gtk2u_adv-$(WX_VERSION) -lwx_gtk2u_core-$(WX_VERSION) -lwx_baseu_xml-$(WX_VERSION) -lwx_baseu_net-$(WX_VERSION) -lwx_baseu-$(WX_VERSION) 
+WX_INCLUDES = -I/usr/lib64/wx-$(WX_VERSION)-stl/wx/include/gtk2-unicode-release-$(WX_VERSION) -I/usr/include/wx-$(WX_VERSION)
+ 
 LIBS=-lstdc++ -lportaudio
 
-CPPFLAGS =  -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6
-	-I/usr/include/wx-2.6 \
-	-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-	-D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
+DEFS = -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
 
-CXXFLAGS = -O2  -Wall -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \
-   -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
+CXXFLAGS = -O2  -Wall -fexceptions -I/usr/lib64/wx-$(WX_VERSION)-stl/wx/include/gtk2-unicode-release-$(WX_VERSION) -I/usr/include/wx-$(WX_VERSION) \
+   -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES  -DLD_DYNAMIC_WEAK=0 -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
 
 all: espeakedit
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -I. -c -fno-exceptions $<
+	$(CXX) $(CXXFLAGS) $(WX_INCLUDES) $(DEFS) -I. -c -fno-exceptions $<
 
 espeakedit: $(OBJS)
 	$(CXX) -o $@ $(OBJS) $(LIBS) $(WX_LIBS)

Places

File makefile_rpmoptflags_wxversion.patch of Package espeakedit

Places