Stefan Brüns
73a7cf1403
- Fix underlinkage of libraries - Use unified diffs for patches - Remove need for Sample apps wrapper scripts, add 0001-Add-default-for-WM5_PATH.patch - Clean up specfile OBS-URL: https://build.opensuse.org/request/show/999686 OBS-URL: https://build.opensuse.org/package/show/science/wildmagic5?expand=0&rev=2
89 lines
3.3 KiB
Diff
89 lines
3.3 KiB
Diff
From d1f6794b28739ef18d8b7336548b1292f2736122 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Sun, 28 Aug 2022 15:57:58 +0200
|
|
Subject: [PATCH] Fix ldflags
|
|
|
|
Use LDFLAGS when linking executables
|
|
---
|
|
WildMagic5/SampleGraphics/makeapp.wm5 | 5 +++--
|
|
WildMagic5/SampleImagics/makeapp.wm5 | 5 +++--
|
|
WildMagic5/SampleMathematics/makeapp.wm5 | 5 +++--
|
|
WildMagic5/SamplePhysics/makeapp.wm5 | 5 +++--
|
|
4 files changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/WildMagic5/SampleGraphics/makeapp.wm5 b/WildMagic5/SampleGraphics/makeapp.wm5
|
|
index 5f64b15..2f0f573 100644
|
|
--- a/WildMagic5/SampleGraphics/makeapp.wm5
|
|
+++ b/WildMagic5/SampleGraphics/makeapp.wm5
|
|
@@ -16,10 +16,11 @@ LIBPATH := -L ../../SDK/Library/$(CFG)
|
|
WLIBS := -lWm5Applications -lWm5Graphics -lWm5Imagics -lWm5Physics -lWm5Mathematics -lWm5Core
|
|
XLIBS := -lX11 -lXext
|
|
GLIBS := -lGL -lGLU
|
|
-LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LDFLAGS := @@LDFLAGS@@
|
|
|
|
build : $(OBJ)
|
|
- $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LIBS)
|
|
+ $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LDFLAGS) $(LIBS)
|
|
|
|
$(CFG)/%.o : %.cpp
|
|
@mkdir -p $(CFG)
|
|
diff --git a/WildMagic5/SampleImagics/makeapp.wm5 b/WildMagic5/SampleImagics/makeapp.wm5
|
|
index 5f64b15..2f0f573 100644
|
|
--- a/WildMagic5/SampleImagics/makeapp.wm5
|
|
+++ b/WildMagic5/SampleImagics/makeapp.wm5
|
|
@@ -16,10 +16,11 @@ LIBPATH := -L ../../SDK/Library/$(CFG)
|
|
WLIBS := -lWm5Applications -lWm5Graphics -lWm5Imagics -lWm5Physics -lWm5Mathematics -lWm5Core
|
|
XLIBS := -lX11 -lXext
|
|
GLIBS := -lGL -lGLU
|
|
-LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LDFLAGS := @@LDFLAGS@@
|
|
|
|
build : $(OBJ)
|
|
- $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LIBS)
|
|
+ $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LDFLAGS) $(LIBS)
|
|
|
|
$(CFG)/%.o : %.cpp
|
|
@mkdir -p $(CFG)
|
|
diff --git a/WildMagic5/SampleMathematics/makeapp.wm5 b/WildMagic5/SampleMathematics/makeapp.wm5
|
|
index 5f64b15..2f0f573 100644
|
|
--- a/WildMagic5/SampleMathematics/makeapp.wm5
|
|
+++ b/WildMagic5/SampleMathematics/makeapp.wm5
|
|
@@ -16,10 +16,11 @@ LIBPATH := -L ../../SDK/Library/$(CFG)
|
|
WLIBS := -lWm5Applications -lWm5Graphics -lWm5Imagics -lWm5Physics -lWm5Mathematics -lWm5Core
|
|
XLIBS := -lX11 -lXext
|
|
GLIBS := -lGL -lGLU
|
|
-LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LDFLAGS := @@LDFLAGS@@
|
|
|
|
build : $(OBJ)
|
|
- $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LIBS)
|
|
+ $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LDFLAGS) $(LIBS)
|
|
|
|
$(CFG)/%.o : %.cpp
|
|
@mkdir -p $(CFG)
|
|
diff --git a/WildMagic5/SamplePhysics/makeapp.wm5 b/WildMagic5/SamplePhysics/makeapp.wm5
|
|
index 5f64b15..2f0f573 100644
|
|
--- a/WildMagic5/SamplePhysics/makeapp.wm5
|
|
+++ b/WildMagic5/SamplePhysics/makeapp.wm5
|
|
@@ -16,10 +16,11 @@ LIBPATH := -L ../../SDK/Library/$(CFG)
|
|
WLIBS := -lWm5Applications -lWm5Graphics -lWm5Imagics -lWm5Physics -lWm5Mathematics -lWm5Core
|
|
XLIBS := -lX11 -lXext
|
|
GLIBS := -lGL -lGLU
|
|
-LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LIBS := $(WLIBS) $(XLIBS) $(GLIBS) -lpthread -lm
|
|
+LDFLAGS := @@LDFLAGS@@
|
|
|
|
build : $(OBJ)
|
|
- $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LIBS)
|
|
+ $(CC) $(LIBPATH) $(OBJ) -o $(APP).$(CFG) $(LDFLAGS) $(LIBS)
|
|
|
|
$(CFG)/%.o : %.cpp
|
|
@mkdir -p $(CFG)
|
|
--
|
|
2.37.1
|
|
|