uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

fixed OS-X port (untested)

Browse source
This commit is contained in:
Joel Bodenmann 2013-07-23 18:52:52 +02:00
parent 95b1597158
commit ea3048ff36
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/multiple/X/gdisp_lld.c
View file

@ -138,7 +138,7 @@ bool_t gdisp_lld_init(void)
char * WindowTitleText; char * WindowTitleText;
gfxThreadHandle hth; gfxThreadHandle hth;
#if GFX_USE_OS_POSIX #if GFX_USE_OS_LINUX || GFX_USE_OS_OSX
XInitThreads(); XInitThreads();
#endif #endif
@ -206,7 +206,7 @@ bool_t gdisp_lld_init(void)
XCloseDisplay(dis); XCloseDisplay(dis);
exit(0); exit(0);
} }
#if GFX_USE_OS_POSIX #if GFX_USE_OS_LINUX || GFX_USE_OS_OSX
pthread_detach(hth); pthread_detach(hth);
#endif #endif
gfxThreadClose(hth); gfxThreadClose(hth);

2
drivers/multiple/X/readme.txt
View file

@ -11,7 +11,7 @@ and a touchscreen driver.
d) Optionally the following (with appropriate values): d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640 #define GDISP_SCREEN_WIDTH 640
#define GDISP_SCREEN_HEIGHT 480 #define GDISP_SCREEN_HEIGHT 480
e) Optionally change the threading model to POSIX (instead of ChibiOS) e) Optionally change the threading model to LINUX (instead of ChibiOS)
#define GDISP_THREAD_CHIBIOS FALSE #define GDISP_THREAD_CHIBIOS FALSE
2. To your makefile add the following lines: 2. To your makefile add the following lines:

2
include/gdisp/image.h
View file

@ -143,7 +143,7 @@ extern "C" {
bool_t gdispImageSetBaseFileStreamReader(gdispImage *img, void *BaseFileStreamPtr); bool_t gdispImageSetBaseFileStreamReader(gdispImage *img, void *BaseFileStreamPtr);
#endif #endif
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__) #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
/** /**
* @brief Sets the io fields in the image structure to routines * @brief Sets the io fields in the image structure to routines
* that support reading from an image stored in Win32 simulators native * that support reading from an image stored in Win32 simulators native

2
include/gos/chibios.h
View file

@ -6,7 +6,7 @@
*/ */
/** /**
* @file include/gos/posix.h * @file include/gos/chibios.h
* @brief GOS - Operating System Support header file for ChibiOS. * @brief GOS - Operating System Support header file for ChibiOS.
*/ */

2
include/gos/osx.h
View file

@ -7,7 +7,7 @@
/** /**
* @file include/gos/osx.h * @file include/gos/osx.h
* @brief GOS - Operating System Support header file for POSIX. * @brief GOS - Operating System Support header file for Mac OS-X.
*/ */
#ifndef _GOS_OSX_H #ifndef _GOS_OSX_H

2
include/gwin/image.h
View file

@ -69,7 +69,7 @@ GHandle gwinImageCreate(GImageObject *widget, GWindowInit *pInit);
*/ */
bool_t gwinImageOpenMemory(GHandle gh, const void* memory); bool_t gwinImageOpenMemory(GHandle gh, const void* memory);
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__) #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
/** /**
* @brief Sets the input routines that support reading the image from a file * @brief Sets the input routines that support reading the image from a file
* @return TRUE if the IO open function succeeds * @return TRUE if the IO open function succeeds

2
src/gdisp/image.c
View file

@ -117,7 +117,7 @@ bool_t gdispImageSetMemoryReader(gdispImage *img, const void *memimage) {
} }
#endif #endif
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX
#include <stdio.h> #include <stdio.h>
static size_t ImageFileRead(struct gdispImageIO *pio, void *buf, size_t len) { static size_t ImageFileRead(struct gdispImageIO *pio, void *buf, size_t len) {

2
src/gwin/gimage.c
View file

@ -159,7 +159,7 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory) {
return TRUE; return TRUE;
} }
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__) #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
bool_t gwinImageOpenFile(GHandle gh, const char* filename) { bool_t gwinImageOpenFile(GHandle gh, const char* filename) {
if (gdispImageIsOpen(&widget(gh)->image)) if (gdispImageIsOpen(&widget(gh)->image))
gdispImageClose(&widget(gh)->image); gdispImageClose(&widget(gh)->image);