|
 |
6b1b643 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
6b1b643 |
Date: Tue, 19 Jan 2016 18:19:26 +0300
|
|
|
6b1b643 |
Subject: [PATCH] Fix include paths
|
|
|
6b1b643 |
|
|
|
6b1b643 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
6b1b643 |
|
|
|
de6456f |
diff --git a/icons/Makefile b/icons/Makefile
|
|
|
1464305 |
index 201b9508..e30d6a37 100644
|
|
|
de6456f |
--- a/icons/Makefile
|
|
|
de6456f |
+++ b/icons/Makefile
|
|
|
1464305 |
@@ -37,8 +37,8 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
|
|
|
f0503a1 |
# ----------------------------------------------------
|
|
|
de6456f |
# FLAGS
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
f0503a1 |
-ERL_FLAGS += -pa ../../wings/ebin
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -I ../.. -Werror +debug_info
|
|
|
f0503a1 |
+ERL_FLAGS += -pa $(shell pwd)/../../wings*/ebin
|
|
|
de6456f |
+ERL_COMPILE_FLAGS += -Werror +debug_info -pa $(shell pwd)/../../wings*/ebin
|
|
|
de6456f |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# Targets
|
|
|
6b1b643 |
diff --git a/plugins_src/Makefile b/plugins_src/Makefile
|
|
|
79accde |
index 6399ff0e..5fad213f 100644
|
|
|
6b1b643 |
--- a/plugins_src/Makefile
|
|
|
6b1b643 |
+++ b/plugins_src/Makefile
|
|
|
79accde |
@@ -34,7 +34,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
|
6b1b643 |
# ----------------------------------------------------
|
|
|
6b1b643 |
# FLAGS
|
|
|
6b1b643 |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -I $(WINGS_TOP)
|
|
|
de6456f |
+ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin -I $(WINGS_INTL)
|
|
|
6b1b643 |
|
|
|
6b1b643 |
# ----------------------------------------------------
|
|
|
6b1b643 |
# Targets
|
|
|
de6456f |
diff --git a/plugins_src/autouv/Makefile b/plugins_src/autouv/Makefile
|
|
|
1464305 |
index 7f88987a..9df1c6bf 100644
|
|
|
de6456f |
--- a/plugins_src/autouv/Makefile
|
|
|
de6456f |
+++ b/plugins_src/autouv/Makefile
|
|
|
79accde |
@@ -43,7 +43,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# FLAGS
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
|
8f92a19 |
+ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin $(TYPE_FLAGS) +debug_info
|
|
|
6b1b643 |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# Targets
|
|
|
de6456f |
diff --git a/plugins_src/commands/Makefile b/plugins_src/commands/Makefile
|
|
|
1464305 |
index c2a4357f..10aa09ba 100644
|
|
|
de6456f |
--- a/plugins_src/commands/Makefile
|
|
|
de6456f |
+++ b/plugins_src/commands/Makefile
|
|
|
1464305 |
@@ -68,7 +68,8 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
# FLAGS
|
|
|
79accde |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -pa $(WINGS_INTL) -Werror -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
|
8f92a19 |
+ERL_COMPILE_FLAGS += -Werror -I $(WINGS_E3D) $(TYPE_FLAGS) \
|
|
|
de6456f |
+ +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL)
|
|
|
6b1b643 |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# Targets
|
|
|
de6456f |
diff --git a/plugins_src/import_export/Makefile b/plugins_src/import_export/Makefile
|
|
|
8f92a19 |
index 64651df0..efb07b6c 100644
|
|
|
de6456f |
--- a/plugins_src/import_export/Makefile
|
|
|
de6456f |
+++ b/plugins_src/import_export/Makefile
|
|
|
79accde |
@@ -53,8 +53,9 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
|
79accde |
# ----------------------------------------------------
|
|
|
de6456f |
# FLAGS
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) \
|
|
|
79accde |
- -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
|
79accde |
+ERL_COMPILE_FLAGS += -Werror \
|
|
|
0f8708d |
+ -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) \
|
|
|
8f92a19 |
+ -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
|
|
|
6b1b643 |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
# Targets
|
|
|
de6456f |
diff --git a/plugins_src/primitives/Makefile b/plugins_src/primitives/Makefile
|
|
|
8f92a19 |
index 7afd56f5..123c1c29 100644
|
|
|
de6456f |
--- a/plugins_src/primitives/Makefile
|
|
|
de6456f |
+++ b/plugins_src/primitives/Makefile
|
|
|
79accde |
@@ -44,7 +44,8 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
|
79accde |
# ----------------------------------------------------
|
|
|
de6456f |
# FLAGS
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -Werror -I $(WINGS_TOP) $(TYPE_FLAGS) -pa $(WINGS_INTL) +debug_info
|
|
|
8f92a19 |
+ERL_COMPILE_FLAGS += -Werror -I $(WINGS_E3D) \
|
|
|
de6456f |
+ $(TYPE_FLAGS) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) +debug_info
|
|
|
6b1b643 |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# Targets
|
|
|
de6456f |
diff --git a/src/Makefile b/src/Makefile
|
|
|
79accde |
index 06502a6b..2e16abaf 100644
|
|
|
de6456f |
--- a/src/Makefile
|
|
|
de6456f |
+++ b/src/Makefile
|
|
|
79accde |
@@ -142,8 +142,8 @@ APP_TARGET = $(EBIN)/$(APP_FILE)
|
|
|
79accde |
# ----------------------------------------------------
|
|
|
de6456f |
# FLAGS
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
79accde |
-ERL_COMPILE_FLAGS += -Werror -I ../.. -I../_deps $(TYPE_FLAGS) \
|
|
|
79accde |
-'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL)
|
|
|
79accde |
+ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \
|
|
|
de6456f |
+'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin $(USE_WX)
|
|
|
6b1b643 |
|
|
|
de6456f |
# ----------------------------------------------------
|
|
|
de6456f |
# Targets
|