106 lines
4.6 KiB
Diff
106 lines
4.6 KiB
Diff
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Date: Tue, 19 Jan 2016 18:19:26 +0300
|
|
Subject: [PATCH] Fix include paths
|
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
|
diff --git a/icons/Makefile b/icons/Makefile
|
|
index 6be8c923..af2f556c 100644
|
|
--- a/icons/Makefile
|
|
+++ b/icons/Makefile
|
|
@@ -38,8 +38,8 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_FLAGS += -pa ../../wings/ebin
|
|
-ERL_COMPILE_FLAGS += -I ../.. -Werror +debug_info
|
|
+ERL_FLAGS += -pa $(shell pwd)/../../wings*/ebin
|
|
+ERL_COMPILE_FLAGS += -Werror +debug_info -pa $(shell pwd)/../../wings*/ebin
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/plugins_src/Makefile b/plugins_src/Makefile
|
|
index e94ad593..6aff3030 100644
|
|
--- a/plugins_src/Makefile
|
|
+++ b/plugins_src/Makefile
|
|
@@ -35,7 +35,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -I $(WINGS_TOP)
|
|
+ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin -I $(WINGS_INTL)
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/plugins_src/autouv/Makefile b/plugins_src/autouv/Makefile
|
|
index c808e2bc..dba43fe5 100644
|
|
--- a/plugins_src/autouv/Makefile
|
|
+++ b/plugins_src/autouv/Makefile
|
|
@@ -44,7 +44,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
+ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin $(TYPE_FLAGS) +debug_info
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/plugins_src/commands/Makefile b/plugins_src/commands/Makefile
|
|
index c2150232..22c62951 100644
|
|
--- a/plugins_src/commands/Makefile
|
|
+++ b/plugins_src/commands/Makefile
|
|
@@ -68,7 +68,8 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -pa $(WINGS_INTL) -Werror -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
+ERL_COMPILE_FLAGS += -Werror -I $(WINGS_E3D) $(TYPE_FLAGS) \
|
|
+ +debug_info -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL)
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/plugins_src/import_export/Makefile b/plugins_src/import_export/Makefile
|
|
index b972ee7e..ae9fb9d5 100644
|
|
--- a/plugins_src/import_export/Makefile
|
|
+++ b/plugins_src/import_export/Makefile
|
|
@@ -55,8 +55,9 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_INTL) \
|
|
- -I $(WINGS_TOP) $(TYPE_FLAGS) +debug_info
|
|
+ERL_COMPILE_FLAGS += -Werror \
|
|
+ -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) \
|
|
+ -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/plugins_src/primitives/Makefile b/plugins_src/primitives/Makefile
|
|
index b0d142e4..0dcf0d25 100644
|
|
--- a/plugins_src/primitives/Makefile
|
|
+++ b/plugins_src/primitives/Makefile
|
|
@@ -44,7 +44,8 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -Werror -I $(WINGS_TOP) $(TYPE_FLAGS) -pa $(WINGS_INTL) +debug_info
|
|
+ERL_COMPILE_FLAGS += -Werror -I $(WINGS_E3D) \
|
|
+ $(TYPE_FLAGS) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) +debug_info
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 97e621de..9f108146 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -143,8 +143,8 @@ APP_TARGET = $(EBIN)/$(APP_FILE)
|
|
# ----------------------------------------------------
|
|
# FLAGS
|
|
# ----------------------------------------------------
|
|
-ERL_COMPILE_FLAGS += -Werror -I ../.. -I../_deps $(TYPE_FLAGS) \
|
|
-'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL)
|
|
+ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \
|
|
+'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin $(USE_WX)
|
|
|
|
# ----------------------------------------------------
|
|
# Targets
|