Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 89533 | Differences between
and this patch

Collapse All | Expand All

(-)src.original/Makefile.unix (-28 / +28 lines)
Lines 76-83 Link Here
76
console_runner_RESCOMP=
76
console_runner_RESCOMP=
77
77
78
### Compiler/linker options
78
### Compiler/linker options
79
tinyXML_GLOBAL_CFLAGS=
79
tinyXML_GLOBAL_CFLAGS= ${CXXFLAGS} -fPIC
80
tinyXML_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
80
tinyXML_PROJECT_CFLAGS= -Wall `wx-config --cflags`
81
tinyXML_GLOBAL_LDFLAGS=
81
tinyXML_GLOBAL_LDFLAGS=
82
tinyXML_PROJECT_LDFLAGS= `wx-config --libs`
82
tinyXML_PROJECT_LDFLAGS= `wx-config --libs`
83
tinyXML_GLOBAL_INCS= -I/usr/include
83
tinyXML_GLOBAL_INCS= -I/usr/include
Lines 86-93 Link Here
86
tinyXML_PROJECT_LIBDIRS= -Lsdk/tinyxml
86
tinyXML_PROJECT_LIBDIRS= -Lsdk/tinyxml
87
tinyXML_GLOBAL_LIBS=
87
tinyXML_GLOBAL_LIBS=
88
tinyXML_PROJECT_LIBS=
88
tinyXML_PROJECT_LIBS=
89
sdk_GLOBAL_CFLAGS=
89
sdk_GLOBAL_CFLAGS= ${CXXFLAGS}
90
sdk_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
90
sdk_PROJECT_CFLAGS= -Wall `wx-config --cflags`
91
sdk_GLOBAL_LDFLAGS=
91
sdk_GLOBAL_LDFLAGS=
92
sdk_PROJECT_LDFLAGS= `wx-config --libs`
92
sdk_PROJECT_LDFLAGS= `wx-config --libs`
93
sdk_GLOBAL_INCS= -I/usr/include
93
sdk_GLOBAL_INCS= -I/usr/include
Lines 96-103 Link Here
96
sdk_PROJECT_LIBDIRS= -Lsdk/tinyxml
96
sdk_PROJECT_LIBDIRS= -Lsdk/tinyxml
97
sdk_GLOBAL_LIBS=
97
sdk_GLOBAL_LIBS=
98
sdk_PROJECT_LIBS=
98
sdk_PROJECT_LIBS=
99
src_GLOBAL_CFLAGS=
99
src_GLOBAL_CFLAGS= ${CXXFLAGS}
100
src_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
100
src_PROJECT_CFLAGS= -Wall `wx-config --cflags`
101
src_GLOBAL_LDFLAGS=
101
src_GLOBAL_LDFLAGS=
102
src_PROJECT_LDFLAGS= `wx-config --libs`
102
src_PROJECT_LDFLAGS= `wx-config --libs`
103
src_GLOBAL_INCS= -I/usr/include
103
src_GLOBAL_INCS= -I/usr/include
Lines 106-113 Link Here
106
src_PROJECT_LIBDIRS= -Lsdk/tinyxml
106
src_PROJECT_LIBDIRS= -Lsdk/tinyxml
107
src_GLOBAL_LIBS=
107
src_GLOBAL_LIBS=
108
src_PROJECT_LIBS=
108
src_PROJECT_LIBS=
109
plugin_Astyle_GLOBAL_CFLAGS=
109
plugin_Astyle_GLOBAL_CFLAGS= ${CXXFLAGS}
110
plugin_Astyle_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
110
plugin_Astyle_PROJECT_CFLAGS= -Wall `wx-config --cflags`
111
plugin_Astyle_GLOBAL_LDFLAGS=
111
plugin_Astyle_GLOBAL_LDFLAGS=
112
plugin_Astyle_PROJECT_LDFLAGS= `wx-config --libs`
112
plugin_Astyle_PROJECT_LDFLAGS= `wx-config --libs`
113
plugin_Astyle_GLOBAL_INCS= -I/usr/include
113
plugin_Astyle_GLOBAL_INCS= -I/usr/include
Lines 116-123 Link Here
116
plugin_Astyle_PROJECT_LIBDIRS= -Lsdk/tinyxml
116
plugin_Astyle_PROJECT_LIBDIRS= -Lsdk/tinyxml
117
plugin_Astyle_GLOBAL_LIBS=
117
plugin_Astyle_GLOBAL_LIBS=
118
plugin_Astyle_PROJECT_LIBS=
118
plugin_Astyle_PROJECT_LIBS=
119
plugin_CompilerGCC_GLOBAL_CFLAGS=
119
plugin_CompilerGCC_GLOBAL_CFLAGS= ${CXXFLAGS}
120
plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
120
plugin_CompilerGCC_PROJECT_CFLAGS= -Wall `wx-config --cflags`
121
plugin_CompilerGCC_GLOBAL_LDFLAGS=
121
plugin_CompilerGCC_GLOBAL_LDFLAGS=
122
plugin_CompilerGCC_PROJECT_LDFLAGS= `wx-config --libs`
122
plugin_CompilerGCC_PROJECT_LDFLAGS= `wx-config --libs`
123
plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include
123
plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include
Lines 126-133 Link Here
126
plugin_CompilerGCC_PROJECT_LIBDIRS= -Lsdk/tinyxml
126
plugin_CompilerGCC_PROJECT_LIBDIRS= -Lsdk/tinyxml
127
plugin_CompilerGCC_GLOBAL_LIBS=
127
plugin_CompilerGCC_GLOBAL_LIBS=
128
plugin_CompilerGCC_PROJECT_LIBS=
128
plugin_CompilerGCC_PROJECT_LIBS=
129
plugin_DebuggerGDB_GLOBAL_CFLAGS=
129
plugin_DebuggerGDB_GLOBAL_CFLAGS= ${CXXFLAGS}
130
plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
130
plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall `wx-config --cflags`
131
plugin_DebuggerGDB_GLOBAL_LDFLAGS=
131
plugin_DebuggerGDB_GLOBAL_LDFLAGS=
132
plugin_DebuggerGDB_PROJECT_LDFLAGS= `wx-config --libs`
132
plugin_DebuggerGDB_PROJECT_LDFLAGS= `wx-config --libs`
133
plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include
133
plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include
Lines 136-143 Link Here
136
plugin_DebuggerGDB_PROJECT_LIBDIRS= -Lsdk/tinyxml
136
plugin_DebuggerGDB_PROJECT_LIBDIRS= -Lsdk/tinyxml
137
plugin_DebuggerGDB_GLOBAL_LIBS=
137
plugin_DebuggerGDB_GLOBAL_LIBS=
138
plugin_DebuggerGDB_PROJECT_LIBS=
138
plugin_DebuggerGDB_PROJECT_LIBS=
139
plugin_CodeCompletion_GLOBAL_CFLAGS=
139
plugin_CodeCompletion_GLOBAL_CFLAGS= ${CXXFLAGS}
140
plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
140
plugin_CodeCompletion_PROJECT_CFLAGS= -Wall `wx-config --cflags`
141
plugin_CodeCompletion_GLOBAL_LDFLAGS=
141
plugin_CodeCompletion_GLOBAL_LDFLAGS=
142
plugin_CodeCompletion_PROJECT_LDFLAGS= `wx-config --libs`
142
plugin_CodeCompletion_PROJECT_LDFLAGS= `wx-config --libs`
143
plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include
143
plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include
Lines 146-153 Link Here
146
plugin_CodeCompletion_PROJECT_LIBDIRS= -Lsdk/tinyxml
146
plugin_CodeCompletion_PROJECT_LIBDIRS= -Lsdk/tinyxml
147
plugin_CodeCompletion_GLOBAL_LIBS=
147
plugin_CodeCompletion_GLOBAL_LIBS=
148
plugin_CodeCompletion_PROJECT_LIBS=
148
plugin_CodeCompletion_PROJECT_LIBS=
149
plugin_ClassWizard_GLOBAL_CFLAGS=
149
plugin_ClassWizard_GLOBAL_CFLAGS= ${CXXFLAGS}
150
plugin_ClassWizard_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
150
plugin_ClassWizard_PROJECT_CFLAGS= -Wall `wx-config --cflags`
151
plugin_ClassWizard_GLOBAL_LDFLAGS=
151
plugin_ClassWizard_GLOBAL_LDFLAGS=
152
plugin_ClassWizard_PROJECT_LDFLAGS= `wx-config --libs`
152
plugin_ClassWizard_PROJECT_LDFLAGS= `wx-config --libs`
153
plugin_ClassWizard_GLOBAL_INCS= -I/usr/include
153
plugin_ClassWizard_GLOBAL_INCS= -I/usr/include
Lines 156-163 Link Here
156
plugin_ClassWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml
156
plugin_ClassWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml
157
plugin_ClassWizard_GLOBAL_LIBS=
157
plugin_ClassWizard_GLOBAL_LIBS=
158
plugin_ClassWizard_PROJECT_LIBS=
158
plugin_ClassWizard_PROJECT_LIBS=
159
plugin_DefMimeHandler_GLOBAL_CFLAGS=
159
plugin_DefMimeHandler_GLOBAL_CFLAGS= ${CXXFLAGS}
160
plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
160
plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall `wx-config --cflags`
161
plugin_DefMimeHandler_GLOBAL_LDFLAGS=
161
plugin_DefMimeHandler_GLOBAL_LDFLAGS=
162
plugin_DefMimeHandler_PROJECT_LDFLAGS= `wx-config --libs`
162
plugin_DefMimeHandler_PROJECT_LDFLAGS= `wx-config --libs`
163
plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include
163
plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include
Lines 166-173 Link Here
166
plugin_DefMimeHandler_PROJECT_LIBDIRS= -Lsdk/tinyxml
166
plugin_DefMimeHandler_PROJECT_LIBDIRS= -Lsdk/tinyxml
167
plugin_DefMimeHandler_GLOBAL_LIBS=
167
plugin_DefMimeHandler_GLOBAL_LIBS=
168
plugin_DefMimeHandler_PROJECT_LIBS=
168
plugin_DefMimeHandler_PROJECT_LIBS=
169
plugin_PluginsWizard_GLOBAL_CFLAGS=
169
plugin_PluginsWizard_GLOBAL_CFLAGS= ${CXXFLAGS}
170
plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
170
plugin_PluginsWizard_PROJECT_CFLAGS= -Wall `wx-config --cflags`
171
plugin_PluginsWizard_GLOBAL_LDFLAGS=
171
plugin_PluginsWizard_GLOBAL_LDFLAGS=
172
plugin_PluginsWizard_PROJECT_LDFLAGS= `wx-config --libs`
172
plugin_PluginsWizard_PROJECT_LDFLAGS= `wx-config --libs`
173
plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include
173
plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include
Lines 176-183 Link Here
176
plugin_PluginsWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml
176
plugin_PluginsWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml
177
plugin_PluginsWizard_GLOBAL_LIBS=
177
plugin_PluginsWizard_GLOBAL_LIBS=
178
plugin_PluginsWizard_PROJECT_LIBS=
178
plugin_PluginsWizard_PROJECT_LIBS=
179
plugin_ToDo_GLOBAL_CFLAGS=
179
plugin_ToDo_GLOBAL_CFLAGS= ${CXXFLAGS}
180
plugin_ToDo_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
180
plugin_ToDo_PROJECT_CFLAGS= -Wall `wx-config --cflags`
181
plugin_ToDo_GLOBAL_LDFLAGS=
181
plugin_ToDo_GLOBAL_LDFLAGS=
182
plugin_ToDo_PROJECT_LDFLAGS= `wx-config --libs`
182
plugin_ToDo_PROJECT_LDFLAGS= `wx-config --libs`
183
plugin_ToDo_GLOBAL_INCS= -I/usr/include
183
plugin_ToDo_GLOBAL_INCS= -I/usr/include
Lines 186-193 Link Here
186
plugin_ToDo_PROJECT_LIBDIRS= -Lsdk/tinyxml
186
plugin_ToDo_PROJECT_LIBDIRS= -Lsdk/tinyxml
187
plugin_ToDo_GLOBAL_LIBS=
187
plugin_ToDo_GLOBAL_LIBS=
188
plugin_ToDo_PROJECT_LIBS=
188
plugin_ToDo_PROJECT_LIBS=
189
plugin_XPManifest_GLOBAL_CFLAGS=
189
plugin_XPManifest_GLOBAL_CFLAGS= ${CXXFLAGS}
190
plugin_XPManifest_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
190
plugin_XPManifest_PROJECT_CFLAGS= -Wall `wx-config --cflags`
191
plugin_XPManifest_GLOBAL_LDFLAGS=
191
plugin_XPManifest_GLOBAL_LDFLAGS=
192
plugin_XPManifest_PROJECT_LDFLAGS= `wx-config --libs`
192
plugin_XPManifest_PROJECT_LDFLAGS= `wx-config --libs`
193
plugin_XPManifest_GLOBAL_INCS= -I/usr/include
193
plugin_XPManifest_GLOBAL_INCS= -I/usr/include
Lines 196-203 Link Here
196
plugin_XPManifest_PROJECT_LIBDIRS= -Lsdk/tinyxml
196
plugin_XPManifest_PROJECT_LIBDIRS= -Lsdk/tinyxml
197
plugin_XPManifest_GLOBAL_LIBS=
197
plugin_XPManifest_GLOBAL_LIBS=
198
plugin_XPManifest_PROJECT_LIBS=
198
plugin_XPManifest_PROJECT_LIBS=
199
update_GLOBAL_CFLAGS=
199
update_GLOBAL_CFLAGS= ${CXXFLAGS}
200
update_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
200
update_PROJECT_CFLAGS= -Wall `wx-config --cflags`
201
update_GLOBAL_LDFLAGS=
201
update_GLOBAL_LDFLAGS=
202
update_PROJECT_LDFLAGS= `wx-config --libs`
202
update_PROJECT_LDFLAGS= `wx-config --libs`
203
update_GLOBAL_INCS= -I/usr/include
203
update_GLOBAL_INCS= -I/usr/include
Lines 206-213 Link Here
206
update_PROJECT_LIBDIRS= -Lsdk/tinyxml
206
update_PROJECT_LIBDIRS= -Lsdk/tinyxml
207
update_GLOBAL_LIBS=
207
update_GLOBAL_LIBS=
208
update_PROJECT_LIBS=
208
update_PROJECT_LIBS=
209
console_runner_GLOBAL_CFLAGS=
209
console_runner_GLOBAL_CFLAGS= ${CXXFLAGS}
210
console_runner_PROJECT_CFLAGS= -Wall -g `wx-config --cflags`
210
console_runner_PROJECT_CFLAGS= -Wall `wx-config --cflags`
211
console_runner_GLOBAL_LDFLAGS=
211
console_runner_GLOBAL_LDFLAGS=
212
console_runner_PROJECT_LDFLAGS= `wx-config --libs`
212
console_runner_PROJECT_LDFLAGS= `wx-config --libs`
213
console_runner_GLOBAL_INCS= -I/usr/include
213
console_runner_GLOBAL_INCS= -I/usr/include
(-)src.original/src/app.cpp (-1 / +2 lines)
Lines 88-94 Link Here
88
    SetAppName(APP_NAME" v"APP_VERSION);
88
    SetAppName(APP_NAME" v"APP_VERSION);
89
    ConfigManager::Init(wxConfigBase::Get());
89
    ConfigManager::Init(wxConfigBase::Get());
90
    ConfigManager::Get()->Write("app_path", GetAppPath());
90
    ConfigManager::Get()->Write("app_path", GetAppPath());
91
    ConfigManager::Get()->Write("data_path", GetAppPath() + "/share/CodeBlocks");
91
    ConfigManager::Get()->Write("data_path", "/usr/share/codeblocks");
92
    ConfigManager::Get()->Write("plugin_path", "/usr/lib/codeblocks");
92
    m_HasDebugLog = ConfigManager::Get()->Read("/message_manager/has_debug_log", (long int)0) || m_HasDebugLog;
93
    m_HasDebugLog = ConfigManager::Get()->Read("/message_manager/has_debug_log", (long int)0) || m_HasDebugLog;
93
    ConfigManager::Get()->Write("/message_manager/has_debug_log", m_HasDebugLog);
94
    ConfigManager::Get()->Write("/message_manager/has_debug_log", m_HasDebugLog);
94
    if (ParseCmdLine(0L) != 0)
95
    if (ParseCmdLine(0L) != 0)
(-)src.original/src/main.cpp (-2 / +2 lines)
Lines 412-418 Link Here
412
    if (forceShow || showAtStartup)
412
    if (forceShow || showAtStartup)
413
    {
413
    {
414
        wxLogNull null; // disable error message if tips file does not exist
414
        wxLogNull null; // disable error message if tips file does not exist
415
        wxString tipsFile = ConfigManager::Get()->Read("/app_path") + "/tips.txt";
415
        wxString tipsFile = ConfigManager::Get()->Read("/data_path") + "/tips.txt";
416
        long tipsIndex = ConfigManager::Get()->Read("/next_tip", (long)0);
416
        long tipsIndex = ConfigManager::Get()->Read("/next_tip", (long)0);
417
        wxTipProvider* tipProvider = wxCreateFileTipProvider(tipsFile, tipsIndex);
417
        wxTipProvider* tipProvider = wxCreateFileTipProvider(tipsFile, tipsIndex);
418
        showAtStartup = wxShowTip(this, tipProvider, showAtStartup);
418
        showAtStartup = wxShowTip(this, tipProvider, showAtStartup);
Lines 620-626 Link Here
620
    
620
    
621
    PluginManager* m_PluginManager = Manager::Get()->GetPluginManager();
621
    PluginManager* m_PluginManager = Manager::Get()->GetPluginManager();
622
622
623
    wxString path = ConfigManager::Get()->Read("data_path") + "/plugins";
623
    wxString path = ConfigManager::Get()->Read("plugin_path") + "/plugins";
624
    m_pMsgMan->Log(_("Scanning for plugins in %s..."), path.c_str());
624
    m_pMsgMan->Log(_("Scanning for plugins in %s..."), path.c_str());
625
    int count = m_PluginManager->ScanForPlugins(path);
625
    int count = m_PluginManager->ScanForPlugins(path);
626
    m_pMsgMan->AppendLog(_("Found %d plugins: "), count);
626
    m_pMsgMan->AppendLog(_("Found %d plugins: "), count);

Return to bug 89533