← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/ghost/intern/GHOST_ISystem.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/ghost/intern/GHOST_ISystem.cpp
31
31
 
32
32
 
33
33
/**
34
 
 
35
34
 * Copyright (C) 2001 NaN Technologies B.V.
36
 
 * @author      Maarten Gribnau
37
 
 * @date        May 7, 2001
 
35
 * \author      Maarten Gribnau
 
36
 * \date        May 7, 2001
38
37
 */
39
38
 
40
39
#include "GHOST_ISystem.h"
41
40
 
42
41
#ifdef WITH_HEADLESS
43
 
#       include "GHOST_SystemNULL.h"
 
42
#  include "GHOST_SystemNULL.h"
44
43
#elif defined(WITH_GHOST_SDL)
45
 
#       include "GHOST_SystemSDL.h"
 
44
#  include "GHOST_SystemSDL.h"
46
45
#elif defined(WIN32)
47
 
#       include "GHOST_SystemWin32.h"
 
46
#  include "GHOST_SystemWin32.h"
48
47
#else
49
 
#       ifdef __APPLE__
50
 
#               ifdef GHOST_COCOA
51
 
#                       include "GHOST_SystemCocoa.h"
52
 
#               else
53
 
#                       include "GHOST_SystemCarbon.h"
54
 
#               endif
55
 
#       else
56
 
#               include "GHOST_SystemX11.h"
57
 
#       endif
 
48
#  ifdef __APPLE__
 
49
#    ifdef GHOST_COCOA
 
50
#      include "GHOST_SystemCocoa.h"
 
51
#    else
 
52
#      include "GHOST_SystemCarbon.h"
 
53
#    endif
 
54
#  else
 
55
#    include "GHOST_SystemX11.h"
 
56
#  endif
58
57
#endif
59
58
 
60
59
 
61
 
GHOST_ISystem* GHOST_ISystem::m_system = 0;
 
60
GHOST_ISystem *GHOST_ISystem::m_system = 0;
62
61
 
63
62
 
64
63
GHOST_TSuccess GHOST_ISystem::createSystem()
70
69
#elif defined(WITH_GHOST_SDL)
71
70
                m_system = new GHOST_SystemSDL();
72
71
#elif defined(WIN32)
73
 
                m_system = new GHOST_SystemWin32 ();
 
72
                m_system = new GHOST_SystemWin32();
74
73
#else
75
 
#       ifdef __APPLE__
76
 
#               ifdef GHOST_COCOA
77
 
                        m_system = new GHOST_SystemCocoa ();
78
 
#               else
79
 
                        m_system = new GHOST_SystemCarbon ();
80
 
#               endif
81
 
#       else 
82
 
                m_system = new GHOST_SystemX11 ();
83
 
#       endif
 
74
#  ifdef __APPLE__
 
75
#    ifdef GHOST_COCOA
 
76
                m_system = new GHOST_SystemCocoa();
 
77
#    else
 
78
                m_system = new GHOST_SystemCarbon();
 
79
#    endif
 
80
#  else
 
81
                m_system = new GHOST_SystemX11();
 
82
#  endif
84
83
#endif 
85
84
                success = m_system != 0 ? GHOST_kSuccess : GHOST_kFailure;
86
85
        }
107
106
}
108
107
 
109
108
 
110
 
GHOST_ISystem* GHOST_ISystem::getSystem()
 
109
GHOST_ISystem *GHOST_ISystem::getSystem()
111
110
{
112
111
        return m_system;
113
112
}