rpms-archive/wings
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
This repository has been archived on 2026-09-10. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
wings/wings-0002-Fix-include-paths.patch
Peter Lemenkov 9bf5d28a84 Fix building 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2016-04-16 21:14:48 +03:00

391 lines
12 KiB
Diff
Raw Permalink Blame History

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/plugins_src/Makefile b/plugins_src/Makefile
index fb2fd95..2481717 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) -I $(WINGS_INTL) -I ../e3d
# ----------------------------------------------------
# Targets
diff --git a/plugins_src/autouv/auv_mapping.erl b/plugins_src/autouv/auv_mapping.erl
index 5b2937a..92e58e6 100644
--- a/plugins_src/autouv/auv_mapping.erl
+++ b/plugins_src/autouv/auv_mapping.erl
@@ -48,9 +48,9 @@
find_pinned_from_edges/2,
split_edges_1/2]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-include("auv.hrl").
--include_lib("wings/e3d/e3d.hrl").
+-include_lib("e3d.hrl").
-import(lists, [foldl/3,reverse/1]).
diff --git a/plugins_src/autouv/auv_seg_ui.erl b/plugins_src/autouv/auv_seg_ui.erl
index 985bc69..2d581dc 100644
--- a/plugins_src/autouv/auv_seg_ui.erl
+++ b/plugins_src/autouv/auv_seg_ui.erl
@@ -15,7 +15,7 @@
-export([start/4]).
-define(NEED_ESDL, 1).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-include("auv.hrl").
-import(lists, [sort/1,map/2,member/2,foldl/3,reverse/1]).
diff --git a/plugins_src/autouv/auv_segment.erl b/plugins_src/autouv/auv_segment.erl
index 7a7af8f..28caa18 100644
--- a/plugins_src/autouv/auv_segment.erl
+++ b/plugins_src/autouv/auv_segment.erl
@@ -21,7 +21,7 @@
-export([degrees/0, find_features/3, build_seeds/2]). %% Debugging
-endif.
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-include("auv.hrl").
-import(lists, [reverse/1,mapfoldl/3,sort/1,foldl/3]).
diff --git a/plugins_src/autouv/auv_texture.erl b/plugins_src/autouv/auv_texture.erl
index 5f38c0d..12a9567 100644
--- a/plugins_src/autouv/auv_texture.erl
+++ b/plugins_src/autouv/auv_texture.erl
@@ -17,9 +17,9 @@
-define(NEED_OPENGL, 1).
-define(NEED_ESDL, 1).
-define(ERROR, error_msg(?LINE)).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
--include_lib("wings/e3d/e3d.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d_image.hrl").
+-include_lib("e3d.hrl").
-include("auv.hrl").
-import(lists, [foreach/2,reverse/1,sort/1,foldl/3,member/2]).
diff --git a/plugins_src/autouv/wpc_autouv.erl b/plugins_src/autouv/wpc_autouv.erl
index fb431c6..3cbc6aa 100644
--- a/plugins_src/autouv/wpc_autouv.erl
+++ b/plugins_src/autouv/wpc_autouv.erl
@@ -16,8 +16,8 @@
-define(NEED_OPENGL, 1).
-define(NEED_ESDL, 1).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d_image.hrl").
-include("auv.hrl").
-export([init/0,menu/2,command/2,redraw/1]).
diff --git a/plugins_src/commands/ambocc_gl2.erl b/plugins_src/commands/ambocc_gl2.erl
index 041b65e..b4479c5 100644
--- a/plugins_src/commands/ambocc_gl2.erl
+++ b/plugins_src/commands/ambocc_gl2.erl
@@ -14,8 +14,8 @@
-export([ambient_occlusion/1]).
-define(NEED_OPENGL, 1).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d_image.hrl").
-record(ao, {df, vabs, fbo, tex, cleanup_fbo, buf}).
-define(TEX_SZ, 1024).
diff --git a/plugins_src/commands/wpc_absolute_move.erl b/plugins_src/commands/wpc_absolute_move.erl
index da536da..981ad59 100644
--- a/plugins_src/commands/wpc_absolute_move.erl
+++ b/plugins_src/commands/wpc_absolute_move.erl
@@ -12,7 +12,7 @@
%%
-module(wpc_absolute_move).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-export([init/0,menu/2,command/2]).
diff --git a/plugins_src/commands/wpc_circularise.erl b/plugins_src/commands/wpc_circularise.erl
index ae78721..60d600d 100644
--- a/plugins_src/commands/wpc_circularise.erl
+++ b/plugins_src/commands/wpc_circularise.erl
@@ -13,7 +13,7 @@
-module(wpc_circularise).
-export([init/0,menu/2,command/2]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
init() ->
true.
diff --git a/plugins_src/commands/wpc_connect_tool.erl b/plugins_src/commands/wpc_connect_tool.erl
index 8445d84..c6b25a0 100644
--- a/plugins_src/commands/wpc_connect_tool.erl
+++ b/plugins_src/commands/wpc_connect_tool.erl
@@ -18,7 +18,7 @@
-define(NEED_ESDL, 1).
-define(NEED_OPENGL, 1).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
%% State info
-record(cs, {v=[], %% Connected vertices
diff --git a/plugins_src/commands/wpc_constraints.erl b/plugins_src/commands/wpc_constraints.erl
index fcfd270..e8d4359 100644
--- a/plugins_src/commands/wpc_constraints.erl
+++ b/plugins_src/commands/wpc_constraints.erl
@@ -14,7 +14,7 @@
-module(wpc_constraints).
-export([init/0,menu/2,command/2]).
-define(NEED_ESDL, 1).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-include("e3d.hrl").
-define(NONZERO, 1.0e-6).
diff --git a/plugins_src/import_export/wpc_hlines.erl b/plugins_src/import_export/wpc_hlines.erl
index 1e771e9..6fee5aa 100755
--- a/plugins_src/import_export/wpc_hlines.erl
+++ b/plugins_src/import_export/wpc_hlines.erl
@@ -38,8 +38,8 @@
keysort/2,
keyreplace/4
]).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d.hrl").
-define(EPS, 1.0e-6).
-define(EPS1, 1.0e-5).
diff --git a/plugins_src/import_export/wpc_lwo.erl b/plugins_src/import_export/wpc_lwo.erl
index c4b7b73..2694b32 100644
--- a/plugins_src/import_export/wpc_lwo.erl
+++ b/plugins_src/import_export/wpc_lwo.erl
@@ -13,7 +13,7 @@
-module(wpc_lwo).
-export([init/0, menu/2, command/2, export/1]).
--include_lib("wings/e3d/e3d.hrl").
+-include_lib("e3d.hrl").
init() ->
true.
diff --git a/plugins_src/import_export/wpc_pov.erl b/plugins_src/import_export/wpc_pov.erl
index 9703a45..92fc450 100644
--- a/plugins_src/import_export/wpc_pov.erl
+++ b/plugins_src/import_export/wpc_pov.erl
@@ -16,9 +16,9 @@
-export([init/0, menu/2, command/2, dialog/2]).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d.hrl").
+-include_lib("e3d_image.hrl").
-define(TAG, povray36).
-define(KEY(K), {?TAG, (K)}).
diff --git a/plugins_src/primitives/wpc_bbox.erl b/plugins_src/primitives/wpc_bbox.erl
index b2f001a..3b01fe5 100644
--- a/plugins_src/primitives/wpc_bbox.erl
+++ b/plugins_src/primitives/wpc_bbox.erl
@@ -13,7 +13,7 @@
-module(wpc_bbox).
-export([init/0,menu/2,command/2]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_cylinder.erl b/plugins_src/primitives/wpc_cylinder.erl
index 3d2fe87..06d9bf9 100644
--- a/plugins_src/primitives/wpc_cylinder.erl
+++ b/plugins_src/primitives/wpc_cylinder.erl
@@ -14,7 +14,7 @@
-module(wpc_cylinder).
-export([init/0,menu/2,command/2]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-import(math, [cos/1,sin/1,pi/0]).
init() -> true.
diff --git a/plugins_src/primitives/wpc_geodome.erl b/plugins_src/primitives/wpc_geodome.erl
index a1154fb..3e9ad46 100644
--- a/plugins_src/primitives/wpc_geodome.erl
+++ b/plugins_src/primitives/wpc_geodome.erl
@@ -13,7 +13,7 @@
-module(wpc_geodome).
-export([init/0, menu/2, command/2]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_image.erl b/plugins_src/primitives/wpc_image.erl
index 56cb105..f1d9bf0 100644
--- a/plugins_src/primitives/wpc_image.erl
+++ b/plugins_src/primitives/wpc_image.erl
@@ -15,7 +15,7 @@
-export([init/0,menu/2,command/2]).
-define(NEED_OPENGL,1).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
-include("e3d.hrl").
-include("e3d_image.hrl").
diff --git a/plugins_src/primitives/wpc_knot.erl b/plugins_src/primitives/wpc_knot.erl
index 23fb8ec..0b0a030 100644
--- a/plugins_src/primitives/wpc_knot.erl
+++ b/plugins_src/primitives/wpc_knot.erl
@@ -14,7 +14,7 @@
-module(wpc_knot).
-export([init/0,menu/2,command/2]).
--include_lib("wings/intl_tools/wings_intl.hrl").
+-include_lib("wings_intl.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_ncube.erl b/plugins_src/primitives/wpc_ncube.erl
index 97b9498..f92f2e1 100644
--- a/plugins_src/primitives/wpc_ncube.erl
+++ b/plugins_src/primitives/wpc_ncube.erl
@@ -13,7 +13,7 @@
-module(wpc_ncube).
-export([init/0,menu/2,command/2]).
-import(math, [cos/1,sin/1,pi/0]).
--include_lib("wings/src/wings.hrl").
+-include_lib("wings.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_plane.erl b/plugins_src/primitives/wpc_plane.erl
index 0570913..1deb210 100644
--- a/plugins_src/primitives/wpc_plane.erl
+++ b/plugins_src/primitives/wpc_plane.erl
@@ -14,7 +14,7 @@
-module(wpc_plane).
-export([init/0,menu/2,command/2]).
-import(math, [sqrt/1,cos/1,pi/0,pow/2,exp/1]).
--include_lib("wings/intl_tools/wings_intl.hrl").
+-include_lib("wings_intl.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_spiral.erl b/plugins_src/primitives/wpc_spiral.erl
index 6458f0a..72ae14b 100644
--- a/plugins_src/primitives/wpc_spiral.erl
+++ b/plugins_src/primitives/wpc_spiral.erl
@@ -15,7 +15,7 @@
-export([init/0,menu/2,command/2]).
-import(math, [cos/1,sin/1,pi/0]).
--include_lib("wings/intl_tools/wings_intl.hrl").
+-include_lib("wings_intl.hrl").
init() ->
true.
diff --git a/plugins_src/primitives/wpc_torus.erl b/plugins_src/primitives/wpc_torus.erl
index 6a06f4e..b475dec 100644
--- a/plugins_src/primitives/wpc_torus.erl
+++ b/plugins_src/primitives/wpc_torus.erl
@@ -23,7 +23,7 @@
-export([init/0,menu/2,command/2]).
-import(math, [cos/1,sin/1,pi/0]).
--include_lib("wings/intl_tools/wings_intl.hrl").
+-include_lib("wings_intl.hrl").
init() -> true.
diff --git a/plugins_src/primitives/wpc_tt.erl b/plugins_src/primitives/wpc_tt.erl
index a6662f6..adf4c14 100644
--- a/plugins_src/primitives/wpc_tt.erl
+++ b/plugins_src/primitives/wpc_tt.erl
@@ -19,8 +19,8 @@
mapfoldl/3,foldl/3,sublist/3,map/2,last/1,seq/2,seq/3,
flatten/1,sum/1,append/1]).
--include_lib("wings/src/wings.hrl").
--include_lib("wings/e3d/e3d.hrl").
+-include_lib("wings.hrl").
+-include_lib("e3d.hrl").
-record(ttfont,
{nglyph, % number of glyphs
diff --git a/plugins_src/wp9_dialogs.erl b/plugins_src/wp9_dialogs.erl
index ea6a1e2..8b9a194 100644
--- a/plugins_src/wp9_dialogs.erl
+++ b/plugins_src/wp9_dialogs.erl
@@ -15,8 +15,8 @@
-export([init/1]).
-import(lists, [sort/1]).
--include_lib("wings/intl_tools/wings_intl.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("intl_tools/wings_intl.hrl").
+-include_lib("e3d_image.hrl").
-include_lib("wx/include/wx.hrl"). %% includes wx headers
init(Next) ->
diff --git a/src/wings_dialog.erl b/src/wings_dialog.erl
index 12721f0..56aab60 100644
--- a/src/wings_dialog.erl
+++ b/src/wings_dialog.erl
@@ -12,7 +12,7 @@
-module(wings_dialog).
-define(NEED_ESDL, 1). %% Needs to send mouseevents to camera
-include("wings.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("e3d_image.hrl").
-export([init/0,
info/3,
diff --git a/src/wings_image_viewer.erl b/src/wings_image_viewer.erl
index d2eddb4..1b19e8a 100644
--- a/src/wings_image_viewer.erl
+++ b/src/wings_image_viewer.erl
@@ -22,7 +22,7 @@
-behaviour(wx_object).
-include("wings.hrl").
--include_lib("wings/e3d/e3d_image.hrl").
+-include_lib("e3d_image.hrl").
%%%%%%%% API %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/wings_text.erl b/src/wings_text.erl
index e90ad2f..7a52425 100644
--- a/src/wings_text.erl
+++ b/src/wings_text.erl
@@ -19,7 +19,7 @@
-define(NEED_OPENGL, 1).
-include("wings.hrl").
--include_lib("wings/intl_tools/wings_chars.hrl").
+-include_lib("intl_tools/wings_chars.hrl").
-compile({parse_transform,ms_transform}).
-import(lists, [reverse/1]).
Reference in a new issue View git blame Copy permalink