Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-16 13:57:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-16 13:57:05 +0300
commitdc14629b26cafcb390137b01cc7d3f13efc67d40 (patch)
tree3bf7bae9f168eca96fac0e989ab9d4f086dd3ed5 /intern/ghost/SConscript
parent86154b11ee2b461f4463b56f3498b1f68e8dc94a (diff)
GHOST: rename suffix X11 to Unix for non X11 files
We may use these for Wayland or SDL back-ends.
Diffstat (limited to 'intern/ghost/SConscript')
-rw-r--r--intern/ghost/SConscript11
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 0abd2c252e3..8fbe65fbf27 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -117,6 +117,11 @@ elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64
pass
try:
+ sources.remove('intern' + os.sep + f + 'Unix.cpp')
+ except ValueError:
+ pass
+
+ try:
sources.remove('intern' + os.sep + f + 'SDL.cpp')
except ValueError:
pass
@@ -138,6 +143,10 @@ elif window_system == 'darwin':
except ValueError:
pass
try:
+ sources.remove('intern' + os.sep + f + 'Unix.cpp')
+ except ValueError:
+ pass
+ try:
sources.remove('intern' + os.sep + f + 'SDL.cpp')
except ValueError:
pass
@@ -175,7 +184,7 @@ else:
elif window_system=='darwin':
sources.remove('intern' + os.sep + 'GHOST_NDOFManagerCocoa.mm')
else:
- sources.remove('intern' + os.sep + 'GHOST_NDOFManagerX11.cpp')
+ sources.remove('intern' + os.sep + 'GHOST_NDOFManagerUnix.cpp')
except ValueError:
pass