Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 17:17:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved "src/eepp/helper" folder to "src/thirdparty".

Browse Source 
Also some minor fixes.

--HG--
branch : dev-2.1
This commit is contained in:
Martín Lucas Golini
2017-12-30 14:29:38 -03:00
parent dcc905c4f8
commit 77637f71fa
1412 changed files with 302 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hgignore
View File

@@ -40,7 +40,7 @@ external_projects.lua
.*\.DS_Store$
.*.pdb$
syntax: glob
src/eepp/helper/SDL2/include/SDL2
src/thirdparty/SDL2/include/SDL2
projects/ios/eepp.app/assets
projects/ios/eepp.app/eepp
bin/libeepp-debug.dylib

2
Doxyfile
View File

@@ -101,7 +101,7 @@ INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.hpp
RECURSIVE = YES
EXCLUDE = ./include/eepp/helper
EXCLUDE = ./include/eepp/thirdparty
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXCLUDE_SYMBOLS =

BIN
bin/assets/ui/uitheme.eta
View File

Binary file not shown.

2
include/eepp/core.hpp
View File

@@ -1,7 +1,7 @@
#ifndef EE_BASE_HPP
#define EE_BASE_HPP
#include <eepp/helper/PlusCallback/callback.hpp>
#include <eepp/thirdparty/PlusCallback/callback.hpp>
#include <eepp/config.hpp>

2
include/eepp/network/http.hpp
View File

@@ -10,7 +10,7 @@
#include <eepp/system/thread.hpp>
#include <eepp/system/mutex.hpp>
#include <eepp/system/lock.hpp>
#include <eepp/helper/PlusCallback/callback.hpp>
#include <eepp/thirdparty/PlusCallback/callback.hpp>
#include <map>
#include <string>
#include <list>

2
include/eepp/physics/base.hpp
View File

@@ -2,7 +2,7 @@
#define EE_PHYSICS_BASE
//! Chipmunk includes
#include <eepp/helper/chipmunk/chipmunk_private.h>
#include <eepp/thirdparty/chipmunk/chipmunk_private.h>
//! EE includes needed for the wrapper, all templates, so it will be easy to port this.

0
include/eepp/helper/PlusCallback/callback.hpp → include/eepp/thirdparty/PlusCallback/callback.hpp vendored
View File

0
include/eepp/helper/chipmunk/chipmunk.h → include/eepp/thirdparty/chipmunk/chipmunk.h vendored
View File

0
include/eepp/helper/chipmunk/chipmunk_ffi.h → include/eepp/thirdparty/chipmunk/chipmunk_ffi.h vendored
View File

0
include/eepp/helper/chipmunk/chipmunk_private.h → include/eepp/thirdparty/chipmunk/chipmunk_private.h vendored
View File

0
include/eepp/helper/chipmunk/chipmunk_types.h → include/eepp/thirdparty/chipmunk/chipmunk_types.h vendored
View File

0
include/eepp/helper/chipmunk/chipmunk_unsafe.h → include/eepp/thirdparty/chipmunk/chipmunk_unsafe.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpConstraint.h → include/eepp/thirdparty/chipmunk/constraints/cpConstraint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpDampedRotarySpring.h → include/eepp/thirdparty/chipmunk/constraints/cpDampedRotarySpring.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpDampedSpring.h → include/eepp/thirdparty/chipmunk/constraints/cpDampedSpring.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpGearJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpGearJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpGrooveJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpGrooveJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpPinJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpPinJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpPivotJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpPivotJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpRatchetJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpRatchetJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpRotaryLimitJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpRotaryLimitJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpSimpleMotor.h → include/eepp/thirdparty/chipmunk/constraints/cpSimpleMotor.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/cpSlideJoint.h → include/eepp/thirdparty/chipmunk/constraints/cpSlideJoint.h vendored
View File

0
include/eepp/helper/chipmunk/constraints/util.h → include/eepp/thirdparty/chipmunk/constraints/util.h vendored
View File

0
include/eepp/helper/chipmunk/cpArbiter.h → include/eepp/thirdparty/chipmunk/cpArbiter.h vendored
View File

0
include/eepp/helper/chipmunk/cpBB.h → include/eepp/thirdparty/chipmunk/cpBB.h vendored
View File

0
include/eepp/helper/chipmunk/cpBody.h → include/eepp/thirdparty/chipmunk/cpBody.h vendored
View File

0
include/eepp/helper/chipmunk/cpPolyShape.h → include/eepp/thirdparty/chipmunk/cpPolyShape.h vendored
View File

0
include/eepp/helper/chipmunk/cpShape.h → include/eepp/thirdparty/chipmunk/cpShape.h vendored
View File

0
include/eepp/helper/chipmunk/cpSpace.h → include/eepp/thirdparty/chipmunk/cpSpace.h vendored
View File

0
include/eepp/helper/chipmunk/cpSpatialIndex.h → include/eepp/thirdparty/chipmunk/cpSpatialIndex.h vendored
View File

0
include/eepp/helper/chipmunk/cpVect.h → include/eepp/thirdparty/chipmunk/cpVect.h vendored
View File

4
include/eepp/ui/uisliderbutton.hpp
View File

@@ -1,11 +1,11 @@
#ifndef EE_UICUISLIDERBUTTON_HPP
#define EE_UICUISLIDERBUTTON_HPP
#include <eepp/ui/uicontrolanim.hpp>
#include <eepp/ui/uiwidget.hpp>
namespace EE { namespace UI { namespace Private {
class EE_API UISliderButton : public UIControlAnim {
class EE_API UISliderButton : public UIWidget {
public:
static UISliderButton * New();

2
include/eepp/window/platformhelper.hpp
View File

@@ -9,6 +9,8 @@ namespace EE { namespace Window {
class EE_API PlatformHelper
{
public:
virtual ~PlatformHelper() {}
#if EE_PLATFORM == EE_PLATFORM_ANDROID
/** @return The Activity object for the application */
virtual void * getActivity() = 0;

62
premake4.lua
View File

@@ -281,14 +281,14 @@ static_backends = { }
backend_selected = false
function build_base_configuration( package_name )
includedirs { "src/eepp/helper/zlib" }
includedirs { "src/thirdparty/zlib" }
if not os.is("windows") then
buildoptions{ "-fPIC" }
end
if is_vs() then
includedirs { "src/eepp/helper/libzip/vs" }
includedirs { "src/thirdparty/libzip/vs" }
end
configuration "debug"
@@ -605,11 +605,11 @@ function set_ios_config()
linkoptions { sysroot_ver }
libdirs { framework_libs_path }
linkoptions { " -F" .. framework_path .. " -L" .. framework_libs_path .. " -isysroot " .. sysroot_path }
includedirs { "src/eepp/helper/SDL2/include" }
includedirs { "src/thirdparty/SDL2/include" }
end
if _OPTIONS.platform == "ios-cross-arm7" or _OPTIONS.platform == "ios-cross-x86" then
includedirs { "src/eepp/helper/SDL2/include" }
includedirs { "src/thirdparty/SDL2/include" }
end
end
@@ -679,7 +679,7 @@ function check_ssl_support()
end
function build_eepp( build_name )
includedirs { "include", "src", "src/eepp/helper/freetype2/include", "src/eepp/helper/zlib" }
includedirs { "include", "src", "src/thirdparty", "include/eepp/thirdparty", "src/thirdparty/freetype2/include", "src/thirdparty/zlib" }
set_ios_config()
set_xcode_config()
@@ -687,7 +687,7 @@ function build_eepp( build_name )
add_static_links()
if is_vs() then
includedirs { "src/eepp/helper/libzip/vs" }
includedirs { "src/thirdparty/libzip/vs" }
end
if not is_vs() then
@@ -795,9 +795,9 @@ solution "eepp"
language "C"
end
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/SOIL2/src/SOIL2/*.c" }
includedirs { "include/eepp/helper/SOIL2" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/SOIL2/src/SOIL2/*.c" }
includedirs { "include/thirdparty/SOIL2" }
build_base_configuration( "SOIL2" )
if not os.is_real("haiku") and not os.is_real("ios") and not os.is_real("android") and not os.is_real("emscripten") then
@@ -805,48 +805,48 @@ solution "eepp"
kind "StaticLib"
language "C"
defines { "GLEW_NO_GLU", "GLEW_STATIC" }
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/glew/*.c" }
includedirs { "include/eepp/helper/glew" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/glew/*.c" }
includedirs { "include/thirdparty/glew" }
build_base_configuration( "glew" )
end
project "pugixml-static"
kind "StaticLib"
language "C++"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/pugixml/*.cpp" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/pugixml/*.cpp" }
build_base_cpp_configuration( "pugixml" )
project "zlib-static"
kind "StaticLib"
language "C"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/zlib/*.c" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/zlib/*.c" }
build_base_configuration( "zlib" )
project "libzip-static"
kind "StaticLib"
language "C"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/libzip/*.c" }
includedirs { "src/eepp/helper/zlib" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/libzip/*.c" }
includedirs { "src/thirdparty/zlib" }
build_base_configuration( "libzip" )
project "freetype-static"
kind "StaticLib"
language "C"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
defines { "FT2_BUILD_LIBRARY" }
files { "src/eepp/helper/freetype2/src/**.c" }
includedirs { "src/eepp/helper/freetype2/include" }
files { "src/thirdparty/freetype2/src/**.c" }
includedirs { "src/thirdparty/freetype2/include" }
build_base_configuration( "freetype" )
project "stb_vorbis-static"
kind "StaticLib"
language "C"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/stb_vorbis/*.c" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/stb_vorbis/*.c" }
build_base_configuration( "stb_vorbis" )
project "chipmunk-static"
@@ -859,23 +859,23 @@ solution "eepp"
language "C"
end
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/chipmunk/*.c", "src/eepp/helper/chipmunk/constraints/*.c" }
includedirs { "include/eepp/helper/chipmunk" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/chipmunk/*.c", "src/thirdparty/chipmunk/constraints/*.c" }
includedirs { "include/eepp/thirdparty/chipmunk" }
build_base_configuration( "chipmunk" )
project "jpeg-compressor-static"
kind "StaticLib"
language "C++"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/jpeg-compressor/*.cpp" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/jpeg-compressor/*.cpp" }
build_base_cpp_configuration( "jpeg-compressor" )
project "imageresampler-static"
kind "StaticLib"
language "C++"
set_targetdir("libs/" .. os.get_real() .. "/helpers/")
files { "src/eepp/helper/imageresampler/*.cpp" }
set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
files { "src/thirdparty/imageresampler/*.cpp" }
build_base_cpp_configuration( "imageresampler" )
project "eepp-main"

73
projects/android-project-ant/jni/Android.mk
View File

@@ -1,20 +1,22 @@
LOCAL_PATH := $(call my-dir)
MY_PATH := $(LOCAL_PATH)/../../../src/eepp
INC_PATH := $(LOCAL_PATH)/../../../include
BASE_PATH := $(LOCAL_PATH)/../../../src
EEPP_PATH := $(LOCAL_PATH)/../../../src/eepp
INC_PATH := $(LOCAL_PATH)/../../../include
THIRD_PARTY_PATH := $(BASE_PATH)/thirdparty
MY_SDL_PATH := $(MY_PATH)/helper/SDL2
MY_SDL_MAIN_PATH := helper/SDL2/src/main/android/*.c
SDL_PATH := $(THIRD_PARTY_PATH)/SDL2
SDL_MAIN_PATH := thirdparty/SDL2/src/main/android/*.c
MY_C_INCLUDES := \
$(MY_PATH)/helper/openal-soft/include/ \
$(MY_PATH)/helper/freetype2/include \
$(MY_SDL_PATH)/include \
$(MY_PATH)/helper/chipmunk \
$(INC_PATH)/eepp/helper/chipmunk \
$(MY_PATH)/helper/SOIL2/src/SOIL2 \
$(MY_PATH)/helper/stb_vorbis \
$(INC_PATH)/eepp/helper/chipmunk
$(THIRD_PARTY_PATH) \
$(THIRD_PARTY_PATH)/openal-soft/include/ \
$(THIRD_PARTY_PATH)/freetype2/include \
$(SDL_PATH)/include \
$(THIRD_PARTY_PATH)/chipmunk \
$(INC_PATH)/eepp/thirdparty \
$(INC_PATH)/eepp/thirdparty/chipmunk \
$(THIRD_PARTY_PATH)/SOIL2/src/SOIL2 \
$(THIRD_PARTY_PATH)/stb_vorbis
MY_C_FLAGS := \
-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit \
@@ -36,21 +38,20 @@ include $(call all-subdir-makefiles)
#*************** EEPP ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(EEPP_PATH)
LOCAL_MODULE := eepp
LOCAL_CFLAGS := $(MY_C_FLAGS)
CODE_SRCS := \
helper/SOIL2/src/SOIL2/*.c \
helper/stb_vorbis/*.c \
helper/zlib/*.c \
helper/libzip/*.c \
helper/jpeg-compressor/*.cpp \
helper/imageresampler/*.cpp \
helper/haikuttf/*.cpp \
helper/pugixml/*.cpp \
../thirdparty/SOIL2/src/SOIL2/*.c \
../thirdparty/stb_vorbis/*.c \
../thirdparty/zlib/*.c \
../thirdparty/libzip/*.c \
../thirdparty/jpeg-compressor/*.cpp \
../thirdparty/imageresampler/*.cpp \
../thirdparty/pugixml/*.cpp \
system/*.cpp \
system/platform/posix/*.cpp \
network/*.cpp \
@@ -84,7 +85,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** CHIPMUNK ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(THIRD_PARTY_PATH)
LOCAL_MODULE := chipmunk
@@ -96,8 +97,8 @@ LOCAL_CFLAGS := \
-Wno-unknown-pragmas
CHIPMUNK_SRCS := \
helper/chipmunk/*.c \
helper/chipmunk/constraints/*.c
chipmunk/*.c \
chipmunk/constraints/*.c
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
@@ -109,7 +110,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** FREETYPE ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)/helper/freetype2
LOCAL_PATH := $(THIRD_PARTY_PATH)/freetype2
LOCAL_MODULE := freetype
@@ -126,7 +127,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** OPENAL *****************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)/helper/openal-soft
LOCAL_PATH := $(THIRD_PARTY_PATH)/openal-soft
LOCAL_MODULE := openal
@@ -159,7 +160,7 @@ include $(BUILD_SHARED_LIBRARY)
#**************** SDL 2 ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_SDL_PATH)
LOCAL_PATH := $(SDL_PATH)
LOCAL_MODULE := SDL2
@@ -205,7 +206,7 @@ include $(BUILD_STATIC_LIBRARY)
#************* empty_window *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := empty_window
@@ -216,8 +217,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../examples/empty_window/*.cpp
$(SDL_MAIN_PATH) \
examples/empty_window/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
@@ -229,7 +230,7 @@ include $(BUILD_SHARED_LIBRARY)
#************* external_shader *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := external_shader
@@ -240,8 +241,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../examples/external_shader/*.cpp
$(SDL_MAIN_PATH) \
examples/external_shader/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
@@ -253,7 +254,7 @@ include $(BUILD_SHARED_LIBRARY)
#************* full_test *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := main
@@ -264,8 +265,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../test/*.cpp
$(SDL_MAIN_PATH) \
test/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))

73
projects/android-project/app/jni/Android.mk
View File

@@ -1,20 +1,22 @@
LOCAL_PATH := $(call my-dir)
MY_PATH := $(LOCAL_PATH)/../../../../src/eepp
INC_PATH := $(LOCAL_PATH)/../../../../include
BASE_PATH := $(LOCAL_PATH)/../../../../src
EEPP_PATH := $(LOCAL_PATH)/../../../../src/eepp
INC_PATH := $(LOCAL_PATH)/../../../../include
THIRD_PARTY_PATH := $(BASE_PATH)/thirdparty
MY_SDL_PATH := $(MY_PATH)/helper/SDL2
MY_SDL_MAIN_PATH := helper/SDL2/src/main/android/*.c
SDL_PATH := $(THIRD_PARTY_PATH)/SDL2
SDL_MAIN_PATH := thirdparty/SDL2/src/main/android/*.c
MY_C_INCLUDES := \
$(MY_PATH)/helper/openal-soft/include/ \
$(MY_PATH)/helper/freetype2/include \
$(MY_SDL_PATH)/include \
$(MY_PATH)/helper/chipmunk \
$(INC_PATH)/eepp/helper/chipmunk \
$(MY_PATH)/helper/SOIL2/src/SOIL2 \
$(MY_PATH)/helper/stb_vorbis \
$(INC_PATH)/eepp/helper/chipmunk
$(THIRD_PARTY_PATH) \
$(THIRD_PARTY_PATH)/openal-soft/include/ \
$(THIRD_PARTY_PATH)/freetype2/include \
$(SDL_PATH)/include \
$(THIRD_PARTY_PATH)/chipmunk \
$(INC_PATH)/eepp/thirdparty \
$(INC_PATH)/eepp/thirdparty/chipmunk \
$(THIRD_PARTY_PATH)/SOIL2/src/SOIL2 \
$(THIRD_PARTY_PATH)/stb_vorbis
MY_C_FLAGS := \
-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit \
@@ -36,21 +38,20 @@ include $(call all-subdir-makefiles)
#*************** EEPP ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(EEPP_PATH)
LOCAL_MODULE := eepp
LOCAL_CFLAGS := $(MY_C_FLAGS)
CODE_SRCS := \
helper/SOIL2/src/SOIL2/*.c \
helper/stb_vorbis/*.c \
helper/zlib/*.c \
helper/libzip/*.c \
helper/jpeg-compressor/*.cpp \
helper/imageresampler/*.cpp \
helper/haikuttf/*.cpp \
helper/pugixml/*.cpp \
../thirdparty/SOIL2/src/SOIL2/*.c \
../thirdparty/stb_vorbis/*.c \
../thirdparty/zlib/*.c \
../thirdparty/libzip/*.c \
../thirdparty/jpeg-compressor/*.cpp \
../thirdparty/imageresampler/*.cpp \
../thirdparty/pugixml/*.cpp \
system/*.cpp \
system/platform/posix/*.cpp \
network/*.cpp \
@@ -84,7 +85,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** CHIPMUNK ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(THIRD_PARTY_PATH)
LOCAL_MODULE := chipmunk
@@ -96,8 +97,8 @@ LOCAL_CFLAGS := \
-Wno-unknown-pragmas
CHIPMUNK_SRCS := \
helper/chipmunk/*.c \
helper/chipmunk/constraints/*.c
chipmunk/*.c \
chipmunk/constraints/*.c
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
@@ -109,7 +110,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** FREETYPE ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)/helper/freetype2
LOCAL_PATH := $(THIRD_PARTY_PATH)/freetype2
LOCAL_MODULE := freetype
@@ -126,7 +127,7 @@ include $(BUILD_STATIC_LIBRARY)
#*************** OPENAL *****************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)/helper/openal-soft
LOCAL_PATH := $(THIRD_PARTY_PATH)/openal-soft
LOCAL_MODULE := openal
@@ -159,7 +160,7 @@ include $(BUILD_SHARED_LIBRARY)
#**************** SDL 2 ***************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_SDL_PATH)
LOCAL_PATH := $(SDL_PATH)
LOCAL_MODULE := SDL2
@@ -205,7 +206,7 @@ include $(BUILD_STATIC_LIBRARY)
#************* empty_window *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := empty_window
@@ -216,8 +217,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../examples/empty_window/*.cpp
$(SDL_MAIN_PATH) \
examples/empty_window/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
@@ -229,7 +230,7 @@ include $(BUILD_SHARED_LIBRARY)
#************* external_shader *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := external_shader
@@ -240,8 +241,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../examples/external_shader/*.cpp
$(SDL_MAIN_PATH) \
examples/external_shader/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
@@ -253,7 +254,7 @@ include $(BUILD_SHARED_LIBRARY)
#************* full_test *************
include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_PATH := $(BASE_PATH)
LOCAL_MODULE := main
@@ -264,8 +265,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS)
LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
CORE_SRCS := \
$(MY_SDL_MAIN_PATH) \
../test/*.cpp
$(SDL_MAIN_PATH) \
test/*.cpp
LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))

2
projects/linux/ee.creator.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.3.1, 2017-08-10T00:48:42. -->
<!-- Written by QtCreator 4.4.0, 2017-12-30T14:09:54. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

51
projects/linux/ee.files
View File

@@ -587,17 +587,6 @@
../../src/eepp/graphics/renderer/shaders/basegl3.vert
../../src/eepp/graphics/renderer/shaders/basegl3.frag
../../src/examples/external_shader/external_shader.cpp
../../src/eepp/helper/haikuttf/sophist.h
../../src/eepp/helper/haikuttf/hkmutex.hpp
../../src/eepp/helper/haikuttf/hkglyph.hpp
../../src/eepp/helper/haikuttf/hkfontmanager.hpp
../../src/eepp/helper/haikuttf/hkfont.hpp
../../src/eepp/helper/haikuttf/hkbase.hpp
../../src/eepp/helper/haikuttf/haikuttf.hpp
../../src/eepp/helper/haikuttf/hkmutex.cpp
../../src/eepp/helper/haikuttf/hkglyph.cpp
../../src/eepp/helper/haikuttf/hkfontmanager.cpp
../../src/eepp/helper/haikuttf/hkfont.cpp
../../include/eepp/window.hpp
../../include/eepp/ui.hpp
../../include/eepp/system.hpp
@@ -649,26 +638,26 @@
../../include/eepp/core/noncopyable.hpp
../../include/eepp/system/clock.hpp
../../src/eepp/system/lock.cpp
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.h
../../src/eepp/helper/SOIL2/src/SOIL2/pvr_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/pkm_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.h
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.h
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.c
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.c
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.c
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.c
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image_write.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image.h
../../src/thirdparty/SOIL2/src/SOIL2/pvr_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/pkm_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.h
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.h
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.c
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.c
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.c
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.c
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext.h
../../src/eepp/audio/soundfile.hpp
../../src/eepp/audio/openal.hpp
../../src/eepp/window/backend/SDL2/backendsdl2.cpp

207
projects/linux/ee.includes
View File

@@ -1,207 +1,4 @@
../../src/
../../include/
../../include/eepp/graphics
../../src/eepp/graphics
../../include/eepp/ui
../../src/eepp/ui
../../src/eepp/helper/freetype2/include/
../../include/eepp/system
../../src/eepp/system
../../src/eepp/graphics/renderer
../../include/eepp/graphics/renderer
../../include/eepp/network
../../include/eepp/physics
../../include/eepp/maps
../../include/eepp/ui/tools
../../include/eepp/helper/PlusCallback
../../include/eepp/maps/mapeditor
../../include/eepp/math
../../include/eepp/physics/constraints
../../include/eepp/audio
../../include/eepp/network/ssl
../../include/eepp/core
../../include/eepp/window
../../include/eepp
../../include/eepp/helper/chipmunk/constraints
../../include/eepp/helper/chipmunk
../../src/eepp/helper/SDL2/src/audio/xaudio2
../../src/eepp/helper/SDL2/src/main/windows
../../src/eepp/helper/freetype2/include/freetype/internal/services
../../src/eepp/helper/SDL2/src/audio
../../src/eepp/helper/SDL2/src/timer
../../src/eepp/helper/SDL2/src/timer/psp
../../src/eepp/core
../../src/eepp/system/platform/win
../../src/eepp/helper/SDL2/src/thread/stdcpp
../../src/eepp/helper/glm/gtx
../../src/eepp/helper/SDL2/src/haptic/windows
../../src/eepp/helper/SDL2/src/joystick/bsd
../../src/eepp/window/backend/SDL2
../../src/eepp/helper/SDL2/src/thread/pthread
../../src/eepp/helper/SDL2/src/loadso/haiku
../../src/eepp/window/platform/null
../../src/eepp/helper/SDL2/src/core/android
../../src/eepp/helper/freetype2/src/bdf
../../src/eepp/helper/SDL2/src/libm
../../src/eepp/helper/SDL2/src/audio/bsd
../../src/eepp/window/platform/win
../../src/eepp/helper/SDL2/src/video/uikit
../../src/eepp/system/platform/posix
../../src/eepp/helper/SDL2/src/dynapi
../../src/eepp/helper/SDL2/src/thread/windows
../../src/eepp/maps/mapeditor
../../src/eepp/helper/freetype2/src/smooth
../../src/eepp/helper/SDL2/src/power/linux
../../src/eepp/helper/SDL2/src/main/winrt
../../src/eepp/helper/SDL2/src/audio/android
../../src/eepp/helper/SDL2/src/audio/arts
../../src/eepp/audio
../../src/eepp/helper/SDL2/src/thread/psp
../../src/eepp/helper/freetype2/src/pfr
../../src/eepp/helper/SDL2/src/test
../../src/eepp/helper/SDL2/src/events
../../src/eepp/helper/freetype2/src/pshinter
../../src/eepp/helper/SDL2/src/timer/unix
../../src/eepp/helper/SDL2/src/timer/windows
../../src/eepp/helper/freetype2/src/lzw
../../src/eepp/helper/SDL2/src/haptic/darwin
../../src/eepp/helper/SDL2/src/video/dummy
../../src/eepp/helper/SDL2/src/audio/dsp
../../src/eepp/helper/SDL2/src/main/dummy
../../src/eepp/helper/SDL2/src/video
../../src/eepp/helper/freetype2/src/truetype
../../src/eepp/helper/SOIL2/src/test
../../src/eepp/helper/freetype2/src/cache
../../src/eepp/helper/SDL2/src/render/direct3d
../../src/eepp/helper/SDL2/src/power/haiku
../../src/eepp/network/platform
../../src/eepp/helper/freetype2/src/raster
../../src/eepp/helper/SDL2/src/audio/nas
../../src/eepp/helper/SDL2/src/audio/dummy
../../src/eepp/helper/SDL2/src/haptic/dummy
../../src/eepp/helper/SDL2/src/joystick/darwin
../../src/eepp/helper/SDL2/src/power/uikit
../../src/eepp/helper/SDL2/src/audio/sun
../../src/eepp/helper/SDL2/src/video/x11
../../src/eepp/helper/freetype2/src/cid
../../src/eepp/helper/openal-soft/Alc/backends
../../src/eepp/helper/openal-soft
../../src/eepp/helper/SDL2/src/video/winrt
../../src/eepp/helper/SDL2/src/joystick/linux
../../src/eepp/helper/SOIL2/src/SOIL2
../../src/eepp/helper/freetype2/include/freetype
../../src/eepp/helper/SDL2/src/joystick/psp
../../src/eepp/helper/freetype2/src/otvalid
../../src/eepp/helper/glm/core
../../src/eepp/helper/SDL2/src/video/psp
../../src/eepp/helper/SOIL2/src/common
../../src/eepp/helper/SDL2/src/timer/dummy
../../src/eepp/helper/SOIL2/src/perf_test
../../src/eepp/physics
../../src/eepp/helper/SDL2/src/render/opengl
../../src/eepp/helper/SDL2/src/core/linux
../../src/eepp/helper/SDL2/src/audio/paudio
../../src/eepp/helper/SDL2/src/video/windows
../../src/eepp/helper/SDL2/src/loadso/dummy
../../src/eepp/helper/SDL2/src/main/haiku
../../src/eepp/network
../../src/eepp/ui/tools
../../src/eepp/helper/SDL2/src/audio/winmm
../../src/eepp/math
../../src/eepp/helper/freetype2/src/type42
../../src/eepp/helper/SDL2/src/video/wayland
../../src/eepp/helper/SDL2/src/render/psp
../../src/eepp/helper/freetype2/src/cff
../../src/eepp/helper/SDL2/src/audio/disk
../../src/eepp/helper/SDL2/src/render/opengles
../../src/eepp/helper/SDL2/src/filesystem/haiku
../../src/eepp/window/platform/x11
../../src/eepp/helper/SDL2/src/loadso/windows
../../src/eepp/helper/SDL2/src/joystick
../../src/eepp/helper/freetype2/include/freetype/internal
../../src/eepp/helper/SDL2/src/atomic
../../src/eepp/helper/SDL2/src/video/pandora
../../src/eepp/helper/freetype2/include/freetype/config
../../src/eepp/helper/glm/gtc
../../src/eepp/window/platform
../../src/eepp/helper/SDL2/src/power/android
../../src/eepp/window
../../src/eepp/helper/SDL2/src/thread/generic
../../src/eepp/helper/SDL2/src/file
../../src/eepp/helper/freetype2/src/psaux
../../src/eepp/helper/SDL2/src/core/winrt
../../src/eepp/helper/SDL2/src/audio/coreaudio
../../src/eepp/helper/SDL2/src/audio/fusionsound
../../src/eepp/helper/freetype2/src/gxvalid
../../src/eepp/network/platform/win
../../src/eepp/helper/SDL2/src/render/software
../../src/eepp/helper/SDL2/src/file/cocoa
../../src/eepp/helper/SDL2/src/video/raspberry
../../src/eepp/system/platform
../../src/eepp/window/platform/osx
../../src/eepp/network/ssl
../../src/eepp/helper/freetype2/src/gzip
../../src/eepp/helper/SDL2/src/filesystem/winrt
../../src/eepp/helper/SDL2/src/joystick/winrt
../../src/eepp/helper/SDL2/src/filesystem/dummy
../../src/eepp/helper/SDL2/src/render
../../src/eepp/helper/freetype2/src/pcf
../../src/eepp/helper/SDL2/src/main/psp
../../src/eepp/helper/SDL2/src/haptic
../../src/eepp/helper/SDL2/src/video/mir
../../src/eepp/helper/openal-soft/Alc
../../src/eepp/helper/SDL2/src/timer/haiku
../../src/eepp/helper/SDL2/src/power/windows
../../src/eepp/helper/SDL2/src/filesystem/windows
../../src/eepp/helper/SDL2/src/cpuinfo
../../src/eepp/helper/SDL2/src/video/android
../../src/eepp/helper/SDL2/src/render/opengles2
../../src/eepp/helper/SDL2/src/joystick/android
../../src/eepp/maps
../../src/eepp/helper/openal-soft/include/AL
../../src/eepp/helper/freetype2/src/winfonts
../../src/eepp/helper/SDL2/src/power
../../src/eepp/helper/SDL2/src
../../src/eepp/helper/SDL2/src/power/macosx
../../src/eepp/helper/SDL2/src/core/windows
../../src/eepp/helper/SDL2/src/joystick/iphoneos
../../src/eepp/helper/SDL2/src/stdlib
../../src/eepp/helper/SDL2/src/loadso/dlopen
../../src/eepp/helper/SDL2/src/main/android
../../src/eepp/helper/SDL2/src/thread
../../src/eepp/helper/SDL2/src/video/directfb
../../src/eepp/helper/SDL2/src/audio/qsa
../../src/eepp/helper/glm
../../src/eepp/helper/SDL2/src/joystick/dummy
../../src/eepp/window/backend/SFML
../../src/eepp/helper/freetype2/src/type1
../../src/eepp/helper/freetype2/src/sfnt
../../src/eepp/main
../../src/eepp/helper/freetype2/src/psnames
../../src/eepp/helper/openal-soft/OpenAL32
../../src/eepp/graphics/renderer/shaders
../../src/eepp/helper/SDL2/src/audio/psp
../../src/eepp/helper/SDL2/src/joystick/haiku
../../src/eepp/helper/SDL2/src/audio/directsound
../../src/eepp/helper/SDL2/src/audio/pulseaudio
../../src/eepp/helper/freetype2/src/autofit
../../src/eepp/helper/openal-soft/OpenAL32/Include
../../src/eepp/network/ssl/backend/openssl
../../src/eepp/helper/freetype2/src/base
../../src/eepp/helper/freetype2/src/bzip2
../../src/eepp/helper/SDL2/src/audio/haiku
../../src/eepp/helper/SDL2/src/power/psp
../../src/eepp/helper/SDL2/src/joystick/windows
../../src/eepp/helper/SDL2/src/audio/sndio
../../src/eepp/helper/SDL2/src/audio/esd
../../src/eepp/helper/SDL2/include
../../src/eepp/helper/SDL2/src/haptic/linux
../../src/eepp/window/backend/null
../../src/eepp/helper/SDL2/src/audio/alsa
../../src/eepp/helper/SDL2/src/render/direct3d11
../../src/eepp/helper/SDL2/src/video/haiku
../../src/eepp/network/platform/unix
../../src/eepp/helper/SDL2/src/power/winrt
../../src/eepp/helper/SDL2/src/filesystem/unix
../../src/eepp/physics/constraints
../../src/eepp/helper/SDL2/src/video/cocoa
../../src/thirdparty
../../include/eepp/thirdparty

1
projects/osx/ee.config
View File

@@ -3,7 +3,6 @@
#define EE_DEBUG
#define EE_LIBSNDFILE_ENABLED
#define EE_MEMORY_MANAGER
#define EE_GL3_ENABLED 1
#define EE_SHADERS_SUPPORTED
#define EE_GLEW_AVAILABLE
#define EE_SSL_SUPPORT

84
projects/osx/ee.files
View File

@@ -1,13 +1,18 @@
../../include/eepp/graphics/arcdrawable.hpp
../../include/eepp/graphics/circledrawable.hpp
../../include/eepp/graphics/convexshapedrawable.hpp
../../include/eepp/graphics/drawable.hpp
../../include/eepp/graphics/drawablegroup.hpp
../../include/eepp/graphics/drawableresource.hpp
../../include/eepp/graphics/drawablesearcher.hpp
../../include/eepp/graphics/font.hpp
../../include/eepp/graphics/fontstyleconfig.hpp
../../include/eepp/graphics/fonttruetype.hpp
../../include/eepp/graphics/fonttruetypeloader.hpp
../../include/eepp/graphics/graphicshelper.hpp
../../include/eepp/graphics/ninepatch.hpp
../../include/eepp/graphics/ninepatchmanager.hpp
../../include/eepp/graphics/primitivedrawable.hpp
../../include/eepp/graphics/primitivetype.hpp
../../include/eepp/graphics/rectangledrawable.hpp
../../include/eepp/graphics/renderer/base.hpp
../../include/eepp/graphics/renderer/clippingmask.hpp
@@ -19,6 +24,7 @@
../../include/eepp/graphics/renderer/renderergl3cp.hpp
../../include/eepp/graphics/renderer/renderergles2.hpp
../../include/eepp/graphics/renderer/rendererhelper.hpp
../../include/eepp/graphics/rendermode.hpp
../../include/eepp/graphics/text.hpp
../../include/eepp/graphics/vertexbufferhelper.hpp
../../include/eepp/math/interpolation1d.hpp
@@ -26,17 +32,28 @@
../../include/eepp/system/color.hpp
../../include/eepp/system/translator.hpp
../../include/eepp/ui/uidragablecontrol.hpp
../../include/eepp/ui/uieventmouse.hpp
../../include/eepp/ui/uigridlayout.hpp
../../include/eepp/ui/uiimage.hpp
../../include/eepp/ui/uilayout.hpp
../../include/eepp/ui/uilinearlayout.hpp
../../include/eepp/ui/uimenuseparator.hpp
../../include/eepp/ui/uirelativelayout.hpp
../../include/eepp/ui/uiscrollview.hpp
../../include/eepp/ui/uisubtexture.hpp
../../include/eepp/ui/uitable.hpp
../../include/eepp/ui/uitablecell.hpp
../../include/eepp/ui/uitextview.hpp
../../include/eepp/ui/uithemeconfig.hpp
../../include/eepp/ui/uithemedefault.hpp
../../include/eepp/ui/uitouchdragablewidget.hpp
../../include/eepp/ui/uiwidget.hpp
../../include/eepp/ui/uiwidgetcreator.hpp
../../src/eepp/graphics/convexshapedrawable.cpp
../../src/eepp/graphics/drawablegroup.cpp
../../src/eepp/graphics/drawableresource.cpp
../../src/eepp/graphics/ninepatch.cpp
../../src/eepp/graphics/ninepatchmanager.cpp
../../src/eepp/maps/mapobjectlayer.cpp
../../src/eepp/graphics/arcdrawable.cpp
../../src/eepp/graphics/circledrawable.cpp
@@ -65,19 +82,21 @@
../../src/eepp/system/color.cpp
../../src/eepp/system/translator.cpp
../../src/eepp/ui/uidragablecontrol.cpp
../../src/eepp/ui/uihelper.cpp
../../src/eepp/ui/uigridlayout.cpp
../../src/eepp/ui/uiimage.cpp
../../src/eepp/ui/uilayout.cpp
../../src/eepp/ui/uilinearlayout.cpp
../../src/eepp/ui/uiloader.cpp
../../src/eepp/ui/uimenuseparator.cpp
../../src/eepp/ui/uirelativelayout.cpp
../../src/eepp/ui/uiscrollview.cpp
../../src/eepp/ui/uisubtexture.cpp
../../src/eepp/ui/uitable.cpp
../../src/eepp/ui/uitablecell.cpp
../../src/eepp/ui/uitextview.cpp
../../src/eepp/ui/uithemedefault.cpp
../../src/eepp/ui/uitouchdragablewidget.cpp
../../src/eepp/ui/uiwidget.cpp
../../../eeiv/src/capp.cpp
../../include/eepp/audio/soundmanager.hpp
../../include/eepp/audio/soundloader.hpp
../../include/eepp/audio/soundstream.hpp
@@ -334,6 +353,7 @@
../../src/eepp/ui/tools/textureatlassubtextureeditor.hpp
../../src/eepp/ui/tools/textureatlasnew.hpp
../../include/eepp/ui/tools/textureatlaseditor.hpp
../../src/eepp/ui/uiwidgetcreator.cpp
../../src/eepp/ui/uiwinmenu.cpp
../../src/eepp/ui/uiwindow.cpp
../../src/eepp/ui/uitooltip.cpp
@@ -416,7 +436,12 @@
../../include/eepp/window/cursor.hpp
../../include/eepp/window/clipboard.hpp
../../include/eepp/window/base.hpp
../../src/eepp/window/backend/SDL2/platformhelpersdl2.cpp
../../src/eepp/window/backend/SDL2/platformhelpersdl2.hpp
../../src/eepp/window/backend/SFML/platformhelpersfml.cpp
../../src/eepp/window/backend/SFML/platformhelpersfml.hpp
../../src/eepp/window/inputhelper.cpp
../../src/eepp/window/platformhelper.hpp
../../src/eepp/window/window.cpp
../../src/eepp/window/view.cpp
../../src/eepp/window/platformimpl.cpp
@@ -483,7 +508,6 @@
../../src/eepp/window/backend/null/cursornull.hpp
../../src/eepp/window/backend/null/cursormanagernull.hpp
../../src/eepp/window/backend/null/clipboardnull.hpp
../../src/eepp/window/backend/null/backendnull.hpp
../../src/eepp/window/backend/null/windownull.cpp
../../src/eepp/window/backend/null/joysticknull.cpp
../../src/eepp/window/backend/null/joystickmanagernull.cpp
@@ -563,17 +587,6 @@
../../src/eepp/graphics/renderer/shaders/basegl3.vert
../../src/eepp/graphics/renderer/shaders/basegl3.frag
../../src/examples/external_shader/external_shader.cpp
../../src/eepp/helper/haikuttf/sophist.h
../../src/eepp/helper/haikuttf/hkmutex.hpp
../../src/eepp/helper/haikuttf/hkglyph.hpp
../../src/eepp/helper/haikuttf/hkfontmanager.hpp
../../src/eepp/helper/haikuttf/hkfont.hpp
../../src/eepp/helper/haikuttf/hkbase.hpp
../../src/eepp/helper/haikuttf/haikuttf.hpp
../../src/eepp/helper/haikuttf/hkmutex.cpp
../../src/eepp/helper/haikuttf/hkglyph.cpp
../../src/eepp/helper/haikuttf/hkfontmanager.cpp
../../src/eepp/helper/haikuttf/hkfont.cpp
../../include/eepp/window.hpp
../../include/eepp/ui.hpp
../../include/eepp/system.hpp
@@ -625,26 +638,26 @@
../../include/eepp/core/noncopyable.hpp
../../include/eepp/system/clock.hpp
../../src/eepp/system/lock.cpp
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.h
../../src/eepp/helper/SOIL2/src/SOIL2/pvr_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/pkm_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.h
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.h
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.c
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.c
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.c
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.c
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image_write.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image.h
../../src/thirdparty/SOIL2/src/SOIL2/pvr_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/pkm_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.h
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.h
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.c
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.c
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.c
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.c
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext.h
../../src/eepp/audio/soundfile.hpp
../../src/eepp/audio/openal.hpp
../../src/eepp/window/backend/SDL2/backendsdl2.cpp
@@ -733,4 +746,3 @@
../../include/eepp/system/md5.hpp
../../src/eepp/system/md5.cpp
../../src/examples/strobe/strobe.cpp
../../../eeiv/src/capp.hpp

14
projects/osx/ee.includes
View File

@@ -1,14 +1,4 @@
../../src/
../../include/
../../src/examples/strobe
../../../eeiv/src
.
../../include/eepp/graphics
../../src/eepp/graphics
../../include/eepp/ui
../../src/eepp/ui
../../src/eepp/helper/freetype2/include/
../../include/eepp/system
../../src/eepp/system
../../src/eepp/graphics/renderer
../../include/eepp/graphics/renderer
../../src/thirdparty
../../include/eepp/thirdparty

1
projects/windows/ee.config
View File

@@ -3,7 +3,6 @@
#define EE_DEBUG
#define EE_LIBSNDFILE_ENABLED
#define EE_MEMORY_MANAGER
#define EE_GL3_ENABLED 1
#define EE_SHADERS_SUPPORTED
#define EE_GLEW_AVAILABLE
#define EE_SSL_SUPPORT

81
projects/windows/ee.files
View File

@@ -1,13 +1,18 @@
../../include/eepp/graphics/arcdrawable.hpp
../../include/eepp/graphics/circledrawable.hpp
../../include/eepp/graphics/convexshapedrawable.hpp
../../include/eepp/graphics/drawable.hpp
../../include/eepp/graphics/drawablegroup.hpp
../../include/eepp/graphics/drawableresource.hpp
../../include/eepp/graphics/drawablesearcher.hpp
../../include/eepp/graphics/font.hpp
../../include/eepp/graphics/fontstyleconfig.hpp
../../include/eepp/graphics/fonttruetype.hpp
../../include/eepp/graphics/fonttruetypeloader.hpp
../../include/eepp/graphics/graphicshelper.hpp
../../include/eepp/graphics/ninepatch.hpp
../../include/eepp/graphics/ninepatchmanager.hpp
../../include/eepp/graphics/primitivedrawable.hpp
../../include/eepp/graphics/primitivetype.hpp
../../include/eepp/graphics/rectangledrawable.hpp
../../include/eepp/graphics/renderer/base.hpp
../../include/eepp/graphics/renderer/clippingmask.hpp
@@ -19,6 +24,7 @@
../../include/eepp/graphics/renderer/renderergl3cp.hpp
../../include/eepp/graphics/renderer/renderergles2.hpp
../../include/eepp/graphics/renderer/rendererhelper.hpp
../../include/eepp/graphics/rendermode.hpp
../../include/eepp/graphics/text.hpp
../../include/eepp/graphics/vertexbufferhelper.hpp
../../include/eepp/math/interpolation1d.hpp
@@ -26,18 +32,28 @@
../../include/eepp/system/color.hpp
../../include/eepp/system/translator.hpp
../../include/eepp/ui/uidragablecontrol.hpp
../../include/eepp/ui/uieventmouse.hpp
../../include/eepp/ui/uigridlayout.hpp
../../include/eepp/ui/uiimage.hpp
../../include/eepp/ui/uilayout.hpp
../../include/eepp/ui/uilinearlayout.hpp
../../include/eepp/ui/uimenuseparator.hpp
../../include/eepp/ui/uirelativelayout.hpp
../../include/eepp/ui/uiscrollview.hpp
../../include/eepp/ui/uisubtexture.hpp
../../include/eepp/ui/uitable.hpp
../../include/eepp/ui/uitablecell.hpp
../../include/eepp/ui/uitextview.hpp
../../include/eepp/ui/uithemeconfig.hpp
../../include/eepp/ui/uithemedefault.hpp
../../include/eepp/ui/uitouchdragablewidget.hpp
../../include/eepp/ui/uiwidget.hpp
../../include/eepp/ui/uiwidgetcreator.hpp
../../src/eepp/graphics/convexshapedrawable.cpp
../../src/eepp/graphics/drawablegroup.cpp
../../src/eepp/graphics/drawableresource.cpp
../../src/eepp/graphics/ninepatch.cpp
../../src/eepp/graphics/ninepatchmanager.cpp
../../src/eepp/maps/mapobjectlayer.cpp
../../src/eepp/graphics/arcdrawable.cpp
../../src/eepp/graphics/circledrawable.cpp
@@ -66,18 +82,21 @@
../../src/eepp/system/color.cpp
../../src/eepp/system/translator.cpp
../../src/eepp/ui/uidragablecontrol.cpp
../../src/eepp/ui/uigridlayout.cpp
../../src/eepp/ui/uiimage.cpp
../../src/eepp/ui/uilayout.cpp
../../src/eepp/ui/uilinearlayout.cpp
../../src/eepp/ui/uiloader.cpp
../../src/eepp/ui/uimenuseparator.cpp
../../src/eepp/ui/uirelativelayout.cpp
../../src/eepp/ui/uiscrollview.cpp
../../src/eepp/ui/uisubtexture.cpp
../../src/eepp/ui/uitable.cpp
../../src/eepp/ui/uitablecell.cpp
../../src/eepp/ui/uitextview.cpp
../../src/eepp/ui/uithemedefault.cpp
../../src/eepp/ui/uitouchdragablewidget.cpp
../../src/eepp/ui/uiwidget.cpp
../../../eeiv/src/capp.cpp
../../include/eepp/audio/soundmanager.hpp
../../include/eepp/audio/soundloader.hpp
../../include/eepp/audio/soundstream.hpp
@@ -417,7 +436,12 @@
../../include/eepp/window/cursor.hpp
../../include/eepp/window/clipboard.hpp
../../include/eepp/window/base.hpp
../../src/eepp/window/backend/SDL2/platformhelpersdl2.cpp
../../src/eepp/window/backend/SDL2/platformhelpersdl2.hpp
../../src/eepp/window/backend/SFML/platformhelpersfml.cpp
../../src/eepp/window/backend/SFML/platformhelpersfml.hpp
../../src/eepp/window/inputhelper.cpp
../../src/eepp/window/platformhelper.hpp
../../src/eepp/window/window.cpp
../../src/eepp/window/view.cpp
../../src/eepp/window/platformimpl.cpp
@@ -484,7 +508,6 @@
../../src/eepp/window/backend/null/cursornull.hpp
../../src/eepp/window/backend/null/cursormanagernull.hpp
../../src/eepp/window/backend/null/clipboardnull.hpp
../../src/eepp/window/backend/null/backendnull.hpp
../../src/eepp/window/backend/null/windownull.cpp
../../src/eepp/window/backend/null/joysticknull.cpp
../../src/eepp/window/backend/null/joystickmanagernull.cpp
@@ -564,17 +587,6 @@
../../src/eepp/graphics/renderer/shaders/basegl3.vert
../../src/eepp/graphics/renderer/shaders/basegl3.frag
../../src/examples/external_shader/external_shader.cpp
../../src/eepp/helper/haikuttf/sophist.h
../../src/eepp/helper/haikuttf/hkmutex.hpp
../../src/eepp/helper/haikuttf/hkglyph.hpp
../../src/eepp/helper/haikuttf/hkfontmanager.hpp
../../src/eepp/helper/haikuttf/hkfont.hpp
../../src/eepp/helper/haikuttf/hkbase.hpp
../../src/eepp/helper/haikuttf/haikuttf.hpp
../../src/eepp/helper/haikuttf/hkmutex.cpp
../../src/eepp/helper/haikuttf/hkglyph.cpp
../../src/eepp/helper/haikuttf/hkfontmanager.cpp
../../src/eepp/helper/haikuttf/hkfont.cpp
../../include/eepp/window.hpp
../../include/eepp/ui.hpp
../../include/eepp/system.hpp
@@ -626,26 +638,26 @@
../../include/eepp/core/noncopyable.hpp
../../include/eepp/system/clock.hpp
../../src/eepp/system/lock.cpp
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.h
../../src/eepp/helper/SOIL2/src/SOIL2/pvr_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/pkm_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.h
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.h
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.c
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.c
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.c
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.c
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_DDS.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image_write.h
../../src/thirdparty/SOIL2/src/SOIL2/stb_image.h
../../src/thirdparty/SOIL2/src/SOIL2/pvr_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/pkm_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.h
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.h
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.h
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.h
../../src/thirdparty/SOIL2/src/SOIL2/image_helper.c
../../src/thirdparty/SOIL2/src/SOIL2/image_DXT.c
../../src/thirdparty/SOIL2/src/SOIL2/etc1_utils.c
../../src/thirdparty/SOIL2/src/SOIL2/SOIL2.c
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/thirdparty/SOIL2/src/SOIL2/stbi_ext.h
../../src/eepp/audio/soundfile.hpp
../../src/eepp/audio/openal.hpp
../../src/eepp/window/backend/SDL2/backendsdl2.cpp
@@ -734,4 +746,3 @@
../../include/eepp/system/md5.hpp
../../src/eepp/system/md5.cpp
../../src/examples/strobe/strobe.cpp
../../../eeiv/src/capp.hpp

14
projects/windows/ee.includes
View File

@@ -1,14 +1,4 @@
../../src/
../../include/
../../src/examples/strobe
../../../eeiv/src
.
../../include/eepp/graphics
../../src/eepp/graphics
../../include/eepp/ui
../../src/eepp/ui
../../src/eepp/helper/freetype2/include/
../../include/eepp/system
../../src/eepp/system
../../src/eepp/graphics/renderer
../../include/eepp/graphics/renderer
../../src/thirdparty
../../include/eepp/thirdparty

2
src/eepp/audio/soundfileogg.cpp
View File

@@ -1,5 +1,5 @@
#include <eepp/audio/soundfileogg.hpp>
#include <eepp/helper/stb_vorbis/stb_vorbis.h>
#include <stb_vorbis/stb_vorbis.h>
namespace EE { namespace Audio {

10
src/eepp/graphics/image.cpp
View File

@@ -3,11 +3,11 @@
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/image_helper.h>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <eepp/helper/jpeg-compressor/jpge.h>
#include <eepp/helper/imageresampler/resampler.h>
#include <SOIL2/src/SOIL2/image_helper.h>
#include <SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#include <jpeg-compressor/jpge.h>
#include <imageresampler/resampler.h>
#include <algorithm>
namespace EE { namespace Graphics {

2
src/eepp/graphics/renderer/openglext.hpp
View File

@@ -8,7 +8,7 @@
#ifdef EE_GLEW_AVAILABLE
#define GLEW_STATIC
#define GLEW_NO_GLU
#include <eepp/helper/glew/glew.h>
#include <glew/glew.h>
#else
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES

2
src/eepp/graphics/renderer/renderer.cpp
View File

@@ -4,7 +4,7 @@
#include <eepp/graphics/renderer/renderergl3.hpp>
#include <eepp/graphics/renderer/renderergl3cp.hpp>
#include <eepp/graphics/renderer/renderergles2.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
namespace EE { namespace Graphics {

2
src/eepp/graphics/renderer/rendererstackhelper.hpp
View File

@@ -6,7 +6,7 @@
#ifdef EE_GL3_ENABLED
#include <stack>
#include <eepp/helper/glm/gtx/transform.hpp>
#include <glm/gtx/transform.hpp>
namespace EE { namespace Graphics { namespace Private {

4
src/eepp/graphics/subtexture.cpp
View File

@@ -1,8 +1,8 @@
#include <eepp/graphics/subtexture.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <eepp/helper/jpeg-compressor/jpge.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#include <jpeg-compressor/jpge.h>
#include <eepp/graphics/texturesaver.hpp>
#include <eepp/graphics/renderer/opengl.hpp>
using namespace EE::Graphics::Private;

2
src/eepp/graphics/texture.cpp
View File

@@ -1,7 +1,7 @@
#include <eepp/graphics/texture.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#include <eepp/graphics/renderer/openglext.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/math/polygon2.hpp>

2
src/eepp/graphics/textureatlasloader.cpp
View File

@@ -6,7 +6,7 @@
#include <eepp/system/iostreamfile.hpp>
#include <eepp/system/iostreammemory.hpp>
#include <eepp/graphics/packerhelper.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/stb_image.h>
namespace EE { namespace Graphics {

6
src/eepp/graphics/texturefactory.cpp
View File

@@ -3,9 +3,9 @@
#include <eepp/graphics/renderer/openglext.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/texture.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <eepp/helper/jpeg-compressor/jpge.h>
#include <SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#include <jpeg-compressor/jpge.h>
namespace EE { namespace Graphics {

6
src/eepp/graphics/textureloader.cpp
View File

@@ -5,9 +5,9 @@
#include <eepp/graphics/renderer/opengl.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/system/iostreamfile.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <eepp/helper/jpeg-compressor/jpgd.h>
#include <SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#include <jpeg-compressor/jpgd.h>
using namespace EE::Window;
#define TEX_LT_PATH (1)

2
src/eepp/graphics/texturepacker.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/system/iostreamfile.hpp>
#include <eepp/graphics/texturepackernode.hpp>
#include <eepp/graphics/texturepackertex.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/stb_image.h>
#include <algorithm>
namespace EE { namespace Graphics {

2
src/eepp/graphics/texturepackertex.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/graphics/texturepackertex.hpp>
#include <eepp/graphics/image.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/stb_image.h>
namespace EE { namespace Graphics { namespace Private {

2
src/eepp/physics/shapecircle.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/physics/shapecircle.hpp>
#include <eepp/physics/space.hpp>
#include <eepp/helper/chipmunk/chipmunk_unsafe.h>
#include <chipmunk/chipmunk_unsafe.h>
#ifdef PHYSICS_RENDERER_ENABLED
#include <eepp/graphics/renderer/renderer.hpp>

2
src/eepp/physics/shapepoint.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/physics/shapepoint.hpp>
#include <eepp/physics/space.hpp>
#include <eepp/helper/chipmunk/chipmunk_unsafe.h>
#include <chipmunk/chipmunk_unsafe.h>
#ifdef PHYSICS_RENDERER_ENABLED
#include <eepp/graphics/primitives.hpp>

2
src/eepp/physics/shapepoly.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/physics/shapepoly.hpp>
#include <eepp/physics/space.hpp>
#include <eepp/helper/chipmunk/chipmunk_unsafe.h>
#include <chipmunk/chipmunk_unsafe.h>
#ifdef PHYSICS_RENDERER_ENABLED
#include <eepp/graphics/globalbatchrenderer.hpp>

2
src/eepp/physics/shapesegment.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/physics/shapesegment.hpp>
#include <eepp/physics/space.hpp>
#include <eepp/helper/chipmunk/chipmunk_unsafe.h>
#include <chipmunk/chipmunk_unsafe.h>
#ifdef PHYSICS_RENDERER_ENABLED
#include <eepp/graphics/renderer/opengl.hpp>

2
src/eepp/system/translator.cpp
View File

@@ -6,7 +6,7 @@
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/iostream.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace System {

4
src/eepp/system/zip.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/system/zip.hpp>
#include <eepp/helper/libzip/zip.h>
#include <eepp/helper/libzip/zipint.h>
#include <libzip/zip.h>
#include <libzip/zipint.h>
#include <eepp/system/filesystem.hpp>
namespace EE { namespace System {

2
src/eepp/ui/tools/textureatlasnew.cpp
View File

@@ -3,7 +3,7 @@
#include <eepp/ui/uimessagebox.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/stb_image.h>
namespace EE { namespace UI { namespace Tools {

2
src/eepp/ui/uicheckbox.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uidropdownlist.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uidropdownlist.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uigridlayout.cpp
View File

@@ -1,5 +1,5 @@
#include <eepp/ui/uigridlayout.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uiimage.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/graphics/drawable.hpp>
#include <eepp/graphics/sprite.hpp>
#include <eepp/graphics/drawablesearcher.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uilinearlayout.cpp
View File

@@ -1,5 +1,5 @@
#include <eepp/ui/uilinearlayout.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uilistbox.cpp
View File

@@ -3,7 +3,7 @@
#include <eepp/ui/uilistboxitem.hpp>
#include <eepp/ui/uiitemcontainer.hpp>
#include <eepp/graphics/font.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/fontmanager.hpp>
#include <eepp/graphics/text.hpp>

2
src/eepp/ui/uiloader.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uiloader.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uimanager.cpp
View File

@@ -4,7 +4,7 @@
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/framebuffer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/ui/uiwidgetcreator.hpp>
#include <algorithm>

2
src/eepp/ui/uimenu.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/font.hpp>
#include <eepp/graphics/drawablesearcher.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/ui/uipopupmenu.hpp>
#include <eepp/ui/uimanager.hpp>

2
src/eepp/ui/uiprogressbar.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uiprogressbar.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/globaltextureatlas.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uipushbutton.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uipushbutton.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/globaltextureatlas.hpp>
#include <eepp/ui/uimanager.hpp>

2
src/eepp/ui/uiradiobutton.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uiscrollview.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uiscrollview.hpp>
#include <eepp/ui/uiscrollbar.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uiselectbutton.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uiselectbutton.hpp>
#include <eepp/ui/uiwinmenu.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uislider.cpp
View File

@@ -1,7 +1,7 @@
#include <eepp/ui/uislider.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

4
src/eepp/ui/uisliderbutton.cpp
View File

@@ -8,7 +8,7 @@ UISliderButton *UISliderButton::New() {
}
UISliderButton::UISliderButton() :
UIControlAnim()
UIWidget()
{
applyDefaultTheme();
}
@@ -17,7 +17,7 @@ UISliderButton::~UISliderButton() {
}
void UISliderButton::onPositionChange() {
UIControlAnim::onPositionChange();
UIWidget::onPositionChange();
UISlider * Slider = reinterpret_cast<UISlider*> ( mParentCtrl );
Slider->fixSliderPos();

2
src/eepp/ui/uispinbox.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uispinbox.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uisprite.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uisprite.hpp>
#include <eepp/graphics/sprite.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/globaltextureatlas.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uisubtexture.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uisubtexture.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/globaltextureatlas.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitab.cpp
View File

@@ -1,7 +1,7 @@
#include <eepp/ui/uitab.hpp>
#include <eepp/ui/uitabwidget.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitable.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uitable.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitabwidget.cpp
View File

@@ -3,7 +3,7 @@
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/primitives.hpp>
#include <eepp/graphics/fontmanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitextedit.cpp
View File

@@ -2,7 +2,7 @@
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/graphics/font.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitextinput.cpp
View File

@@ -5,7 +5,7 @@
#include <eepp/graphics/primitives.hpp>
#include <eepp/graphics/font.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitextview.cpp
View File

@@ -4,7 +4,7 @@
#include <eepp/graphics/font.hpp>
#include <eepp/graphics/primitives.hpp>
#include <eepp/window/clipboard.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
#include <eepp/graphics/fontmanager.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uitouchdragablewidget.cpp
View File

@@ -1,6 +1,6 @@
#include <eepp/ui/uitouchdragablewidget.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

8
src/eepp/ui/uiwidget.cpp
View File

@@ -1,7 +1,7 @@
#include <eepp/ui/uiwidget.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/drawablesearcher.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {
@@ -141,7 +141,7 @@ LayoutPositionRules UIWidget::getLayoutPositionRule() const {
}
void UIWidget::update() {
if ( mVisible && NULL != mTooltip && mTooltip->getText().size() ) {
if ( mVisible && NULL != mTooltip && !mTooltip->getText().empty() ) {
if ( isMouseOverMeOrChilds() ) {
UIManager * uiManager = UIManager::instance();
UIThemeManager * themeManager = UIThemeManager::instance();
@@ -287,6 +287,10 @@ const Sizei& UIWidget::getSize() {
return UIControlAnim::getSize();
}
UITooltip * UIWidget::getTooltip() {
return mTooltip;
}
void UIWidget::onParentSizeChange( const Vector2i& SizeChange ) {
updateAnchors( SizeChange );
UIControlAnim::onParentSizeChange( SizeChange );

2
src/eepp/ui/uiwindow.cpp
View File

@@ -8,7 +8,7 @@
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/ui/uilinearlayout.hpp>
#include <eepp/ui/uirelativelayout.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/ui/uiwinmenu.cpp
View File

@@ -1,7 +1,7 @@
#include <eepp/ui/uiwinmenu.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/graphics/subtexture.hpp>
#include <eepp/helper/pugixml/pugixml.hpp>
#include <pugixml/pugixml.hpp>
namespace EE { namespace UI {

2
src/eepp/window/backend/SDL2/windowsdl2.cpp
View File

@@ -2,7 +2,7 @@
#ifdef EE_BACKEND_SDL2
#include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
#include <SOIL2/src/SOIL2/stb_image.h>
#include <eepp/window/engine.hpp>
#include <eepp/window/platform/platformimpl.hpp>
#include <eepp/window/backend/SDL2/windowsdl2.hpp>

2
src/eepp/window/platform/x11/x11impl.cpp
View File

@@ -3,7 +3,7 @@
#if defined( EE_X11_PLATFORM )
#define GLEW_NO_GLU
#include <eepp/helper/glew/glxew.h>
#include <glew/glxew.h>
#include <X11/Xcursor/Xcursor.h>
#include <X11/cursorfont.h>
#include <climits>

2
src/eepp/window/window.cpp
View File

@@ -11,7 +11,7 @@
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/version.hpp>
#include <eepp/helper/SOIL2/src/SOIL2/SOIL2.h>
#include <SOIL2/src/SOIL2/SOIL2.h>
#ifdef EE_GLES1_LATE_INCLUDE
#if EE_PLATFORM == EE_PLATFORM_IOS

0
src/eepp/helper/SDL2/include/SDL.h → src/thirdparty/SDL2/include/SDL.h vendored
View File

0
src/eepp/helper/SDL2/include/SDL_assert.h → src/thirdparty/SDL2/include/SDL_assert.h vendored
View File

0
src/eepp/helper/SDL2/include/SDL_atomic.h → src/thirdparty/SDL2/include/SDL_atomic.h vendored
View File

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