[hatari-devel] Unable to latest hg on Mac OS X again...

[Christer Solskogen]

On Sun, Oct 10, 2010 at 10:42 PM, Eero Tamminen <eerot at users.berlios.de> wrote:
> Hi,
>
> On Sunday 10 October 2010, Christer Solskogen wrote:
>> > I think i added screen.h to SDLmain.m for the PALETTE error.
>> >
>> > I have a lot of change that wasn't merged in the repo. But they may
>> > have broken build for MacOsX 10.4.
>>
>> Added them.
> ...
>> [ 45%] Building C object src/CMakeFiles/hatari.dir/gui-osx/SDLMain.m.o
>> cd /Users/solskogen/source/hatari/src && /usr/bin/gcc
>> -DCONFDIR=\"/etc\" -Wcast-qual -Wbad-function-cast -Wpointer-arith
>> -Wmissing-prototypes -Wstrict-prototypes -Wall -Wwrite-strings
>> -Wsign-compare -Wextra -Wno-unused-parameter -Wno-empty-body
>> -Wformat-security -O3 -DNDEBUG -I/Users/solskogen/source/hatari
>> -I/Users/solskogen/source/hatari/src/includes
>> -I/Users/solskogen/source/hatari/src/debug
>> -I/Users/solskogen/source/hatari/src/falcon
>> -I/Users/solskogen/source/hatari/src/uae-cpu -I/opt/local/include/SDL
>> -I/usr/X11R6/include   -o CMakeFiles/hatari.dir/gui-osx/SDLMain.m.o
>> -c /Users/solskogen/source/hatari/src/gui-osx/SDLMain.m
>> In file included from
>> /Users/solskogen/source/hatari/src/gui-osx/SDLMain.m:21:
>> /Users/solskogen/source/hatari/src/includes/video.h:123: error:
>> ‘HBL_PALETTE_LINES’ undeclared here (not in a function)
>
> It needs to be before include for video.h.
>
>
>        - Eero
> _______________________________________________
> hatari-devel mailing list
> hatari-devel at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/hatari-devel
>

diff -r 42dc90087cae src/gui-osx/SDLMain.m
--- a/src/gui-osx/SDLMain.m     Sun Oct 10 21:18:17 2010 +0300
+++ b/src/gui-osx/SDLMain.m     Sun Oct 10 22:46:06 2010 +0200
@@ -18,6 +18,9 @@
 #include "screenSnapShot.h"
 #include "memorySnapShot.h"
 #include "sound.h"
+#include "screen.h"
+#include "PrefsController.h"
+#include "Shared.h"
 #include "video.h"
 #include "avi_record.h"

Will fix the error. Thanks!

-- 
chs,