← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ginkgocadx/oneiric

« back to all changes in this revision

Viewing changes to src/cadxcore/main/entorno.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2011-05-02 08:09:26 UTC
  • Revision ID: james.westby@ubuntu.com-20110502080926-tfd00s81ak843xk3
Tags: 2.4.1.1-1
http://bugs.debian.org/628106
Initial release (Closes: #628106)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/entorno.cpp
116
116
        wxString pluginsDir;
117
117
        wxString langDir;
118
118
        
119
 
        #if defined(_WINDOWS) || defined(LINUX)
 
119
        #if defined(_WINDOWS)
120
120
                pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
121
121
                langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
 
122
        #elif defined(LINUX)
 
123
                #if defined(CUSTOM_BUILD)
 
124
                        pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
 
125
                        langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
 
126
                #else
 
127
                        pluginsDir = wxStandardPaths::Get().GetPluginsDir() + wxFileName::GetPathSeparator() + wxT("Plugins");
 
128
                        langDir = wxStandardPaths::Get().GetResourcesDir()  + wxFileName::GetPathSeparator() + wxT("lang");
 
129
                #endif
122
130
                
123
131
        #else
124
132
                pluginsDir = wxStandardPaths::Get().GetPluginsDir();
125
133
                langDir = wxStandardPaths::Get().GetResourcesDir() + wxFileName::GetPathSeparator() + wxT("lang");
126
134
                
127
 
        #endif
128
 
        
 
135
        #endif  
129
136
        
130
137
        
131
138
        m_GinkgoPluginsDir = TOPATH(pluginsDir);