Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
Miosix GUI library - mxgui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Avionics
Software Development
Third Party
Miosix GUI library - mxgui
Commits
b585519d
Commit
b585519d
authored
4 years ago
by
Federico
Browse files
Options
Downloads
Patches
Plain Diff
Fix building code generators
parent
fefd33d5
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
_tools/code_generators/CMakeLists.txt
+2
-2
2 additions, 2 deletions
_tools/code_generators/CMakeLists.txt
_tools/code_generators/resourcefs.cpp
+5
-5
5 additions, 5 deletions
_tools/code_generators/resourcefs.cpp
with
7 additions
and
7 deletions
_tools/code_generators/CMakeLists.txt
+
2
−
2
View file @
b585519d
...
@@ -40,8 +40,8 @@ target_link_libraries(resourcefs ${Boost_LIBRARIES})
...
@@ -40,8 +40,8 @@ target_link_libraries(resourcefs ${Boost_LIBRARIES})
#include_directories(${FREETYPE_INCLUDE_DIRS})
#include_directories(${FREETYPE_INCLUDE_DIRS})
#target_link_libraries(fontrendering ${FREETYPE_LIBRARIES})
#target_link_libraries(fontrendering ${FREETYPE_LIBRARIES})
## Uncomment this if you want to build and use freetype 2.4.3
## Uncomment this if you want to build and use freetype 2.4.3
include_directories
(
${
CMAKE_CURRENT_
SOURCE_DIR
}
/build
/freetype-2.4.3/include
)
include_directories
(
${
CMAKE_CURRENT_
BINARY_DIR
}
/freetype-2.4.3/include
)
find_library
(
FREETYPE NAMES freetype HINTS
${
CMAKE_CURRENT_
SOURCE_DIR
}
/build
/freetype-2.4.3/objs/.libs
)
find_library
(
FREETYPE NAMES freetype HINTS
${
CMAKE_CURRENT_
BINARY_DIR
}
/freetype-2.4.3/objs/.libs
)
target_link_libraries
(
fontrendering
${
FREETYPE
}
)
target_link_libraries
(
fontrendering
${
FREETYPE
}
)
find_package
(
ZLIB REQUIRED
)
find_package
(
ZLIB REQUIRED
)
...
...
This diff is collapsed.
Click to expand it.
_tools/code_generators/resourcefs.cpp
+
5
−
5
View file @
b585519d
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
using
namespace
std
;
using
namespace
std
;
using
namespace
boost
::
program_options
;
using
namespace
boost
::
program_options
;
using
namespace
boost
::
filesystem
;
namespace
fs
=
boost
::
filesystem
;
/**
/**
* \param an unsigned int
* \param an unsigned int
...
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
...
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
}
}
//Traverse the input directory storing path of files
//Traverse the input directory storing path of files
path
inDir
(
vm
[
"in"
].
as
<
string
>
());
fs
::
path
inDir
(
vm
[
"in"
].
as
<
string
>
());
directory_iterator
end
;
fs
::
directory_iterator
end
;
vector
<
path
>
files
;
vector
<
fs
::
path
>
files
;
for
(
directory_iterator
it
(
inDir
);
it
!=
end
;
++
it
)
for
(
fs
::
directory_iterator
it
(
inDir
);
it
!=
end
;
++
it
)
{
{
if
(
is_directory
(
it
->
status
()))
if
(
is_directory
(
it
->
status
()))
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment