From 977b845c3e09a5b51895be81ef7514ae4030f588 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 26 Jul 2018 17:28:08 +0800 Subject: =?UTF-8?q?*=E6=9D=A1=E4=BB=B6=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/audio/audio.cpp | 8 ++++++-- src/libjin/audio/audio.h | 5 ++++- src/libjin/audio/sdl/audio.cpp | 5 +++++ src/libjin/audio/sdl/audio.h | 3 +++ src/libjin/audio/sdl/source.cpp | 7 ++++++- src/libjin/audio/sdl/source.h | 3 +++ src/libjin/audio/source.cpp | 4 ++++ src/libjin/audio/source.h | 5 ++++- src/libjin/modules.h | 23 +++++++++++++++++++++-- src/libjin/render/canvas.cpp | 6 +++++- src/libjin/render/canvas.h | 4 ++++ src/libjin/render/color.h | 6 +++++- src/libjin/render/drawable.cpp | 5 +++++ src/libjin/render/drawable.h | 4 ++++ src/libjin/render/font.cpp | 8 +++++--- src/libjin/render/font.h | 3 +++ src/libjin/render/graphics.cpp | 7 ++++++- src/libjin/render/graphics.h | 1 + src/libjin/render/jsl.cpp | 4 ++++ src/libjin/render/jsl.h | 3 +++ src/libjin/render/render.h | 3 +++ src/libjin/render/texture.cpp | 6 +++++- src/libjin/render/texture.h | 4 ++++ src/libjin/render/window.cpp | 8 ++++++-- src/libjin/render/window.h | 4 ++++ src/libjin/tools/EventMsgCenter/EventMsgCenter.h | 1 - 26 files changed, 123 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/libjin/audio/audio.cpp b/src/libjin/audio/audio.cpp index 350af51..363bf4d 100644 --- a/src/libjin/audio/audio.cpp +++ b/src/libjin/audio/audio.cpp @@ -1,5 +1,7 @@ -#include +#include "../modules.h" +#if JIN_MODULES_AUDIO +#include #include "audio.h" namespace jin @@ -8,4 +10,6 @@ namespace audio { } -} \ No newline at end of file +} + +#endif // JIN_MODULES_AUDIO \ No newline at end of file diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h index 239b718..faec4db 100644 --- a/src/libjin/audio/audio.h +++ b/src/libjin/audio/audio.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_H #define __JIN_AUDIO_H +#include "../modules.h" +#if JIN_MODULES_AUDIO #include @@ -34,10 +36,11 @@ namespace audio virtual ~AudioSystem() {}; SINGLETON(AudioSystem); - + }; } } +#endif // JIN_MODULES_AUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/sdl/audio.cpp b/src/libjin/audio/sdl/audio.cpp index 4e565dc..47d8cf8 100644 --- a/src/libjin/audio/sdl/audio.cpp +++ b/src/libjin/audio/sdl/audio.cpp @@ -1,3 +1,6 @@ +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO + #include #include "audio.h" #include "source.h" @@ -114,3 +117,5 @@ namespace audio } } + +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO \ No newline at end of file diff --git a/src/libjin/audio/sdl/audio.h b/src/libjin/audio/sdl/audio.h index 83ad255..6da6605 100644 --- a/src/libjin/audio/sdl/audio.h +++ b/src/libjin/audio/sdl/audio.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_SDL_H #define __JIN_AUDIO_SDL_H +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #include #include "../audio.h" @@ -62,4 +64,5 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/sdl/source.cpp b/src/libjin/audio/sdl/source.cpp index 51b67e4..0eedbba 100644 --- a/src/libjin/audio/sdl/source.cpp +++ b/src/libjin/audio/sdl/source.cpp @@ -1,3 +1,6 @@ +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO + #include #include @@ -391,4 +394,6 @@ Manager::get()->pushCommand(cmd); \ } } -} \ No newline at end of file +} + +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO \ No newline at end of file diff --git a/src/libjin/audio/sdl/source.h b/src/libjin/audio/sdl/source.h index ff311b6..38f7ec4 100644 --- a/src/libjin/audio/sdl/source.h +++ b/src/libjin/audio/sdl/source.h @@ -1,5 +1,7 @@ #ifndef __JIN_SOURCE_SDL_H #define __JIN_SOURCE_SDL_H +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #include #include @@ -110,4 +112,5 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/source.cpp b/src/libjin/audio/source.cpp index f6da44b..ceb882d 100644 --- a/src/libjin/audio/source.cpp +++ b/src/libjin/audio/source.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_AUDIO + #include #include "source.h" @@ -22,3 +25,4 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO \ No newline at end of file diff --git a/src/libjin/audio/source.h b/src/libjin/audio/source.h index 313ebde..5b9c12b 100644 --- a/src/libjin/audio/source.h +++ b/src/libjin/audio/source.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_SOURCE_H #define __JIN_AUDIO_SOURCE_H +#include "../modules.h" +#if JIN_MODULES_AUDIO #include @@ -45,4 +47,5 @@ namespace audio } } -#endif \ No newline at end of file +#endif // JIN_MODULES_AUDIO +#endif \ No newline at end of file diff --git a/src/libjin/modules.h b/src/libjin/modules.h index d8ff096..84db013 100644 --- a/src/libjin/modules.h +++ b/src/libjin/modules.h @@ -1,16 +1,35 @@ #ifndef __JIN_COMMON_MODULES_H #define __JIN_COMMON_MODULES_H +/* +* ¿ØÖÆÄ£¿éºÍ×ÓÄ£¿éµÄ±àÒ룬²»ÐèҪģ¿é²»±àÒë +*/ + +#define JIN_MODULES_AUDIO 1 +#define JIN_AUDIO_SDLAUDIO 1 +#define JIN_AUDIO_OPENAL 1 + +#define JIN_MODULES_RENDER 1 -#define JIN_MODULES_AUDIO 1 -#define JIN_MODULES_RENDER 1 #define JIN_MODULES_DEBUG 1 + #define JIN_MODULES_FILESYSTEM 1 + #define JIN_MODULES_INPUT 1 + #define JIN_MODULES_MATH 1 + #define JIN_MODULES_NET 1 + #define JIN_MODULES_PHYSICS 1 +#define JIN_PHYSICS_BOX2D 1 +#define JIN_PHYSICS_NEWTON 1 + #define JIN_MODULES_TILEMAP 1 + #define JIN_MODULES_UI 1 + #define JIN_MODULES_TOOLS 1 +#define JIN_MODULES_THREAD 1 + #endif \ No newline at end of file diff --git a/src/libjin/render/canvas.cpp b/src/libjin/render/canvas.cpp index 55a141b..8cb34ca 100644 --- a/src/libjin/render/canvas.cpp +++ b/src/libjin/render/canvas.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "../utils/macros.h" #include "canvas.h" #include "window.h" @@ -127,4 +130,5 @@ namespace render } } -} \ No newline at end of file +} +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/canvas.h b/src/libjin/render/canvas.h index 8162d4e..8cced23 100644 --- a/src/libjin/render/canvas.h +++ b/src/libjin/render/canvas.h @@ -1,5 +1,8 @@ #ifndef __JIN_CANVAS_H #define __JIN_CANVAS_H +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "drawable.h" namespace jin { @@ -34,3 +37,4 @@ namespace render } #endif +#endif // JIN_MODULES_RENDER diff --git a/src/libjin/render/color.h b/src/libjin/render/color.h index 2d1ba1c..7b88799 100644 --- a/src/libjin/render/color.h +++ b/src/libjin/render/color.h @@ -3,6 +3,9 @@ */ #ifndef __JIN_COLOR_H #define __JIN_COLOR_H +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "../utils/endian.h" namespace jin @@ -24,4 +27,5 @@ namespace render } } -#endif +#endif // JIN_MODULES_RENDER +#endif \ No newline at end of file diff --git a/src/libjin/render/drawable.cpp b/src/libjin/render/drawable.cpp index 7880fd4..cbdf250 100644 --- a/src/libjin/render/drawable.cpp +++ b/src/libjin/render/drawable.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "drawable.h" #include "../math/matrix.h" #include @@ -70,3 +73,5 @@ namespace render } } } + +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/drawable.h b/src/libjin/render/drawable.h index 0cf6d4b..f8e25a2 100644 --- a/src/libjin/render/drawable.h +++ b/src/libjin/render/drawable.h @@ -1,5 +1,8 @@ #ifndef __JIN_DRAWABLE #define __JIN_DRAWABLE +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "3rdparty/GLee/GLee.h" namespace jin { @@ -49,4 +52,5 @@ namespace render } }// jin +#endif // JIN_MODULES_RENDER #endif diff --git a/src/libjin/render/font.cpp b/src/libjin/render/font.cpp index fa3e265..e8e71b2 100644 --- a/src/libjin/render/font.cpp +++ b/src/libjin/render/font.cpp @@ -1,7 +1,8 @@ -#include "font.h" +#include "../modules.h" +#if JIN_MODULES_RENDER +#include "font.h" #include - #define STB_TRUETYPE_IMPLEMENTATION #include "3rdparty/stb/stb_truetype.h" #include "color.h" @@ -188,4 +189,5 @@ namespace render } } -} \ No newline at end of file +} +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/font.h b/src/libjin/render/font.h index 55f0a44..f2a57ed 100644 --- a/src/libjin/render/font.h +++ b/src/libjin/render/font.h @@ -1,5 +1,7 @@ #ifndef __JIN_FONT_H #define __JIN_FONT_H +#include "../modules.h" +#if JIN_MODULES_RENDER #include "drawable.h" #include "3rdparty/stb/stb_truetype.h" @@ -55,4 +57,5 @@ namespace render } } +#endif // JIN_MODULES_RENDER #endif \ No newline at end of file diff --git a/src/libjin/render/graphics.cpp b/src/libjin/render/graphics.cpp index a4ccd66..f54021b 100644 --- a/src/libjin/render/graphics.cpp +++ b/src/libjin/render/graphics.cpp @@ -1,4 +1,7 @@ -#include "graphics.h" +#include "../modules.h" +#if JIN_MODULES_RENDER + +#include "graphics.h" #include "../math/matrix.h" #include "../math/constant.h" #include @@ -114,3 +117,5 @@ namespace render } } + +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/graphics.h b/src/libjin/render/graphics.h index b4f1fb0..13dd4d1 100644 --- a/src/libjin/render/graphics.h +++ b/src/libjin/render/graphics.h @@ -2,6 +2,7 @@ #define __JIN_GRAPHICS_H #include "../modules.h" #if JIN_MODULES_RENDER + #include "color.h" #include "canvas.h" #include "texture.h" diff --git a/src/libjin/render/jsl.cpp b/src/libjin/render/jsl.cpp index ee3c824..4ce660b 100644 --- a/src/libjin/render/jsl.cpp +++ b/src/libjin/render/jsl.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "../utils/macros.h" #include "jsl.h" namespace jin @@ -152,3 +155,4 @@ namespace render } } +#endif // JIN_MODULES_RENDER diff --git a/src/libjin/render/jsl.h b/src/libjin/render/jsl.h index 5943fbe..741983a 100644 --- a/src/libjin/render/jsl.h +++ b/src/libjin/render/jsl.h @@ -1,5 +1,7 @@ #ifndef __JIN_JSL_H #define __JIN_JSL_H +#include "../modules.h" +#if JIN_MODULES_RENDER #include #include @@ -68,4 +70,5 @@ namespace render } } +#endif // JIN_MODULES_RENDER #endif diff --git a/src/libjin/render/render.h b/src/libjin/render/render.h index 1bf9082..e51051e 100644 --- a/src/libjin/render/render.h +++ b/src/libjin/render/render.h @@ -1,5 +1,7 @@ #ifndef __JIN_RENDER_H #define __JIN_RENDER_H +#include "../modules.h" +#if JIN_MODULES_RENDER #include "canvas.h" #include "color.h" @@ -9,4 +11,5 @@ #include "jsl.h" #include "window.h" +#endif // JIN_MODULES_RENDER #endif \ No newline at end of file diff --git a/src/libjin/render/texture.cpp b/src/libjin/render/texture.cpp index d5cd695..cee3552 100644 --- a/src/libjin/render/texture.cpp +++ b/src/libjin/render/texture.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_RENDER + #include #include "texture.h" #include "3rdparty/stb/stb_image.h" @@ -92,4 +95,5 @@ namespace render return true; } } -} \ No newline at end of file +} +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/texture.h b/src/libjin/render/texture.h index 6b0c699..d2e4bd0 100644 --- a/src/libjin/render/texture.h +++ b/src/libjin/render/texture.h @@ -1,5 +1,8 @@ #ifndef __JIN_IMAGE_H #define __JIN_IMAGE_H +#include "../modules.h" +#if JIN_MODULES_RENDER + #include "3rdparty/GLee/GLee.h" #include "color.h" #include "drawable.h" @@ -31,4 +34,5 @@ namespace render } } +#endif // JIN_MODULES_RENDER #endif \ No newline at end of file diff --git a/src/libjin/render/window.cpp b/src/libjin/render/window.cpp index 1107a53..6507691 100644 --- a/src/libjin/render/window.cpp +++ b/src/libjin/render/window.cpp @@ -1,5 +1,7 @@ -#include +#include "../modules.h" +#if JIN_MODULES_RENDER +#include #include "window.h" #include "3rdparty/GLee/GLee.h" #include "canvas.h" @@ -83,4 +85,6 @@ namespace render } } -} \ No newline at end of file +} + +#endif // JIN_MODULES_RENDER \ No newline at end of file diff --git a/src/libjin/render/window.h b/src/libjin/render/window.h index 48ead67..77b1963 100644 --- a/src/libjin/render/window.h +++ b/src/libjin/render/window.h @@ -1,5 +1,8 @@ #ifndef __JIN_RENDER_WINDOW #define __JIN_RENDER_WINDOW +#include "../modules.h" +#if JIN_MODULES_RENDER + #include #include "../utils/utils.h" #include "../common/subsystem.h" @@ -52,4 +55,5 @@ namespace render } } +#endif // JIN_MODULES_RENDER #endif \ No newline at end of file diff --git a/src/libjin/tools/EventMsgCenter/EventMsgCenter.h b/src/libjin/tools/EventMsgCenter/EventMsgCenter.h index 6f70f09..e69de29 100644 --- a/src/libjin/tools/EventMsgCenter/EventMsgCenter.h +++ b/src/libjin/tools/EventMsgCenter/EventMsgCenter.h @@ -1 +0,0 @@ -#pragma once -- cgit v1.1-26-g67d0