From 48ad79a03c12b923dfdb3795a2138445859cf779 Mon Sep 17 00:00:00 2001 From: erihel Date: Sat, 18 Aug 2012 11:30:29 +0200 Subject: * minor changes to control.cpp to compile it without errors --- src/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b998d19..8870f21 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # CBot shared library is built separately -add_subdirectory(CBot) +add_subdirectory(CBot) # Configure options @@ -61,9 +61,9 @@ common/image.cpp common/logger.cpp common/iman.cpp # common/metafile.cpp -# common/misc.cpp +common/misc.cpp # common/modfile.cpp -# common/profile.cpp +common/profile.cpp # common/restext.cpp common/stringutils.cpp graphics/core/color.cpp @@ -149,7 +149,7 @@ graphics/opengl/gldevice.cpp # ui/check.cpp # ui/color.cpp # ui/compass.cpp -# ui/control.cpp +ui/control.cpp # ui/displayinfo.cpp # ui/displaytext.cpp # ui/edit.cpp @@ -159,7 +159,7 @@ graphics/opengl/gldevice.cpp # ui/image.cpp # ui/interface.cpp # ui/key.cpp -# ui/label.cpp +ui/label.cpp # ui/list.cpp # ui/maindialog.cpp # ui/mainmap.cpp @@ -190,6 +190,7 @@ ${SDL_IMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS} +.. ) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot) -- cgit v1.2.3-1-g7c22 From 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 Mon Sep 17 00:00:00 2001 From: erihel Date: Sat, 18 Aug 2012 21:04:51 +0200 Subject: * wrong enum used for text alignment * wrong event function used --- src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8870f21..a49d371 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,9 +61,9 @@ common/image.cpp common/logger.cpp common/iman.cpp # common/metafile.cpp -common/misc.cpp +# common/misc.cpp # common/modfile.cpp -common/profile.cpp +# common/profile.cpp # common/restext.cpp common/stringutils.cpp graphics/core/color.cpp @@ -149,7 +149,7 @@ graphics/opengl/gldevice.cpp # ui/check.cpp # ui/color.cpp # ui/compass.cpp -ui/control.cpp +# ui/control.cpp # ui/displayinfo.cpp # ui/displaytext.cpp # ui/edit.cpp @@ -159,7 +159,7 @@ ui/control.cpp # ui/image.cpp # ui/interface.cpp # ui/key.cpp -ui/label.cpp +# ui/label.cpp # ui/list.cpp # ui/maindialog.cpp # ui/mainmap.cpp -- cgit v1.2.3-1-g7c22 From 9b4628fd028b5d7e5ab0ff5dba77d826221f9eca Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Sat, 25 Aug 2012 14:02:10 +0400 Subject: Move strings out of restext. Add i18n via gettext --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b998d19..11c62f7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,8 @@ common/iman.cpp # common/misc.cpp # common/modfile.cpp # common/profile.cpp -# common/restext.cpp +common/restext.cpp +common/restext_strings.c common/stringutils.cpp graphics/core/color.cpp graphics/engine/camera.cpp -- cgit v1.2.3-1-g7c22 From 6ba0f42f22a170625f15879e01b4653a4ac153a1 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 31 Aug 2012 22:28:07 +0200 Subject: latest changes; few more classes should compile now --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a49d371..c3b460c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -149,10 +149,10 @@ graphics/opengl/gldevice.cpp # ui/check.cpp # ui/color.cpp # ui/compass.cpp -# ui/control.cpp +ui/control.cpp # ui/displayinfo.cpp # ui/displaytext.cpp -# ui/edit.cpp +ui/edit.cpp # ui/editvalue.cpp # ui/gauge.cpp # ui/group.cpp -- cgit v1.2.3-1-g7c22