github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-19 06:06:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

rainbow: dependency and some small fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3614 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait 2011-07-05 21:12:36 +00:00
parent 02ef472de8
commit d20e4dec80
17 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rainbow/Framebuffer/Framebuffer.upp
View file

@ -1,7 +1,8 @@
description "Generic framebuffer GUI rainbow\377";
uses
Painter;
Painter,
CtrlLib;
file
Framebuffer.h,

4
rainbow/Framebuffer/Image.cpp
View file

@ -1,9 +1,7 @@
#include <CtrlLib/CtrlLib.h>
#include <CtrlCore/CtrlCore.h>
#ifdef GUI_FB
//#include <shellapi.h>
NAMESPACE_UPP
#define LTIMING(x) // RTIMING(x)

1
rainbow/Framebuffer/init
View file

@ -1,4 +1,5 @@
#ifndef _Framebuffer_icpp_init_stub
#define _Framebuffer_icpp_init_stub
#include "Painter/init"
#include "CtrlLib/init"
#endif

3
rainbow/LinuxFb/LinuxFb.upp
View file

@ -1,3 +1,6 @@
uses
Framebuffer;
file
LinuxFb.h,
LinuxFbLocal.h,

1
rainbow/LinuxFb/init
View file

@ -1,3 +1,4 @@
#ifndef _LinuxFb_icpp_init_stub
#define _LinuxFb_icpp_init_stub
#include "Framebuffer/init"
#endif

3
rainbow/Paint/Paint.upp
View file

@ -2,7 +2,6 @@ description "Paint method and Draw example\377";
uses
CtrlLib,
Framebuffer,
RichEdit;
uses(WINFB) WinFb;
@ -11,6 +10,8 @@ uses(LINUXFB) LinuxFb;
uses(SDLFB) SDLFb;
uses(WINGL) WinGl;
file
Draw.cpp;

3
rainbow/Paint/init
View file

@ -1,10 +1,9 @@
#ifndef _Paint_icpp_init_stub
#define _Paint_icpp_init_stub
#include "CtrlLib/init"
#include "Framebuffer/init"
#include "RichEdit/init"
#include "WinGl/init"
#include "WinFb/init"
#include "LinuxFb/init"
#include "SDLFb/init"
#include "WinGl/init"
#endif

6
rainbow/PaintGl/PaintGl.upp
View file

@ -1,7 +1,7 @@
uses
CtrlLib,
Painter,
WinGl;
CtrlLib;
uses(WINGL) WinGl;
file
main.cpp;

1
rainbow/PaintGl/init
View file

@ -1,6 +1,5 @@
#ifndef _PaintGl_icpp_init_stub
#define _PaintGl_icpp_init_stub
#include "CtrlLib/init"
#include "Painter/init"
#include "WinGl/init"
#endif

3
rainbow/SDLFb/SDLFb.upp
View file

@ -1,3 +1,6 @@
uses
Framebuffer;
library(MSC) "SDL SDLmain";
library(GCC WIN32 !SHARED) "SDL.dll SDLmain mingw32";

1
rainbow/SDLFb/init
View file

@ -1,3 +1,4 @@
#ifndef _SDLFb_icpp_init_stub
#define _SDLFb_icpp_init_stub
#include "Framebuffer/init"
#endif

7
rainbow/UWord/UWord.upp
View file

@ -6,8 +6,6 @@ uses
PdfDraw,
plugin\jpg;
uses(WINFB | SDLFB) Framebuffer;
uses(SKELETON) Skeleton;
uses(WINFB) WinFb;
@ -16,6 +14,8 @@ uses(WINALT) WinAlt;
uses(SDLFB) SDLFb;
uses(WINGL) WinGl;
file
UWord.cpp,
UWord.iml;
@ -24,5 +24,6 @@ mainconfig
"" = "GUI WINFB",
"" = "GUI WINALT",
"" = "GUI SKELETON",
"" = "GUI SDLFB";
"" = "GUI SDLFB",
"" = "GUI WINGL";

2
rainbow/UWord/init
View file

@ -4,9 +4,9 @@
#include "RichEdit/init"
#include "PdfDraw/init"
#include "plugin\jpg/init"
#include "Framebuffer/init"
#include "Skeleton/init"
#include "WinFb/init"
#include "WinAlt/init"
#include "SDLFb/init"
#include "WinGl/init"
#endif

2
rainbow/WinGl/Dnd.cpp
View file

@ -19,7 +19,7 @@ Image MakeDragImage(const Image& arrow, Image sample);
Image MakeDragImage(const Image& arrow, const Image& arrow98, Image sample)
{
#if PLATFORM_WIN32
#ifdef PLATFORM_WIN32
if(IsWin2K())
return MakeDragImage(arrow, sample);
else

4
rainbow/WinGl/WinGl.h
View file

@ -62,7 +62,7 @@ struct OpenGLFont : Moveable<OpenGLFont>
};
Vector<CharInfo> chars;
VectorMap<int, VectorMap<int, float>> kerns;
VectorMap<int, VectorMap<int, float> > kerns;
Vector<String> files;
Array<const byte> compiledFiles;
Vector<int64> pages;
@ -295,7 +295,9 @@ END_UPP_NAMESPACE
#define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <WinGl/Top.h>
//#include <CtrlCore/stdids.h>
#ifndef PLATFORM_WIN32
#include "vkcodes.h" //FIXME
#endif
#define GUIPLATFORM_INCLUDE_AFTER <WinGl/After.h>

3
rainbow/WinGl/WinGl.upp
View file

@ -1,3 +1,6 @@
uses
Painter;
options
"-D_WIN32 -DGLEW_STATIC";

1
rainbow/WinGl/init
View file

@ -1,3 +1,4 @@
#ifndef _WinGl_icpp_init_stub
#define _WinGl_icpp_init_stub
#include "Painter/init"
#endif