haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ale: link libale against libshared (#10202)

Browse Source 
no revbump since it doesn't run on beta4
This commit is contained in:
augiedoggie
2024-03-08 23:06:29 -07:00
committed by GitHub
parent 522f32b556
commit d3f0843842
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
haiku-libs/ale/ale-0.9.1.recipe
View File

@@ -49,42 +49,42 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake -DCMAKE_BUILD_TYPE=Release .
make
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir/ALEditor
cp ALEditor $appsDir/ALEditor/ALEditor
mkdir -p $libDir
cp libale.so $libDir/libale.so
mkdir -pv $appsDir
cp -afv ALEditor $appsDir/ALEditor
mkdir -pv $libDir
cp -afv libale.so $libDir/libale.so
addAppDeskbarSymlink $appsDir/ALEditor/ALEditor ALEditor
addAppDeskbarSymlink $appsDir/ALEditor ALEditor
# copy development headers
headersALE="LayoutArchive.h"
headersALM="ALMGroup.h ALMLayout.h ALMLayoutBuilder.h Area.h Column.h Row.h Tab.h"
headersLinearSpec="Constraint.h LinearProgrammingTypes.h LinearSpec.h Summand.h Variable.h"
mkdir -p $includeDir/ale
mkdir -pv $includeDir/ale
for file in $headersALE
do
cp headers/editor/${file} $includeDir/ale/${file}
cp -afv headers/editor/${file} $includeDir/ale/${file}
done
mkdir -p $includeDir/alm
mkdir -pv $includeDir/alm
for file in $headersALM
do
cp headers/haiku_private/alm/${file} $includeDir/alm/${file}
cp -afv headers/haiku_private/alm/${file} $includeDir/alm/${file}
done
mkdir -p $includeDir/linearspec
mkdir -pv $includeDir/linearspec
for file in $headersLinearSpec
do
cp headers/haiku_private/linearspec/${file} $includeDir/linearspec/${file}
cp -afv headers/haiku_private/linearspec/${file} $includeDir/linearspec/${file}
done
# copy example
mkdir -p $dataDir/ale/example
cp example/* $dataDir/ale/example/
mkdir -pv $dataDir/ale/example
cp -afv example/* $dataDir/ale/example/
}

27
haiku-libs/ale/patches/ale-0.9.1.patchset
View File

@@ -1,4 +1,4 @@
From dadd0ac05fd7ca96c4e1f15be8a814e0c16f00ca Mon Sep 17 00:00:00 2001
From 481fd9ee2cb2e8ecd4be152d7a8101afcbf116e9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 29 Sep 2018 15:41:42 +0200
Subject: gcc7 fix
@@ -24,5 +24,28 @@ index 02b476f..e886be8 100644
SetHighColor(borderColor);
StrokeRect(region.Frame());
--
2.19.0
2.43.2
From fcc92af352ef1fc5287729924022a39ed365e74a Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Fri, 8 Mar 2024 22:54:58 -0700
Subject: link libale against libshared
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cc403a..c0453a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,8 @@ add_library(ale SHARED
src/editor/LayoutArchive.cpp
)
+target_link_libraries(ale shared)
+
add_executable(ALEditor ALEditor.cpp)
ADD_CUSTOM_COMMAND(TARGET ALEditor COMMAND rc -o ALEditor.rsrc ${CMAKE_CURRENT_SOURCE_DIR}/res/ALEditor.rdef COMMENT "Compiling resources")
ADD_CUSTOM_COMMAND(TARGET ALEditor COMMAND xres -o ALEditor ALEditor.rsrc COMMENT "Adding resources to executable")
--
2.43.2