Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
cfa3c3f7
Commit
cfa3c3f7
authored
Feb 04, 2011
by
Sebastian Eichelbaum
Browse files
[MERGE]
parents
e9f54b3f
0b3a1448
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
src/graphicsEngine/WGETextureUtils.cpp
src/graphicsEngine/WGETextureUtils.cpp
+0
-2
src/kernel/WModuleLoader.cpp
src/kernel/WModuleLoader.cpp
+8
-3
No files found.
src/graphicsEngine/WGETextureUtils.cpp
View file @
cfa3c3f7
...
...
@@ -22,8 +22,6 @@
//
//---------------------------------------------------------------------------
#include <GL/gl.h>
#include "../common/exceptions/WPreconditionNotMet.h"
#include "WGETexture.h"
...
...
src/kernel/WModuleLoader.cpp
View file @
cfa3c3f7
...
...
@@ -65,6 +65,11 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
std
::
string
isFileName
=
i
->
path
().
filename
();
#endif // _MSC_VER
// we want to strip the search directory from the path
std
::
string
relPath
=
i
->
path
().
file_string
();
relPath
.
erase
(
0
,
dir
.
file_string
().
length
()
+
1
);
// NOTE: +1 because we want to remove the "/" too
// is it a lib?
if
(
!
boost
::
filesystem
::
is_directory
(
*
i
)
&&
(
suffix
==
WSharedLib
::
getSystemSuffix
()
)
&&
(
stem
.
compare
(
0
,
getModulePrefix
().
length
(),
getModulePrefix
()
)
==
0
)
#ifdef _MSC_VER
...
...
@@ -88,7 +93,7 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
// could the prototype be created?
if
(
m
.
empty
()
)
{
WLogger
::
getLogger
()
->
addLogMessage
(
"Load failed for module
\"
"
+
i
->
path
().
file_string
()
+
"
\"
. Could not create any "
+
WLogger
::
getLogger
()
->
addLogMessage
(
"Load failed for module
\"
"
+
relPath
+
"
\"
. Could not create any "
+
"prototype instance."
,
"Module Loader"
,
LL_ERROR
);
continue
;
}
...
...
@@ -102,14 +107,14 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
m_libs
.
push_back
(
l
);
}
wlog
::
info
(
"Module Loader"
)
<<
"Loaded "
<<
m
.
size
()
<<
" modules from "
<<
i
->
path
().
file_string
()
;
wlog
::
info
(
"Module Loader"
)
<<
"Loaded "
<<
m
.
size
()
<<
" modules from "
<<
relPath
;
}
// lib gets closed if l looses focus
}
catch
(
const
WException
&
e
)
{
WLogger
::
getLogger
()
->
addLogMessage
(
"Load failed for module
\"
"
+
i
->
path
().
file_string
()
+
"
\"
. "
+
e
.
what
()
+
". Ignoring."
,
WLogger
::
getLogger
()
->
addLogMessage
(
"Load failed for module
\"
"
+
relPath
+
"
\"
. "
+
e
.
what
()
+
". Ignoring."
,
"Module Loader"
,
LL_ERROR
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment