diff --git a/Makefile b/Makefile index 5179774a..1349ba8e 100644 --- a/Makefile +++ b/Makefile @@ -159,8 +159,8 @@ ifdef USE_SDL2 all: guisan $(PROG) SDL_CFLAGS = `sdl2-config --cflags --libs` -CPPFLAGS += -Isrc/guisan/include -LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -Lsrc/guisan/lib +CPPFLAGS += -Iguisan/include +LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -Lguisan/lib endif # @@ -459,7 +459,7 @@ genasm: $(ASMS) clean: $(RM) $(PROG) $(PROG)-debug $(OBJS) $(ASMS) $(OBJS:%.o=%.d) - $(MAKE) -C src/guisan clean + $(MAKE) -C guisan clean cleanprofile: $(RM) $(OBJS:%.o=%.gcda) @@ -472,4 +472,4 @@ bootrom: touch src/filesys.cpp guisan: - $(MAKE) -C src/guisan + $(MAKE) -C guisan diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj index aca3c695..60ee2cce 100644 --- a/VSLinux/Amiberry.vcxproj +++ b/VSLinux/Amiberry.vcxproj @@ -54,14 +54,14 @@ cd ~/projects/Amiberry-sdl2; make -j2 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean; make -j2 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean - C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\src\guisan\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath) + C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath) DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName)-sdl2 - C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\src\guisan\include;$(NMakeIncludeSearchPath) + C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan\include;$(NMakeIncludeSearchPath) cd ~/projects/Amiberry-sdl2; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj index 836d2e48..c9d74d28 100644 --- a/VSLinux/guisan/guisan.vcxproj +++ b/VSLinux/guisan/guisan.vcxproj @@ -69,140 +69,140 @@ - cd ~/projects/Amiberry-sdl2/src/guisan/; make all - cd ~/projects/Amiberry-sdl2/src/guisan/; make clean - cd ~/projects/Amiberry-sdl2/src/guisan/; make clean; make all + cd ~/projects/Amiberry-sdl2/guisan/; make all + cd ~/projects/Amiberry-sdl2/guisan/; make clean + cd ~/projects/Amiberry-sdl2/guisan/; make clean; make all C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) - cd ~/projects/Amiberry-sdl2/src/guisan/; make all - cd ~/projects/Amiberry-sdl2/src/guisan/; make clean; make all - cd ~/projects/Amiberry-sdl2/src/guisan/; make clean + cd ~/projects/Amiberry-sdl2/guisan/; make all + cd ~/projects/Amiberry-sdl2/guisan/; make clean; make all + cd ~/projects/Amiberry-sdl2/guisan/; make clean - + true - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VSLinux/guisan/guisan.vcxproj.filters b/VSLinux/guisan/guisan.vcxproj.filters index 6628079a..fd282368 100644 --- a/VSLinux/guisan/guisan.vcxproj.filters +++ b/VSLinux/guisan/guisan.vcxproj.filters @@ -33,357 +33,357 @@ - + lib - + - + include - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan - + include\guisan\opengl - + include\guisan\opengl - + include\guisan\opengl - + include\guisan\sdl - + include\guisan\sdl - + include\guisan\sdl - + include\guisan\sdl - + include\guisan\sdl - + include\guisan\sdl - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + include\guisan\widgets - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src\opengl - + src\opengl - + src\opengl - + src\sdl - + src\sdl - + src\sdl - + src\sdl - + src\sdl - + src\sdl - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets - + src\widgets diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings index 898e8324..91755483 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings @@ -6,11 +6,39 @@ MinGWUnixSlash + + None + - 192.168.1.124 + 192.168.1.233 SSH pi + + false + + None + + $(ProjectDir) + /tmp/VisualGDB/$(ProjectDirUnixStyle) + + *.cpp + *.h + *.hpp + *.c + *.cc + *.cxx + *.mak + Makefile + *.txt + *.cmake + + true + true + + false + true + false false false diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings index d1a36121..c2cd351a 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings @@ -6,11 +6,39 @@ MinGWUnixSlash + + None + - 192.168.1.124 + 192.168.1.233 SSH pi + + false + + None + + $(ProjectDir) + /tmp/VisualGDB/$(ProjectDirUnixStyle) + + *.cpp + *.h + *.hpp + *.c + *.cc + *.cxx + *.mak + Makefile + *.txt + *.cmake + + true + true + + false + true + false false false diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj index 723b1da2..9450b25f 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj @@ -38,13 +38,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) + DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;%(ClCompile.PreprocessorDefinitions) -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames) @@ -52,13 +52,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) NDEBUG=1;RELEASE=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames) diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings index 97b8a3f4..c71096c0 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings @@ -35,6 +35,7 @@ true true + false true @@ -57,7 +58,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings index b923e6a7..34dae797 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings @@ -35,6 +35,7 @@ true true + false true @@ -57,7 +58,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings index 5546fc8d..4a1af365 100644 --- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings @@ -58,7 +58,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings index 5625cc06..0f1f8b31 100644 --- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings @@ -35,6 +35,7 @@ true true + false true diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj index 59dab512..10759fed 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj +++ b/VisualGDB/Amiberry/Amiberry.vcxproj @@ -71,13 +71,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) + DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames) @@ -85,13 +85,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) + DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames) @@ -100,13 +100,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames) @@ -115,13 +115,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) + NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames) @@ -129,13 +129,13 @@ GNUPP14 - =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) + =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories) + NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;../../src/guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) + =/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories) SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames) diff --git a/VisualGDB/guisan/guisan-Debug.vgdbsettings b/VisualGDB/guisan/guisan-Debug.vgdbsettings index c64fce07..4565e66f 100644 --- a/VisualGDB/guisan/guisan-Debug.vgdbsettings +++ b/VisualGDB/guisan/guisan-Debug.vgdbsettings @@ -53,7 +53,6 @@ guisan.vcxproj - 1 true diff --git a/VisualGDB/guisan/guisan.vcxproj b/VisualGDB/guisan/guisan.vcxproj index 9ff2677e..2d39dad4 100644 --- a/VisualGDB/guisan/guisan.vcxproj +++ b/VisualGDB/guisan/guisan.vcxproj @@ -30,20 +30,20 @@ com.visualgdb.raspberry_pi 6.3.0/7.12/r1 StaticLibrary - $(SolutionDir)..\..\src\guisan\lib\ + $(SolutionDir)..\..\guisan\lib\ lib$(ProjectName) com.visualgdb.raspberry_pi 6.3.0/7.12/r1 StaticLibrary - $(SolutionDir)..\..\src\guisan\lib\ + $(SolutionDir)..\..\guisan\lib\ lib$(ProjectName) GNUPP14 - =/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../src/guisan/include;%(ClCompile.AdditionalIncludeDirectories) + =/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan/include;%(ClCompile.AdditionalIncludeDirectories) DEBUG=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) @@ -57,7 +57,7 @@ GNUPP14 - =/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../src/guisan/include;%(ClCompile.AdditionalIncludeDirectories) + =/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan/include;%(ClCompile.AdditionalIncludeDirectories) NDEBUG=1;RELEASE=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) @@ -69,56 +69,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -128,70 +128,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualGDB/guisan/guisan.vcxproj.filters b/VisualGDB/guisan/guisan.vcxproj.filters index 3559d779..68449b42 100644 --- a/VisualGDB/guisan/guisan.vcxproj.filters +++ b/VisualGDB/guisan/guisan.vcxproj.filters @@ -46,351 +46,351 @@ - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files - + Source files\opengl - + Source files\opengl - + Source files\opengl - + Source files\sdl - + Source files\sdl - + Source files\sdl - + Source files\sdl - + Source files\sdl - + Source files\sdl - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Source files\widgets - + Header files - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan - + Header files\guisan\opengl - + Header files\guisan\opengl - + Header files\guisan\opengl - + Header files\guisan\sdl - + Header files\guisan\sdl - + Header files\guisan\sdl - + Header files\guisan\sdl - + Header files\guisan\sdl - + Header files\guisan\sdl - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets - + Header files\guisan\widgets diff --git a/guisan/Android.mk b/guisan/Android.mk new file mode 100644 index 00000000..7badfe91 --- /dev/null +++ b/guisan/Android.mk @@ -0,0 +1,25 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := guisan + +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../SDL2/include $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/../SDL2_image $(LOCAL_PATH)/../SDL2_ttf/include +LOCAL_CFLAGS := -DHAVE_CONFIG_H -D_GNU_SOURCE=1 -D_REENTRANT -fexceptions -frtti + +LOCAL_SRC_FILES := \ + $(wildcard $(LOCAL_PATH)/src/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/sdl/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/widgets/*.cpp) + +#$(wildcard $(LOCAL_PATH)/src/opengl/*.cpp) \ + +LOCAL_SHARED_LIBRARIES += SDL2 SDL2_image SDL2_ttf + +LOCAL_STATIC_LIBRARIES := + +LOCAL_LDLIBS := -llog + +include $(BUILD_SHARED_LIBRARY) +#include $(BUILD_STATIC_LIBRARY) \ No newline at end of file diff --git a/src/guisan/Makefile b/guisan/Makefile similarity index 100% rename from src/guisan/Makefile rename to guisan/Makefile diff --git a/src/guisan/include/guisan.hpp b/guisan/include/guisan.hpp similarity index 100% rename from src/guisan/include/guisan.hpp rename to guisan/include/guisan.hpp diff --git a/src/guisan/include/guisan/actionevent.hpp b/guisan/include/guisan/actionevent.hpp similarity index 100% rename from src/guisan/include/guisan/actionevent.hpp rename to guisan/include/guisan/actionevent.hpp diff --git a/src/guisan/include/guisan/actionlistener.hpp b/guisan/include/guisan/actionlistener.hpp similarity index 100% rename from src/guisan/include/guisan/actionlistener.hpp rename to guisan/include/guisan/actionlistener.hpp diff --git a/src/guisan/include/guisan/basiccontainer.hpp b/guisan/include/guisan/basiccontainer.hpp similarity index 100% rename from src/guisan/include/guisan/basiccontainer.hpp rename to guisan/include/guisan/basiccontainer.hpp diff --git a/src/guisan/include/guisan/cliprectangle.hpp b/guisan/include/guisan/cliprectangle.hpp similarity index 100% rename from src/guisan/include/guisan/cliprectangle.hpp rename to guisan/include/guisan/cliprectangle.hpp diff --git a/src/guisan/include/guisan/color.hpp b/guisan/include/guisan/color.hpp similarity index 100% rename from src/guisan/include/guisan/color.hpp rename to guisan/include/guisan/color.hpp diff --git a/src/guisan/include/guisan/deathlistener.hpp b/guisan/include/guisan/deathlistener.hpp similarity index 100% rename from src/guisan/include/guisan/deathlistener.hpp rename to guisan/include/guisan/deathlistener.hpp diff --git a/src/guisan/include/guisan/defaultfont.hpp b/guisan/include/guisan/defaultfont.hpp similarity index 100% rename from src/guisan/include/guisan/defaultfont.hpp rename to guisan/include/guisan/defaultfont.hpp diff --git a/src/guisan/include/guisan/event.hpp b/guisan/include/guisan/event.hpp similarity index 100% rename from src/guisan/include/guisan/event.hpp rename to guisan/include/guisan/event.hpp diff --git a/src/guisan/include/guisan/exception.hpp b/guisan/include/guisan/exception.hpp similarity index 100% rename from src/guisan/include/guisan/exception.hpp rename to guisan/include/guisan/exception.hpp diff --git a/src/guisan/include/guisan/focushandler.hpp b/guisan/include/guisan/focushandler.hpp similarity index 100% rename from src/guisan/include/guisan/focushandler.hpp rename to guisan/include/guisan/focushandler.hpp diff --git a/src/guisan/include/guisan/focuslistener.hpp b/guisan/include/guisan/focuslistener.hpp similarity index 100% rename from src/guisan/include/guisan/focuslistener.hpp rename to guisan/include/guisan/focuslistener.hpp diff --git a/src/guisan/include/guisan/font.hpp b/guisan/include/guisan/font.hpp similarity index 100% rename from src/guisan/include/guisan/font.hpp rename to guisan/include/guisan/font.hpp diff --git a/src/guisan/include/guisan/genericinput.hpp b/guisan/include/guisan/genericinput.hpp similarity index 100% rename from src/guisan/include/guisan/genericinput.hpp rename to guisan/include/guisan/genericinput.hpp diff --git a/src/guisan/include/guisan/glut.hpp b/guisan/include/guisan/glut.hpp similarity index 100% rename from src/guisan/include/guisan/glut.hpp rename to guisan/include/guisan/glut.hpp diff --git a/src/guisan/include/guisan/graphics.hpp b/guisan/include/guisan/graphics.hpp similarity index 100% rename from src/guisan/include/guisan/graphics.hpp rename to guisan/include/guisan/graphics.hpp diff --git a/src/guisan/include/guisan/gui.hpp b/guisan/include/guisan/gui.hpp similarity index 100% rename from src/guisan/include/guisan/gui.hpp rename to guisan/include/guisan/gui.hpp diff --git a/src/guisan/include/guisan/image.hpp b/guisan/include/guisan/image.hpp similarity index 100% rename from src/guisan/include/guisan/image.hpp rename to guisan/include/guisan/image.hpp diff --git a/src/guisan/include/guisan/imagefont.hpp b/guisan/include/guisan/imagefont.hpp similarity index 100% rename from src/guisan/include/guisan/imagefont.hpp rename to guisan/include/guisan/imagefont.hpp diff --git a/src/guisan/include/guisan/imageloader.hpp b/guisan/include/guisan/imageloader.hpp similarity index 100% rename from src/guisan/include/guisan/imageloader.hpp rename to guisan/include/guisan/imageloader.hpp diff --git a/src/guisan/include/guisan/input.hpp b/guisan/include/guisan/input.hpp similarity index 100% rename from src/guisan/include/guisan/input.hpp rename to guisan/include/guisan/input.hpp diff --git a/src/guisan/include/guisan/inputevent.hpp b/guisan/include/guisan/inputevent.hpp similarity index 100% rename from src/guisan/include/guisan/inputevent.hpp rename to guisan/include/guisan/inputevent.hpp diff --git a/src/guisan/include/guisan/key.hpp b/guisan/include/guisan/key.hpp similarity index 100% rename from src/guisan/include/guisan/key.hpp rename to guisan/include/guisan/key.hpp diff --git a/src/guisan/include/guisan/keyevent.hpp b/guisan/include/guisan/keyevent.hpp similarity index 100% rename from src/guisan/include/guisan/keyevent.hpp rename to guisan/include/guisan/keyevent.hpp diff --git a/src/guisan/include/guisan/keyinput.hpp b/guisan/include/guisan/keyinput.hpp similarity index 100% rename from src/guisan/include/guisan/keyinput.hpp rename to guisan/include/guisan/keyinput.hpp diff --git a/src/guisan/include/guisan/keylistener.hpp b/guisan/include/guisan/keylistener.hpp similarity index 100% rename from src/guisan/include/guisan/keylistener.hpp rename to guisan/include/guisan/keylistener.hpp diff --git a/src/guisan/include/guisan/listmodel.hpp b/guisan/include/guisan/listmodel.hpp similarity index 100% rename from src/guisan/include/guisan/listmodel.hpp rename to guisan/include/guisan/listmodel.hpp diff --git a/src/guisan/include/guisan/mouseevent.hpp b/guisan/include/guisan/mouseevent.hpp similarity index 100% rename from src/guisan/include/guisan/mouseevent.hpp rename to guisan/include/guisan/mouseevent.hpp diff --git a/src/guisan/include/guisan/mouseinput.hpp b/guisan/include/guisan/mouseinput.hpp similarity index 100% rename from src/guisan/include/guisan/mouseinput.hpp rename to guisan/include/guisan/mouseinput.hpp diff --git a/src/guisan/include/guisan/mouselistener.hpp b/guisan/include/guisan/mouselistener.hpp similarity index 100% rename from src/guisan/include/guisan/mouselistener.hpp rename to guisan/include/guisan/mouselistener.hpp diff --git a/src/guisan/include/guisan/opengl.hpp b/guisan/include/guisan/opengl.hpp similarity index 100% rename from src/guisan/include/guisan/opengl.hpp rename to guisan/include/guisan/opengl.hpp diff --git a/src/guisan/include/guisan/opengl/openglgraphics.hpp b/guisan/include/guisan/opengl/openglgraphics.hpp similarity index 100% rename from src/guisan/include/guisan/opengl/openglgraphics.hpp rename to guisan/include/guisan/opengl/openglgraphics.hpp diff --git a/src/guisan/include/guisan/opengl/openglimage.hpp b/guisan/include/guisan/opengl/openglimage.hpp similarity index 100% rename from src/guisan/include/guisan/opengl/openglimage.hpp rename to guisan/include/guisan/opengl/openglimage.hpp diff --git a/src/guisan/include/guisan/opengl/openglsdlimageloader.hpp b/guisan/include/guisan/opengl/openglsdlimageloader.hpp similarity index 100% rename from src/guisan/include/guisan/opengl/openglsdlimageloader.hpp rename to guisan/include/guisan/opengl/openglsdlimageloader.hpp diff --git a/src/guisan/include/guisan/platform.hpp b/guisan/include/guisan/platform.hpp similarity index 100% rename from src/guisan/include/guisan/platform.hpp rename to guisan/include/guisan/platform.hpp diff --git a/src/guisan/include/guisan/rectangle.hpp b/guisan/include/guisan/rectangle.hpp similarity index 100% rename from src/guisan/include/guisan/rectangle.hpp rename to guisan/include/guisan/rectangle.hpp diff --git a/src/guisan/include/guisan/sdl.hpp b/guisan/include/guisan/sdl.hpp similarity index 100% rename from src/guisan/include/guisan/sdl.hpp rename to guisan/include/guisan/sdl.hpp diff --git a/src/guisan/include/guisan/sdl/sdlgraphics.hpp b/guisan/include/guisan/sdl/sdlgraphics.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdlgraphics.hpp rename to guisan/include/guisan/sdl/sdlgraphics.hpp diff --git a/src/guisan/include/guisan/sdl/sdlimage.hpp b/guisan/include/guisan/sdl/sdlimage.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdlimage.hpp rename to guisan/include/guisan/sdl/sdlimage.hpp diff --git a/src/guisan/include/guisan/sdl/sdlimageloader.hpp b/guisan/include/guisan/sdl/sdlimageloader.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdlimageloader.hpp rename to guisan/include/guisan/sdl/sdlimageloader.hpp diff --git a/src/guisan/include/guisan/sdl/sdlinput.hpp b/guisan/include/guisan/sdl/sdlinput.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdlinput.hpp rename to guisan/include/guisan/sdl/sdlinput.hpp diff --git a/src/guisan/include/guisan/sdl/sdlpixel.hpp b/guisan/include/guisan/sdl/sdlpixel.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdlpixel.hpp rename to guisan/include/guisan/sdl/sdlpixel.hpp diff --git a/src/guisan/include/guisan/sdl/sdltruetypefont.hpp b/guisan/include/guisan/sdl/sdltruetypefont.hpp similarity index 100% rename from src/guisan/include/guisan/sdl/sdltruetypefont.hpp rename to guisan/include/guisan/sdl/sdltruetypefont.hpp diff --git a/src/guisan/include/guisan/selectionevent.hpp b/guisan/include/guisan/selectionevent.hpp similarity index 100% rename from src/guisan/include/guisan/selectionevent.hpp rename to guisan/include/guisan/selectionevent.hpp diff --git a/src/guisan/include/guisan/selectionlistener.hpp b/guisan/include/guisan/selectionlistener.hpp similarity index 100% rename from src/guisan/include/guisan/selectionlistener.hpp rename to guisan/include/guisan/selectionlistener.hpp diff --git a/src/guisan/include/guisan/widget.hpp b/guisan/include/guisan/widget.hpp similarity index 100% rename from src/guisan/include/guisan/widget.hpp rename to guisan/include/guisan/widget.hpp diff --git a/src/guisan/include/guisan/widgetlistener.hpp b/guisan/include/guisan/widgetlistener.hpp similarity index 100% rename from src/guisan/include/guisan/widgetlistener.hpp rename to guisan/include/guisan/widgetlistener.hpp diff --git a/src/guisan/include/guisan/widgets/button.hpp b/guisan/include/guisan/widgets/button.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/button.hpp rename to guisan/include/guisan/widgets/button.hpp diff --git a/src/guisan/include/guisan/widgets/checkbox.hpp b/guisan/include/guisan/widgets/checkbox.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/checkbox.hpp rename to guisan/include/guisan/widgets/checkbox.hpp diff --git a/src/guisan/include/guisan/widgets/container.hpp b/guisan/include/guisan/widgets/container.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/container.hpp rename to guisan/include/guisan/widgets/container.hpp diff --git a/src/guisan/include/guisan/widgets/dropdown.hpp b/guisan/include/guisan/widgets/dropdown.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/dropdown.hpp rename to guisan/include/guisan/widgets/dropdown.hpp diff --git a/src/guisan/include/guisan/widgets/icon.hpp b/guisan/include/guisan/widgets/icon.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/icon.hpp rename to guisan/include/guisan/widgets/icon.hpp diff --git a/src/guisan/include/guisan/widgets/imagebutton.hpp b/guisan/include/guisan/widgets/imagebutton.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/imagebutton.hpp rename to guisan/include/guisan/widgets/imagebutton.hpp diff --git a/src/guisan/include/guisan/widgets/label.hpp b/guisan/include/guisan/widgets/label.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/label.hpp rename to guisan/include/guisan/widgets/label.hpp diff --git a/src/guisan/include/guisan/widgets/listbox.hpp b/guisan/include/guisan/widgets/listbox.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/listbox.hpp rename to guisan/include/guisan/widgets/listbox.hpp diff --git a/src/guisan/include/guisan/widgets/progressbar.hpp b/guisan/include/guisan/widgets/progressbar.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/progressbar.hpp rename to guisan/include/guisan/widgets/progressbar.hpp diff --git a/src/guisan/include/guisan/widgets/radiobutton.hpp b/guisan/include/guisan/widgets/radiobutton.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/radiobutton.hpp rename to guisan/include/guisan/widgets/radiobutton.hpp diff --git a/src/guisan/include/guisan/widgets/scrollarea.hpp b/guisan/include/guisan/widgets/scrollarea.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/scrollarea.hpp rename to guisan/include/guisan/widgets/scrollarea.hpp diff --git a/src/guisan/include/guisan/widgets/slider.hpp b/guisan/include/guisan/widgets/slider.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/slider.hpp rename to guisan/include/guisan/widgets/slider.hpp diff --git a/src/guisan/include/guisan/widgets/tab.hpp b/guisan/include/guisan/widgets/tab.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/tab.hpp rename to guisan/include/guisan/widgets/tab.hpp diff --git a/src/guisan/include/guisan/widgets/tabbedarea.hpp b/guisan/include/guisan/widgets/tabbedarea.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/tabbedarea.hpp rename to guisan/include/guisan/widgets/tabbedarea.hpp diff --git a/src/guisan/include/guisan/widgets/textbox.hpp b/guisan/include/guisan/widgets/textbox.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/textbox.hpp rename to guisan/include/guisan/widgets/textbox.hpp diff --git a/src/guisan/include/guisan/widgets/textfield.hpp b/guisan/include/guisan/widgets/textfield.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/textfield.hpp rename to guisan/include/guisan/widgets/textfield.hpp diff --git a/src/guisan/include/guisan/widgets/window.hpp b/guisan/include/guisan/widgets/window.hpp similarity index 100% rename from src/guisan/include/guisan/widgets/window.hpp rename to guisan/include/guisan/widgets/window.hpp diff --git a/src/guisan/include/guisan/x.hpp b/guisan/include/guisan/x.hpp similarity index 100% rename from src/guisan/include/guisan/x.hpp rename to guisan/include/guisan/x.hpp diff --git a/src/guisan/lib/.keep b/guisan/lib/.keep similarity index 100% rename from src/guisan/lib/.keep rename to guisan/lib/.keep diff --git a/src/guisan/src/actionevent.cpp b/guisan/src/actionevent.cpp similarity index 100% rename from src/guisan/src/actionevent.cpp rename to guisan/src/actionevent.cpp diff --git a/src/guisan/src/basiccontainer.cpp b/guisan/src/basiccontainer.cpp similarity index 100% rename from src/guisan/src/basiccontainer.cpp rename to guisan/src/basiccontainer.cpp diff --git a/src/guisan/src/cliprectangle.cpp b/guisan/src/cliprectangle.cpp similarity index 100% rename from src/guisan/src/cliprectangle.cpp rename to guisan/src/cliprectangle.cpp diff --git a/src/guisan/src/color.cpp b/guisan/src/color.cpp similarity index 100% rename from src/guisan/src/color.cpp rename to guisan/src/color.cpp diff --git a/src/guisan/src/defaultfont.cpp b/guisan/src/defaultfont.cpp similarity index 100% rename from src/guisan/src/defaultfont.cpp rename to guisan/src/defaultfont.cpp diff --git a/src/guisan/src/event.cpp b/guisan/src/event.cpp similarity index 100% rename from src/guisan/src/event.cpp rename to guisan/src/event.cpp diff --git a/src/guisan/src/exception.cpp b/guisan/src/exception.cpp similarity index 100% rename from src/guisan/src/exception.cpp rename to guisan/src/exception.cpp diff --git a/src/guisan/src/focushandler.cpp b/guisan/src/focushandler.cpp similarity index 100% rename from src/guisan/src/focushandler.cpp rename to guisan/src/focushandler.cpp diff --git a/src/guisan/src/font.cpp b/guisan/src/font.cpp similarity index 100% rename from src/guisan/src/font.cpp rename to guisan/src/font.cpp diff --git a/src/guisan/src/genericinput.cpp b/guisan/src/genericinput.cpp similarity index 100% rename from src/guisan/src/genericinput.cpp rename to guisan/src/genericinput.cpp diff --git a/src/guisan/src/graphics.cpp b/guisan/src/graphics.cpp similarity index 100% rename from src/guisan/src/graphics.cpp rename to guisan/src/graphics.cpp diff --git a/src/guisan/src/gui.cpp b/guisan/src/gui.cpp similarity index 100% rename from src/guisan/src/gui.cpp rename to guisan/src/gui.cpp diff --git a/src/guisan/src/guisan.cpp b/guisan/src/guisan.cpp similarity index 100% rename from src/guisan/src/guisan.cpp rename to guisan/src/guisan.cpp diff --git a/src/guisan/src/image.cpp b/guisan/src/image.cpp similarity index 100% rename from src/guisan/src/image.cpp rename to guisan/src/image.cpp diff --git a/src/guisan/src/imagefont.cpp b/guisan/src/imagefont.cpp similarity index 100% rename from src/guisan/src/imagefont.cpp rename to guisan/src/imagefont.cpp diff --git a/src/guisan/src/inputevent.cpp b/guisan/src/inputevent.cpp similarity index 100% rename from src/guisan/src/inputevent.cpp rename to guisan/src/inputevent.cpp diff --git a/src/guisan/src/key.cpp b/guisan/src/key.cpp similarity index 100% rename from src/guisan/src/key.cpp rename to guisan/src/key.cpp diff --git a/src/guisan/src/keyevent.cpp b/guisan/src/keyevent.cpp similarity index 100% rename from src/guisan/src/keyevent.cpp rename to guisan/src/keyevent.cpp diff --git a/src/guisan/src/keyinput.cpp b/guisan/src/keyinput.cpp similarity index 100% rename from src/guisan/src/keyinput.cpp rename to guisan/src/keyinput.cpp diff --git a/src/guisan/src/mouseevent.cpp b/guisan/src/mouseevent.cpp similarity index 100% rename from src/guisan/src/mouseevent.cpp rename to guisan/src/mouseevent.cpp diff --git a/src/guisan/src/mouseinput.cpp b/guisan/src/mouseinput.cpp similarity index 100% rename from src/guisan/src/mouseinput.cpp rename to guisan/src/mouseinput.cpp diff --git a/src/guisan/src/opengl/opengl.cpp b/guisan/src/opengl/opengl.cpp similarity index 100% rename from src/guisan/src/opengl/opengl.cpp rename to guisan/src/opengl/opengl.cpp diff --git a/src/guisan/src/opengl/openglgraphics.cpp b/guisan/src/opengl/openglgraphics.cpp similarity index 100% rename from src/guisan/src/opengl/openglgraphics.cpp rename to guisan/src/opengl/openglgraphics.cpp diff --git a/src/guisan/src/opengl/openglimage.cpp b/guisan/src/opengl/openglimage.cpp similarity index 100% rename from src/guisan/src/opengl/openglimage.cpp rename to guisan/src/opengl/openglimage.cpp diff --git a/src/guisan/src/rectangle.cpp b/guisan/src/rectangle.cpp similarity index 100% rename from src/guisan/src/rectangle.cpp rename to guisan/src/rectangle.cpp diff --git a/src/guisan/src/sdl/sdl.cpp b/guisan/src/sdl/sdl.cpp similarity index 100% rename from src/guisan/src/sdl/sdl.cpp rename to guisan/src/sdl/sdl.cpp diff --git a/src/guisan/src/sdl/sdlgraphics.cpp b/guisan/src/sdl/sdlgraphics.cpp similarity index 100% rename from src/guisan/src/sdl/sdlgraphics.cpp rename to guisan/src/sdl/sdlgraphics.cpp diff --git a/src/guisan/src/sdl/sdlimage.cpp b/guisan/src/sdl/sdlimage.cpp similarity index 100% rename from src/guisan/src/sdl/sdlimage.cpp rename to guisan/src/sdl/sdlimage.cpp diff --git a/src/guisan/src/sdl/sdlimageloader.cpp b/guisan/src/sdl/sdlimageloader.cpp similarity index 100% rename from src/guisan/src/sdl/sdlimageloader.cpp rename to guisan/src/sdl/sdlimageloader.cpp diff --git a/src/guisan/src/sdl/sdlinput.cpp b/guisan/src/sdl/sdlinput.cpp similarity index 100% rename from src/guisan/src/sdl/sdlinput.cpp rename to guisan/src/sdl/sdlinput.cpp diff --git a/src/guisan/src/sdl/sdltruetypefont.cpp b/guisan/src/sdl/sdltruetypefont.cpp similarity index 100% rename from src/guisan/src/sdl/sdltruetypefont.cpp rename to guisan/src/sdl/sdltruetypefont.cpp diff --git a/src/guisan/src/selectionevent.cpp b/guisan/src/selectionevent.cpp similarity index 100% rename from src/guisan/src/selectionevent.cpp rename to guisan/src/selectionevent.cpp diff --git a/src/guisan/src/widget.cpp b/guisan/src/widget.cpp similarity index 100% rename from src/guisan/src/widget.cpp rename to guisan/src/widget.cpp diff --git a/src/guisan/src/widgets/button.cpp b/guisan/src/widgets/button.cpp similarity index 100% rename from src/guisan/src/widgets/button.cpp rename to guisan/src/widgets/button.cpp diff --git a/src/guisan/src/widgets/checkbox.cpp b/guisan/src/widgets/checkbox.cpp similarity index 100% rename from src/guisan/src/widgets/checkbox.cpp rename to guisan/src/widgets/checkbox.cpp diff --git a/src/guisan/src/widgets/container.cpp b/guisan/src/widgets/container.cpp similarity index 100% rename from src/guisan/src/widgets/container.cpp rename to guisan/src/widgets/container.cpp diff --git a/src/guisan/src/widgets/dropdown.cpp b/guisan/src/widgets/dropdown.cpp similarity index 100% rename from src/guisan/src/widgets/dropdown.cpp rename to guisan/src/widgets/dropdown.cpp diff --git a/src/guisan/src/widgets/icon.cpp b/guisan/src/widgets/icon.cpp similarity index 100% rename from src/guisan/src/widgets/icon.cpp rename to guisan/src/widgets/icon.cpp diff --git a/src/guisan/src/widgets/imagebutton.cpp b/guisan/src/widgets/imagebutton.cpp similarity index 100% rename from src/guisan/src/widgets/imagebutton.cpp rename to guisan/src/widgets/imagebutton.cpp diff --git a/src/guisan/src/widgets/label.cpp b/guisan/src/widgets/label.cpp similarity index 100% rename from src/guisan/src/widgets/label.cpp rename to guisan/src/widgets/label.cpp diff --git a/src/guisan/src/widgets/listbox.cpp b/guisan/src/widgets/listbox.cpp similarity index 100% rename from src/guisan/src/widgets/listbox.cpp rename to guisan/src/widgets/listbox.cpp diff --git a/src/guisan/src/widgets/progressbar.cpp b/guisan/src/widgets/progressbar.cpp similarity index 100% rename from src/guisan/src/widgets/progressbar.cpp rename to guisan/src/widgets/progressbar.cpp diff --git a/src/guisan/src/widgets/radiobutton.cpp b/guisan/src/widgets/radiobutton.cpp similarity index 100% rename from src/guisan/src/widgets/radiobutton.cpp rename to guisan/src/widgets/radiobutton.cpp diff --git a/src/guisan/src/widgets/scrollarea.cpp b/guisan/src/widgets/scrollarea.cpp similarity index 100% rename from src/guisan/src/widgets/scrollarea.cpp rename to guisan/src/widgets/scrollarea.cpp diff --git a/src/guisan/src/widgets/slider.cpp b/guisan/src/widgets/slider.cpp similarity index 100% rename from src/guisan/src/widgets/slider.cpp rename to guisan/src/widgets/slider.cpp diff --git a/src/guisan/src/widgets/tab.cpp b/guisan/src/widgets/tab.cpp similarity index 100% rename from src/guisan/src/widgets/tab.cpp rename to guisan/src/widgets/tab.cpp diff --git a/src/guisan/src/widgets/tabbedarea.cpp b/guisan/src/widgets/tabbedarea.cpp similarity index 100% rename from src/guisan/src/widgets/tabbedarea.cpp rename to guisan/src/widgets/tabbedarea.cpp diff --git a/src/guisan/src/widgets/textbox.cpp b/guisan/src/widgets/textbox.cpp similarity index 100% rename from src/guisan/src/widgets/textbox.cpp rename to guisan/src/widgets/textbox.cpp diff --git a/src/guisan/src/widgets/textfield.cpp b/guisan/src/widgets/textfield.cpp similarity index 100% rename from src/guisan/src/widgets/textfield.cpp rename to guisan/src/widgets/textfield.cpp diff --git a/src/guisan/src/widgets/window.cpp b/guisan/src/widgets/window.cpp similarity index 100% rename from src/guisan/src/widgets/window.cpp rename to guisan/src/widgets/window.cpp