You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
3.2 KiB
86 lines
3.2 KiB
7 years ago
|
--- gtkada-gpl-2015-src/shared.gpr.in.old 2017-01-05 23:28:35.838073270 +0100
|
||
|
+++ gtkada-gpl-2015-src/shared.gpr.in 2017-01-05 23:30:17.752255709 +0100
|
||
|
@@ -44,6 +44,8 @@
|
||
|
for Switches ("C") use ("-O2");
|
||
|
end case;
|
||
|
|
||
|
+ for Driver ("C") use External ("CC", "gcc");
|
||
|
+ for PIC_Option ("C") use ("-fPIC");
|
||
|
for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
|
||
|
for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
|
||
|
end Compiler;
|
||
|
--- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
|
||
|
+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
|
||
|
@@ -39,7 +39,7 @@
|
||
|
prefix=@prefix@
|
||
|
exec_prefix=@exec_prefix@
|
||
|
libdir=@libdir@
|
||
|
-datadir=@datadir@
|
||
|
+datadir=$(DESTDIR)@datadir@
|
||
|
datarootdir=@datarootdir@
|
||
|
exampledir=${datadir}/examples/gtkada/testgtk
|
||
|
|
||
|
@@ -60,30 +60,33 @@
|
||
|
LIBRARY_TYPE_FOR_TOOLS=static
|
||
|
endif
|
||
|
|
||
|
-all: tools tests
|
||
|
+all: tools
|
||
|
static: build_library_type/static
|
||
|
relocatable: build_library_type/relocatable
|
||
|
|
||
|
tools:
|
||
|
@echo "====== Building tools ====="
|
||
|
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
|
||
|
+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
|
||
|
+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
|
||
|
|
||
|
build_library_type/%: src/gtkada-intl.adb
|
||
|
@echo "====== Building $(@F) libraries ====="
|
||
|
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
|
||
|
+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
|
||
|
+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
|
||
|
ifeq (${HAVE_OPENGL}, True)
|
||
|
${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
|
||
|
endif
|
||
|
|
||
|
src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
|
||
|
- gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
|
||
|
+ $(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
|
||
|
|
||
|
testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
|
||
|
- gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
|
||
|
+ $(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
|
||
|
|
||
|
tests: testgtk/opengl/view_gl.adb
|
||
|
@echo "====== Building tests ====="
|
||
|
- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
|
||
|
+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
|
||
|
+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
|
||
|
|
||
|
install/%: force
|
||
|
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
|
||
|
@@ -96,7 +96,7 @@
|
||
|
ifeq (${HAVE_OPENGL}, True)
|
||
|
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
|
||
|
--sources-subdir=include/gtkada/gtkada_gl.$(@F) \
|
||
|
- --lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
|
||
|
+ --lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
|
||
|
-Psrc/opengl/gtkada_gl.gpr
|
||
|
endif
|
||
|
|
||
|
@@ -106,12 +106,9 @@
|
||
|
--project-subdir=lib/gnat gtkada
|
||
|
endif
|
||
|
|
||
|
-install: install-clean
|
||
|
+install:
|
||
|
${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
|
||
|
--mode=usage -Psrc/tools/tools.gpr
|
||
|
- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
|
||
|
- --mode=usage --exec-subdir=${exampledir} \
|
||
|
- -Ptestgtk.gpr -aP ../src
|
||
|
|
||
|
@echo '-----------------------------------------------------------------------'
|
||
|
@echo '-- GtkAda has now been installed. --'
|