Skip to content

Commit

Permalink
Use official patched guichan 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jarod42
Jarod42 committed Nov 28, 2023
1 parent 7a9d154 commit 8c2ba13
Show file tree
Hide file tree
Showing 87 changed files with 96 additions and 17,827 deletions.
166 changes: 82 additions & 84 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ endif()

include_directories(
src/include
src/guichan/include
src/guichan/include/guichan
src/third_party/
${CMAKE_CURRENT_BINARY_DIR}
)
Expand Down Expand Up @@ -174,40 +172,39 @@ set(game_SRCS
source_group(game FILES ${game_SRCS})

set(guichan_SRCS
src/guichan/cliprectangle.cpp
src/guichan/color.cpp
src/guichan/defaultfont.cpp
src/guichan/exception.cpp
src/guichan/focushandler.cpp
src/guichan/gfont.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/guichan.cpp
src/guichan/image.cpp
src/guichan/imagefont.cpp
src/guichan/key.cpp
src/guichan/keyinput.cpp
src/guichan/mouseinput.cpp
src/guichan/rectangle.cpp
src/guichan/sdl/gsdl.cpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlinput.cpp
src/guichan/widget.cpp
src/guichan/widgets/button.cpp
src/guichan/widgets/container.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/checkbox.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/label.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/radiobutton.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/slider.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/textfield.cpp
src/guichan/widgets/window.cpp
third-party/guichan/src/cliprectangle.cpp
third-party/guichan/src/color.cpp
third-party/guichan/src/defaultfont.cpp
third-party/guichan/src/exception.cpp
third-party/guichan/src/focushandler.cpp
third-party/guichan/src/gfont.cpp
third-party/guichan/src/graphics.cpp
third-party/guichan/src/gui.cpp
third-party/guichan/src/guichan.cpp
third-party/guichan/src/image.cpp
third-party/guichan/src/imagefont.cpp
third-party/guichan/src/key.cpp
third-party/guichan/src/keyinput.cpp
third-party/guichan/src/mouseinput.cpp
third-party/guichan/src/rectangle.cpp
third-party/guichan/src/sdl/gsdl.cpp
third-party/guichan/src/sdl/sdlgraphics.cpp
third-party/guichan/src/sdl/sdlinput.cpp
third-party/guichan/src/widget.cpp
third-party/guichan/src/widgets/button.cpp
third-party/guichan/src/widgets/container.cpp
third-party/guichan/src/widgets/dropdown.cpp
third-party/guichan/src/widgets/checkbox.cpp
third-party/guichan/src/widgets/icon.cpp
third-party/guichan/src/widgets/label.cpp
third-party/guichan/src/widgets/listbox.cpp
third-party/guichan/src/widgets/radiobutton.cpp
third-party/guichan/src/widgets/scrollarea.cpp
third-party/guichan/src/widgets/slider.cpp
third-party/guichan/src/widgets/textbox.cpp
third-party/guichan/src/widgets/textfield.cpp
third-party/guichan/src/widgets/window.cpp
)
source_group(guichan FILES ${guichan_SRCS})

set(map_SRCS
src/map/fov.cpp
Expand Down Expand Up @@ -411,7 +408,6 @@ set(stratagus_SRCS
${ai_SRCS}
${editor_SRCS}
${game_SRCS}
${guichan_SRCS}
${map_SRCS}
${missile_SRCS}
${network_SRCS}
Expand All @@ -428,51 +424,51 @@ set(stratagus_SRCS
${CMAKE_CURRENT_BINARY_DIR}/tolua.cpp
)

set(stratagus_guichan_HDRS
src/guichan/include/guichan/actionlistener.h
src/guichan/include/guichan/allegro.h
src/guichan/include/guichan/basiccontainer.h
src/guichan/include/guichan/cliprectangle.h
src/guichan/include/guichan/color.h
src/guichan/include/guichan/defaultfont.h
src/guichan/include/guichan/exception.h
src/guichan/include/guichan/focushandler.h
src/guichan/include/guichan/font.h
src/guichan/include/guichan/graphics.h
src/guichan/include/guichan/gsdl.h
src/guichan/include/guichan/gui.h
src/guichan/include/guichan.h
src/guichan/include/guichan/imagefont.h
src/guichan/include/guichan/image.h
src/guichan/include/guichan/imageloader.h
src/guichan/include/guichan/input.h
src/guichan/include/guichan/key.h
src/guichan/include/guichan/keyinput.h
src/guichan/include/guichan/keylistener.h
src/guichan/include/guichan/listmodel.h
src/guichan/include/guichan/mouseinput.h
src/guichan/include/guichan/mouselistener.h
src/guichan/include/guichan/platform.h
src/guichan/include/guichan/rectangle.h
src/guichan/include/guichan/sdl/sdlgraphics.h
src/guichan/include/guichan/sdl/sdlimageloader.h
src/guichan/include/guichan/sdl/sdlinput.h
src/guichan/include/guichan/sdl/sdlpixel.h
src/guichan/include/guichan/widget.h
src/guichan/include/guichan/widgets/button.h
src/guichan/include/guichan/widgets/container.h
src/guichan/include/guichan/widgets/dropdown.h
src/guichan/include/guichan/widgets/checkbox.h
src/guichan/include/guichan/widgets/icon.h
src/guichan/include/guichan/widgets/label.h
src/guichan/include/guichan/widgets/listbox.h
src/guichan/include/guichan/widgets/radiobutton.h
src/guichan/include/guichan/widgets/scrollarea.h
src/guichan/include/guichan/widgets/slider.h
src/guichan/include/guichan/widgets/textbox.h
src/guichan/include/guichan/widgets/textfield.h
src/guichan/include/guichan/widgets/window.h
src/guichan/include/guichan/x.h
set(guichan_HDRS
third-party/guichan/include/guichan/actionlistener.hpp
third-party/guichan/include/guichan/allegro.hpp
third-party/guichan/include/guichan/basiccontainer.hpp
third-party/guichan/include/guichan/cliprectangle.hpp
third-party/guichan/include/guichan/color.hpp
third-party/guichan/include/guichan/defaultfont.hpp
third-party/guichan/include/guichan/exception.hpp
third-party/guichan/include/guichan/focushandler.hpp
third-party/guichan/include/guichan/font.hpp
third-party/guichan/include/guichan/graphics.hpp
third-party/guichan/include/guichan/gsdl.hpp
third-party/guichan/include/guichan/gui.hpp
third-party/guichan/include/guichan.hpp
third-party/guichan/include/guichan/imagefont.hpp
third-party/guichan/include/guichan/image.hpp
third-party/guichan/include/guichan/imageloader.hpp
third-party/guichan/include/guichan/input.hpp
third-party/guichan/include/guichan/key.hpp
third-party/guichan/include/guichan/keyinput.hpp
third-party/guichan/include/guichan/keylistener.hpp
third-party/guichan/include/guichan/listmodel.hpp
third-party/guichan/include/guichan/mouseinput.hpp
third-party/guichan/include/guichan/mouselistener.hpp
third-party/guichan/include/guichan/platform.hpp
third-party/guichan/include/guichan/rectangle.hpp
third-party/guichan/include/guichan/sdl/sdlgraphics.hpp
third-party/guichan/include/guichan/sdl/sdlimageloader.hpp
third-party/guichan/include/guichan/sdl/sdlinput.hpp
third-party/guichan/include/guichan/sdl/sdlpixel.hpp
third-party/guichan/include/guichan/widget.hpp
third-party/guichan/include/guichan/widgets/button.hpp
third-party/guichan/include/guichan/widgets/container.hpp
third-party/guichan/include/guichan/widgets/dropdown.hpp
third-party/guichan/include/guichan/widgets/checkbox.hpp
third-party/guichan/include/guichan/widgets/icon.hpp
third-party/guichan/include/guichan/widgets/label.hpp
third-party/guichan/include/guichan/widgets/listbox.hpp
third-party/guichan/include/guichan/widgets/radiobutton.hpp
third-party/guichan/include/guichan/widgets/scrollarea.hpp
third-party/guichan/include/guichan/widgets/slider.hpp
third-party/guichan/include/guichan/widgets/textbox.hpp
third-party/guichan/include/guichan/widgets/textfield.hpp
third-party/guichan/include/guichan/widgets/window.hpp
third-party/guichan/include/guichan/x.hpp
)

set(stratagus_action_HDRS
Expand Down Expand Up @@ -627,15 +623,13 @@ set(stratagus_tests_SRCS
source_group(include FILES ${stratagus_generic_HDRS})
source_group(include\\action FILES ${stratagus_action_HDRS})
source_group(include\\animation FILES ${stratagus_animation_HDRS})
source_group(include\\guichan FILES ${stratagus_guichan_HDRS})
source_group(include\\spell FILES ${stratagus_spell_HDRS})


set(stratagus_HDRS
${stratagus_generic_HDRS}
${stratagus_action_HDRS}
${stratagus_animation_HDRS}
${stratagus_guichan_HDRS}
${stratagus_spell_HDRS}
${CMAKE_CURRENT_BINARY_DIR}/version-generated.h
version-generated.h # This line is needed for CMake when generating Doxygen documentation
Expand Down Expand Up @@ -777,6 +771,10 @@ include(CheckTypeSize)
include(CheckFunctionExists)
include(CheckSymbolExists)

add_library(guichan_lib ${guichan_SRCS} ${guichan_HDRS})
target_include_directories(guichan_lib PUBLIC src/third-party/guichan/include)
target_link_libraries(stratagus_lib PUBLIC ${SDL2_LIBRARY})

# Windows RC compiler definitions

if(WIN32)
Expand Down Expand Up @@ -1196,7 +1194,7 @@ if (ENABLE_STDIO_REDIRECT)
else ()
add_executable(stratagus src/stratagus/main.cpp)
endif ()
target_link_libraries(stratagus_lib PUBLIC ${stratagus_LIBS} ${CMAKE_DL_LIBS})
target_link_libraries(stratagus_lib PUBLIC ${stratagus_LIBS} ${CMAKE_DL_LIBS} guichan_lib)
target_link_libraries(stratagus PUBLIC stratagus_lib)

target_include_directories(stratagus_lib PRIVATE third-party/mdns third-party/spiritless_po/include)
Expand Down
2 changes: 1 addition & 1 deletion src/editor/editloop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#include "video.h"
#include "widgets.h"

#include <guichan.h>
#include <guichan.hpp>

extern void DoScrollArea(int state, bool fast, bool isKeyboard);
extern void DrawGuichanWidgets();
Expand Down
87 changes: 0 additions & 87 deletions src/guichan/cliprectangle.cpp
View file

This file was deleted.

Loading

0 comments on commit 8c2ba13

Please sign in to comment.