Skip to content

C
core
Kaydet (Commit) 049e760f authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Really disable use of pagein on Mac 

 - there was a 2nd dir re-using that pagein object file
üst 8df89e17
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
desktop/unx/source/makefile.mk
Dosyayı görüntüle @ 049e760f
...@@ -44,9 +44,11 @@ OBJFILES= \ ...@@ -44,9 +44,11 @@ OBJFILES= \
$(OBJ)$/start.obj \ $(OBJ)$/start.obj \
$(OBJ)$/args.obj $(OBJ)$/args.obj
.IF "$(OS)"!="MACOSX"
PAGEIN_OBJS= \ PAGEIN_OBJS= \
$(OBJ)$/pagein.obj \ $(OBJ)$/pagein.obj \
$(OBJ)$/file_image_unx.obj $(OBJ)$/file_image_unx.obj
.ENDIF
APP1TARGET = $(TARGET) APP1TARGET = $(TARGET)
APP1RPATH = BRAND APP1RPATH = BRAND
......
desktop/unx/source/start.c
Dosyayı görüntüle @ 049e760f
...@@ -731,6 +731,10 @@ extern int pagein_execute (int argc, char **argv); ...@@ -731,6 +731,10 @@ extern int pagein_execute (int argc, char **argv);
void void
exec_pagein (Args *args) exec_pagein (Args *args)
{ {
// no pagein for the while on OSX
#ifdef MACOSX
(void)args;
#else
char *argv[5]; char *argv[5];
rtl_String *app_path; rtl_String *app_path;
...@@ -750,6 +754,7 @@ exec_pagein (Args *args) ...@@ -750,6 +754,7 @@ exec_pagein (Args *args)
pagein_execute (args->pPageinType ? 4 : 3, argv); pagein_execute (args->pPageinType ? 4 : 3, argv);
free (argv[1]); free (argv[1]);
#endif
} }
static void extend_library_path (const char *new_element) static void extend_library_path (const char *new_element)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment