Reorganized externa library dependencies

- Added external directory
- Moved capsimg submodule into external, updated references
- Moved guisan into external, updated references
- Added libxml2 into external, updated Android.mk references
- Added libmpeg2 into external (not used yet)
This commit is contained in:
Dimitris Panokostas 2019-10-22 21:10:18 +02:00
parent 2ac947bc27
commit e12f430bd0
136 changed files with 277 additions and 265 deletions

10
.gitmodules vendored
View file

@ -1,3 +1,9 @@
[submodule "capsimg"]
path = capsimg
[submodule "external/libxml2"]
path = external/libxml2
url = https://android.googlesource.com/platform/external/libxml2
[submodule "external/libmpeg2"]
path = external/libmpeg2
url = https://android.googlesource.com/platform/external/libmpeg2
[submodule "external/capsimg"]
path = external/capsimg
url = https://github.com/FrodeSolheim/capsimg

View file

@ -2,26 +2,29 @@ AMIBERRY_LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
include $(LOCAL_PATH)/guisan-dev/Android.mk
include $(LOCAL_PATH)/external/libguisan/Android.mk
LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/external/libxml2/Android.mk
LOCAL_PATH := $(AMIBERRY_LOCAL_PATH)
include $(CLEAR_VARS)
LOCAL_MODULE := amiberry
SDL_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL
SDL_PATH := D:/Github/amiberry-android/app/jni/SDL
#LIBMPEG2_PATH := ../mpeg2
LIBPNG_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
LIBXML_PATH := /home/midwan/projects/amiberry-android/app/jni/xml2
LIBPNG_PATH := D:/Github/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/src/osdep \
$(LOCAL_PATH)/src/threaddep \
$(LOCAL_PATH)/src/include \
$(LOCAL_PATH)/src/archivers \
$(LOCAL_PATH)/guisan-dev/include \
$(LOCAL_PATH)/external/libguisan/include \
$(LOCAL_PATH)/external/libxml2/include \
$(SDL_PATH)/include \
$(LIBPNG_PATH) \
$(LIBXML_PATH)/include
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_NEON := true
@ -208,7 +211,8 @@ LOCAL_SRC_FILES += src/newcpu.cpp \
src/jit/compemu_fpp.cpp \
src/jit/compemu_support.cpp
LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer xml2 mpg123 guisan
LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer mpg123 guisan
LOCAL_STATIC_LIBRARIES := xml2
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -lz

View file

@ -174,8 +174,8 @@ all: guisan $(PROG)
export SDL_CFLAGS := $(shell sdl2-config --cflags)
export SDL_LDFLAGS := $(shell sdl2-config --libs)
CPPFLAGS += $(SDL_CFLAGS) -Iguisan-dev/include
LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lguisan-dev/lib
CPPFLAGS += $(SDL_CFLAGS) -Iexterna/libguisan/include
LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib
#
# Common options
@ -437,6 +437,6 @@ bootrom:
touch src/filesys.cpp
guisan:
$(MAKE) -C guisan-dev
$(MAKE) -C external/libguisan
-include $(DEPS)

View file

@ -60,14 +60,14 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
</ClCompile>
<Link>
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript />
</Link>
@ -75,14 +75,14 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
</ClCompile>
<Link>
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;vchiq_arm;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript>
</LinkerScript>
@ -91,14 +91,14 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
</ClCompile>
<Link>
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript />
<CustomPostLinkTool>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-strip</CustomPostLinkTool>
@ -108,14 +108,14 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/usr/local/include/SDL2;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../external/libguisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/usr/local/include/SDL2;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
</ClCompile>
<Link>
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<LibrarySearchDirectories>=/usr/local/lib;../../external/libguisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;vchiq_arm;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript>
</LinkerScript>

View file

@ -30,20 +30,20 @@
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<GNUTargetType>StaticLibrary</GNUTargetType>
<OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
<OutDir>$(SolutionDir)..\..\external\libguisan\lib\</OutDir>
<TargetName>lib$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<GNUTargetType>StaticLibrary</GNUTargetType>
<OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
<OutDir>$(SolutionDir)..\..\external\libguisan\lib\</OutDir>
<TargetName>lib$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../external/libguisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -57,7 +57,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/SDL2;../../external/libguisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -69,57 +69,57 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\guisan-dev\src\actionevent.cpp" />
<ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp" />
<ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp" />
<ClCompile Include="..\..\guisan-dev\src\color.cpp" />
<ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp" />
<ClCompile Include="..\..\guisan-dev\src\event.cpp" />
<ClCompile Include="..\..\guisan-dev\src\exception.cpp" />
<ClCompile Include="..\..\guisan-dev\src\focushandler.cpp" />
<ClCompile Include="..\..\guisan-dev\src\font.cpp" />
<ClCompile Include="..\..\guisan-dev\src\genericinput.cpp" />
<ClCompile Include="..\..\guisan-dev\src\graphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\gui.cpp" />
<ClCompile Include="..\..\guisan-dev\src\guisan.cpp" />
<ClCompile Include="..\..\guisan-dev\src\image.cpp" />
<ClCompile Include="..\..\guisan-dev\src\imagefont.cpp" />
<ClCompile Include="..\..\guisan-dev\src\inputevent.cpp" />
<ClCompile Include="..\..\guisan-dev\src\key.cpp" />
<ClCompile Include="..\..\guisan-dev\src\keyevent.cpp" />
<ClCompile Include="..\..\guisan-dev\src\keyinput.cpp" />
<ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp" />
<ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp" />
<ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp" />
<ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp" />
<ClCompile Include="..\..\guisan-dev\src\rectangle.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp" />
<ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widget.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp" />
<ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp" />
<ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
<ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
<ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
<ClCompile Include="..\..\external\libguisan\src\color.cpp" />
<ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
<ClCompile Include="..\..\external\libguisan\src\event.cpp" />
<ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
<ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
<ClCompile Include="..\..\external\libguisan\src\font.cpp" />
<ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
<ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
<ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
<ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
<ClCompile Include="..\..\external\libguisan\src\image.cpp" />
<ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
<ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
<ClCompile Include="..\..\external\libguisan\src\key.cpp" />
<ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
<ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
<ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
<ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
<ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
<ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
<ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
<ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
<ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
<ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
<ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@ -129,74 +129,74 @@
<None Include="guisan-Release.vgdbsettings" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\guisan-dev\include\guisan.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
<ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
</ItemGroup>
</Project>

View file

@ -46,366 +46,366 @@
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\guisan-dev\src\actionevent.cpp">
<ClCompile Include="..\..\external\libguisan\src\actionevent.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp">
<ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp">
<ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\color.cpp">
<ClCompile Include="..\..\external\libguisan\src\color.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp">
<ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\event.cpp">
<ClCompile Include="..\..\external\libguisan\src\event.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\exception.cpp">
<ClCompile Include="..\..\external\libguisan\src\exception.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\focushandler.cpp">
<ClCompile Include="..\..\external\libguisan\src\focushandler.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\font.cpp">
<ClCompile Include="..\..\external\libguisan\src\font.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\genericinput.cpp">
<ClCompile Include="..\..\external\libguisan\src\genericinput.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\graphics.cpp">
<ClCompile Include="..\..\external\libguisan\src\graphics.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\gui.cpp">
<ClCompile Include="..\..\external\libguisan\src\gui.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
<ClCompile Include="..\..\external\libguisan\src\guisan.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\image.cpp">
<ClCompile Include="..\..\external\libguisan\src\image.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\imagefont.cpp">
<ClCompile Include="..\..\external\libguisan\src\imagefont.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\inputevent.cpp">
<ClCompile Include="..\..\external\libguisan\src\inputevent.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\key.cpp">
<ClCompile Include="..\..\external\libguisan\src\key.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\keyevent.cpp">
<ClCompile Include="..\..\external\libguisan\src\keyevent.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\keyinput.cpp">
<ClCompile Include="..\..\external\libguisan\src\keyinput.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp">
<ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp">
<ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\rectangle.cpp">
<ClCompile Include="..\..\external\libguisan\src\rectangle.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp">
<ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widget.cpp">
<ClCompile Include="..\..\external\libguisan\src\widget.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp">
<ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp">
<Filter>Source files\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp">
<ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp">
<Filter>Source files\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp">
<ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp">
<Filter>Source files\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
<ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp">
<ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan.hpp">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp">
<Filter>Header files\guisan</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp">
<Filter>Header files\guisan\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp">
<Filter>Header files\guisan\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp">
<Filter>Header files\guisan\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp">
<ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
</ItemGroup>

@ -1 +0,0 @@
Subproject commit 067db4cc6bfdcd1ab684b812da6fedbb8f96e04a

1
external/capsimg vendored Submodule

@ -0,0 +1 @@
Subproject commit 1713452be0c5adf94fcb22bcb083adc5dac45876

Some files were not shown because too many files have changed in this diff Show more