Blob Blame Raw
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 8622b383..90714caa 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -32,7 +32,7 @@ PS_ICONS=$(patsubst %,bluecube/%,$(notdir $(GEN_PS_ICONS)))
 # FLAGS
 # ----------------------------------------------------
 ERL_FLAGS += -pa ../ebin
-ERL_COMPILE_FLAGS += -Werror +debug_info
+ERL_COMPILE_FLAGS += -Werror +debug_info -pa $(shell pwd)/../../wings*/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/plugins_src/Makefile b/plugins_src/Makefile
index fb2fd953..352496e9 100644
--- a/plugins_src/Makefile
+++ b/plugins_src/Makefile
@@ -33,7 +33,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -Werror $(TYPE_FLAGS) +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL)
+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 c656ec3a..8e6595e4 100644
--- a/plugins_src/autouv/Makefile
+++ b/plugins_src/autouv/Makefile
@@ -45,7 +45,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
+ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
 
 # ----------------------------------------------------
 # Targets
diff --git a/plugins_src/commands/Makefile b/plugins_src/commands/Makefile
index 3b2ac121..7b644836 100644
--- a/plugins_src/commands/Makefile
+++ b/plugins_src/commands/Makefile
@@ -70,7 +70,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -I $(WINGS_SRC) \
    -I $(WINGS_E3D) $(TYPE_FLAGS) \
-  +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL)
+  +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 84fb72d2..ffc940b6 100644
--- a/plugins_src/import_export/Makefile
+++ b/plugins_src/import_export/Makefile
@@ -54,7 +54,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
 # FLAGS
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -Werror \
-  -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_INTL) \
+  -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -pa $(shell pwd)/../../../wings*/ebin -I $(WINGS_INTL) \
   -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
 
 # ----------------------------------------------------
diff --git a/plugins_src/primitives/Makefile b/plugins_src/primitives/Makefile
index 9b96d825..a9a01963 100644
--- a/plugins_src/primitives/Makefile
+++ b/plugins_src/primitives/Makefile
@@ -45,7 +45,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam)
 # FLAGS
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -Werror -I $(WINGS_SRC) -I $(WINGS_E3D) \
-  $(TYPE_FLAGS) -pa $(WINGS_INTL) -I $(WINGS_INTL) +debug_info
+  $(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 94c6e6e9..b3a30116 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -148,7 +148,7 @@ APP_TARGET = $(EBIN)/$(APP_FILE)
 # FLAGS
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \
-'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) $(USE_WX)
+'-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) -pa $(shell pwd)/../../wings*/ebin $(USE_WX)
 
 # ----------------------------------------------------
 # Targets