909e396ea1
- Add pointer to git repository with all patches. - Use %autopatch to simplify patch application. OBS-URL: https://build.opensuse.org/package/show/science/TreeMaker?expand=0&rev=2
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
From: Aaron Puchert <aaronpuchert@alice-dsl.net>
|
|
Date: Sat, 8 Apr 2023 23:00:22 +0200
|
|
Subject: [PATCH 01/20] Allow building with system wxWidgets
|
|
|
|
At least my distribution doesn't seem to ship hhp2cached, so it has to
|
|
be built manually and the directory passed via WXHLPCACHEDIR.
|
|
---
|
|
linux/Makefile | 11 +----------
|
|
1 file changed, 1 insertion(+), 10 deletions(-)
|
|
|
|
diff --git a/linux/Makefile b/linux/Makefile
|
|
index c737532..20662e4 100644
|
|
--- a/linux/Makefile
|
|
+++ b/linux/Makefile
|
|
@@ -6,8 +6,6 @@
|
|
### Check and optionally change the next few lines in order to match
|
|
### your platform
|
|
|
|
-# Where wxWidgets is installed
|
|
-WXHOME = /opt/wxGTK-2.6.2
|
|
# Binary name
|
|
PROGRAM = TreeMaker
|
|
# Installation directory prefix (usually /usr/local); by wxWidgets
|
|
@@ -29,8 +27,7 @@ OPTIONS += -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)/\"
|
|
OPTIONS += -DCAF
|
|
|
|
# Auxiliary wxWidgets apps
|
|
-WXCONFIG = $(WXPATH)/wx-config
|
|
-WXHLPCACHEDIR = $(WXPATH)/utils/hhp2cached
|
|
+WXCONFIG = wx-config
|
|
|
|
# Auxiliary program files
|
|
HELP = $(BUILDGENERIC)/help.zip
|
|
@@ -40,19 +37,15 @@ BUILD ?= release
|
|
|
|
ifeq ($(BUILD),debug)
|
|
CONDFLAGS = -DTMWX -D__WXDEBUG__ -g
|
|
- WX = debug
|
|
else
|
|
ifeq ($(BUILD),devel)
|
|
CONDFLAGS = -DTMWX -DTMDEBUG -g
|
|
- WX = release
|
|
else
|
|
ifeq ($(BUILD),profile)
|
|
CONDFLAGS = -DTMWX -DTMPROFILE -O3 -g -pg
|
|
- WX = release
|
|
else
|
|
ifeq ($(BUILD),release)
|
|
CONDFLAGS = -DTMWX -O3
|
|
- WX = release
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -60,8 +53,6 @@ endif
|
|
|
|
CFLAGS = `$(WXCONFIG) --cxxflags` \
|
|
-Wall $(CONDFLAGS) $(OPTIONS) $(INCCFLAGS)
|
|
-# Use either debug or release build directories of wxW
|
|
-WXPATH = $(WXHOME)/build-$(WX)
|
|
# You may remake everything here anytime you want
|
|
BUILDGENERIC = build
|
|
# We'll leave dependency, object and binary files here
|