72 lines
5.8 KiB
Diff
72 lines
5.8 KiB
Diff
diff -U 3 -dHrN -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in
|
|
--- a/component/enhedits/Makefile.in 2017-12-08 10:23:59.000000000 +0100
|
|
+++ b/component/enhedits/Makefile.in 2017-12-08 11:58:55.225430356 +0100
|
|
@@ -12,7 +12,7 @@
|
|
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
|
|
unitdir=$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
|
|
includedir=./
|
|
-options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi
|
|
+options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -gw3 -fPIC
|
|
|
|
[target]
|
|
units=enhedit.pas
|
|
diff -U 3 -dHrN -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in
|
|
--- a/component/glscene/Packages/Makefile.in 2017-12-08 11:22:07.000000000 +0100
|
|
+++ b/component/glscene/Packages/Makefile.in 2017-12-08 11:58:35.506223869 +0100
|
|
@@ -12,7 +12,7 @@
|
|
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
|
|
unitdir=../Source ../Source/Basis ../Source/FileFormats ../Source/SoundVideoAPIs ../Source/GameAPIs ../Source/Shaders $(LAZDIR)/components/images/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
|
|
includedir=../Source
|
|
-options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -Xs -CX -XX
|
|
+options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -gw3 -fPIC
|
|
|
|
[target]
|
|
units=GLScene_RunTime.pas
|
|
diff -U 3 -dHrN -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in
|
|
--- a/component/libsql/Makefile.in 2017-12-08 10:23:59.000000000 +0100
|
|
+++ b/component/libsql/Makefile.in 2017-12-08 11:59:11.150597116 +0100
|
|
@@ -12,7 +12,7 @@
|
|
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
|
|
unitdir=jansql/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
|
includedir=./
|
|
-options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi
|
|
+options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi -gw3 -fPIC
|
|
|
|
[target]
|
|
units=libsql.pas
|
|
diff -U 3 -dHrN -- a/component/Makefile.in b/component/Makefile.in
|
|
--- a/component/Makefile.in 2015-07-27 14:43:35.000000000 +0200
|
|
+++ b/component/Makefile.in 2017-12-08 11:59:55.628079274 +0100
|
|
@@ -21,7 +21,7 @@
|
|
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
|
|
unitdir=uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET) libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
|
includedir=./
|
|
-options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX
|
|
+options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -gw3 -fPIC
|
|
|
|
[clean]
|
|
files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
|
|
diff -U 3 -dHrN -- a/install.sh b/install.sh
|
|
--- a/install.sh 2015-12-18 11:58:20.000000000 +0100
|
|
+++ b/install.sh 2017-12-08 12:00:22.214368073 +0100
|
|
@@ -23,7 +23,7 @@
|
|
install -m 755 -d $destdir/share/icons/hicolor/48x48
|
|
install -m 755 -d $destdir/share/icons/hicolor/48x48/apps
|
|
|
|
-install -v -m 755 -s vpa/vpa $destdir/bin/virtualplanet
|
|
+install -v -m 755 vpa/vpa $destdir/bin/virtualplanet
|
|
install -v -m 644 Installer/Linux/vpa/share/applications/virtualplanet.desktop $destdir/share/applications/virtualplanet.desktop
|
|
install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/pixmaps/virtualplanet.png
|
|
install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png
|
|
diff -U 3 -dHrN -- a/vpa/Makefile.in b/vpa/Makefile.in
|
|
--- a/vpa/Makefile.in 2016-12-05 09:46:35.000000000 +0100
|
|
+++ b/vpa/Makefile.in 2017-12-08 12:00:41.400576487 +0100
|
|
@@ -17,7 +17,7 @@
|
|
[compiler]
|
|
unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
|
|
includedir=./ ../component/glscene/Source/
|
|
-options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -Xs -CX -XX
|
|
+options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -CX -XX -gw3 -fPIC
|
|
unitdir=../component/glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
|
|
|
|
[clean]
|