From 3ca5322379e17fa8dcec1c234575a12f157f121c Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Fri, 5 Mar 2010 02:53:19 +0000 Subject: [PATCH] Reorganized source code and directory tree. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1375 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- SDL.dll => bin/SDL.dll | Bin SDL_image.dll => bin/SDL_image.dll | Bin SDL_ttf.dll => bin/SDL_ttf.dll | Bin libfreetype-6.dll => bin/libfreetype-6.dll | Bin libpng13.dll => bin/libpng13.dll | Bin zlib1.dll => bin/zlib1.dll | Bin {fonts => share/grafx2/fonts}/5pxtinyfont.png | Bin {fonts => share/grafx2/fonts}/8pxfont.png | Bin .../grafx2/fonts}/GrafX2_Black.gif | Bin {fonts => share/grafx2/fonts}/GrafX2_Dark.gif | Bin {fonts => share/grafx2/fonts}/Tuffy.ttf | Bin {fonts => share/grafx2/fonts}/colorfont.pcx | Bin gfx2.gif => share/grafx2/gfx2.gif | Bin gfx2.png => share/grafx2/gfx2.png | Bin gfx2def.ini => share/grafx2/gfx2def.ini | 0 .../grafx2/scripts}/_tst_AAFilter.lua | 0 .../grafx2/scripts}/_tst_GradientBrush.lua | 0 .../grafx2/scripts}/_tst_Settings.lua | 0 .../grafx2/scripts}/bru_db_Amigaball.lua | 0 .../grafx2/scripts}/bru_db_ColorSphere.lua | 0 .../grafx2/scripts}/bru_db_FindAA.lua | 0 .../grafx2/scripts}/bru_db_Fisheye.lua | 0 .../grafx2/scripts}/bru_db_GrayscaleAvg.lua | 0 .../grafx2/scripts}/bru_db_GrayscaleDesat.lua | 0 .../grafx2/scripts}/bru_db_Halfsmooth.lua | 0 .../grafx2/scripts}/bru_db_Mandelbrot.lua | 0 .../grafx2/scripts}/bru_db_Waves.lua | 0 .../grafx2/scripts}/pal_db_Desaturate.lua | 0 .../grafx2/scripts}/pal_db_ExpandColors.lua | 0 .../grafx2/scripts}/pal_db_FillColorCube.lua | 0 .../grafx2/scripts}/pal_db_InvertedRGB.lua | 0 .../grafx2/scripts}/pal_db_Set3bit.lua | 0 .../grafx2/scripts}/pal_db_Set6bit.lua | 0 .../grafx2/scripts}/pal_db_SetC64Palette.lua | 0 .../grafx2/scripts}/pal_db_ShiftHue.lua | 0 .../grafx2/scripts}/pic_db_Pic2isometric.lua | 0 .../scripts}/pic_db_Rainbow-Dark2Bright.lua | 0 .../scripts}/pic_db_SierpinskyCarpet.lua | 0 .../scripts}/pic_db_SierpinskyTriangle.lua | 0 .../scripts}/pic_ni_Colorspace12bit.lua | 0 .../scripts}/pic_ni_Colorspace15bit.lua | 0 .../scripts}/pic_ni_Colorspace18bit.lua | 0 .../scripts}/pic_ni_GlassGridFilter.lua | 0 .../grafx2/scripts}/pic_ni_Grid8.lua | 0 .../grafx2/scripts}/pic_ni_Grid8red.lua | 0 .../grafx2/scripts}/pic_ni_GridIso.lua | 0 .../grafx2/scripts}/pic_ni_PaletteX1.lua | 0 .../grafx2/scripts}/pic_ni_PaletteX8.lua | 0 .../grafx2/scripts}/scn_db_RemapImage2RGB.lua | 0 .../scripts}/scn_db_RemapImage2RGB_ed.lua | 0 .../scripts}/scn_db_RemapImageTo3bitPal.lua | 0 .../grafx2/skins}/font_Classic.png | Bin {skins => share/grafx2/skins}/font_DPaint.png | Bin .../grafx2/skins}/font_Fairlight.png | Bin {skins => share/grafx2/skins}/font_Fun.png | Bin {skins => share/grafx2/skins}/font_Melon.png | Bin {skins => share/grafx2/skins}/skin_DPaint.png | Bin .../grafx2/skins}/skin_classic.png | Bin {skins => share/grafx2/skins}/skin_modern.png | Bin .../grafx2/skins}/skin_remapped.png | Bin .DS_Store => src/.DS_Store | Bin .../English.lproj}/InfoPlist.strings | Bin .../Grafx2.xcodeproj}/project.pbxproj | 0 .../Grafx2.xcodeproj}/xx.pbxuser | 0 .../Grafx2.xcodeproj}/xx.perspective | 0 Grafx2_Prefix.pch => src/Grafx2_Prefix.pch | 0 Makefile => src/Makefile | 99 +++++++++--------- Makefile.dep => src/Makefile.dep | 0 SDLMain.h => src/SDLMain.h | 0 SDLMain.m => src/SDLMain.m | 0 SFont.c => src/SFont.c | 0 SFont.h => src/SFont.h | 0 brush.c => src/brush.c | 0 brush.h => src/brush.h | 0 brush_ops.c => src/brush_ops.c | 0 buttons.c => src/buttons.c | 0 buttons.h => src/buttons.h | 0 buttons_effects.c => src/buttons_effects.c | 0 const.h => src/const.h | 0 engine.c => src/engine.c | 0 engine.h => src/engine.h | 0 errors.h => src/errors.h | 0 factory.c => src/factory.c | 0 factory.h => src/factory.h | 0 fileformats.c => src/fileformats.c | 0 filesel.c => src/filesel.c | 0 filesel.h => src/filesel.h | 0 gfx2.ico => src/gfx2.ico | Bin global.h => src/global.h | 0 graph.c => src/graph.c | 0 graph.h => src/graph.h | 0 help.c => src/help.c | 0 help.h => src/help.h | 0 helpfile.h => src/helpfile.h | 0 hotkeys.c => src/hotkeys.c | 0 hotkeys.h => src/hotkeys.h | 0 init.c => src/init.c | 0 init.h => src/init.h | 0 input.c => src/input.c | 0 input.h => src/input.h | 0 io.c => src/io.c | 0 io.h => src/io.h | 0 keyboard.c => src/keyboard.c | 0 keyboard.h => src/keyboard.h | 0 layers.c => src/layers.c | 0 layers.h => src/layers.h | 0 libraw2crtc.c => src/libraw2crtc.c | 0 libraw2crtc.h => src/libraw2crtc.h | 0 loadsave.c => src/loadsave.c | 0 loadsave.h => src/loadsave.h | 0 main.c => src/main.c | 0 misc.c => src/misc.c | 0 misc.h => src/misc.h | 0 miscfileformats.c => src/miscfileformats.c | 0 mountlist.c => src/mountlist.c | 0 mountlist.h => src/mountlist.h | 0 op_c.c => src/op_c.c | 0 op_c.h => src/op_c.h | 0 operatio.c => src/operatio.c | 0 operatio.h => src/operatio.h | 0 pages.c => src/pages.c | 0 pages.h => src/pages.h | 0 palette.c => src/palette.c | 0 palette.h => src/palette.h | 0 pversion.c => src/pversion.c | 0 pxdouble.c => src/pxdouble.c | 0 pxdouble.h => src/pxdouble.h | 0 pxquad.c => src/pxquad.c | 0 pxquad.h => src/pxquad.h | 0 pxsimple.c => src/pxsimple.c | 0 pxsimple.h => src/pxsimple.h | 0 pxtall.c => src/pxtall.c | 0 pxtall.h => src/pxtall.h | 0 pxtall2.c => src/pxtall2.c | 0 pxtall2.h => src/pxtall2.h | 0 pxtriple.c => src/pxtriple.c | 0 pxtriple.h => src/pxtriple.h | 0 pxwide.c => src/pxwide.c | 0 pxwide.h => src/pxwide.h | 0 pxwide2.c => src/pxwide2.c | 0 pxwide2.h => src/pxwide2.h | 0 readini.c => src/readini.c | 0 readini.h => src/readini.h | 0 readline.c => src/readline.c | 0 readline.h => src/readline.h | 0 realpath.c => src/realpath.c | 0 realpath.h => src/realpath.h | 0 saveini.c => src/saveini.c | 0 saveini.h => src/saveini.h | 0 sdlscreen.c => src/sdlscreen.c | 0 sdlscreen.h => src/sdlscreen.h | 0 setup.c => src/setup.c | 19 +++- setup.h => src/setup.h | 0 shade.c => src/shade.c | 0 shade.h => src/shade.h | 0 special.c => src/special.c | 0 special.h => src/special.h | 0 struct.h => src/struct.h | 0 text.c => src/text.c | 0 text.h => src/text.h | 0 transform.c => src/transform.c | 0 transform.h => src/transform.h | 0 windows.c => src/windows.c | 0 windows.h => src/windows.h | 0 Doxyfile => tools/Doxyfile | 4 +- {doc => tools}/footer.html | 0 166 files changed, 65 insertions(+), 57 deletions(-) rename SDL.dll => bin/SDL.dll (100%) rename SDL_image.dll => bin/SDL_image.dll (100%) rename SDL_ttf.dll => bin/SDL_ttf.dll (100%) rename libfreetype-6.dll => bin/libfreetype-6.dll (100%) rename libpng13.dll => bin/libpng13.dll (100%) rename zlib1.dll => bin/zlib1.dll (100%) rename {fonts => share/grafx2/fonts}/5pxtinyfont.png (100%) rename {fonts => share/grafx2/fonts}/8pxfont.png (100%) rename {fonts => share/grafx2/fonts}/GrafX2_Black.gif (100%) rename {fonts => share/grafx2/fonts}/GrafX2_Dark.gif (100%) rename {fonts => share/grafx2/fonts}/Tuffy.ttf (100%) rename {fonts => share/grafx2/fonts}/colorfont.pcx (100%) rename gfx2.gif => share/grafx2/gfx2.gif (100%) rename gfx2.png => share/grafx2/gfx2.png (100%) rename gfx2def.ini => share/grafx2/gfx2def.ini (100%) rename {scripts => share/grafx2/scripts}/_tst_AAFilter.lua (100%) rename {scripts => share/grafx2/scripts}/_tst_GradientBrush.lua (100%) rename {scripts => share/grafx2/scripts}/_tst_Settings.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_Amigaball.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_ColorSphere.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_FindAA.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_Fisheye.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_GrayscaleAvg.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_GrayscaleDesat.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_Halfsmooth.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_Mandelbrot.lua (100%) rename {scripts => share/grafx2/scripts}/bru_db_Waves.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_Desaturate.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_ExpandColors.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_FillColorCube.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_InvertedRGB.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_Set3bit.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_Set6bit.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_SetC64Palette.lua (100%) rename {scripts => share/grafx2/scripts}/pal_db_ShiftHue.lua (100%) rename {scripts => share/grafx2/scripts}/pic_db_Pic2isometric.lua (100%) rename {scripts => share/grafx2/scripts}/pic_db_Rainbow-Dark2Bright.lua (100%) rename {scripts => share/grafx2/scripts}/pic_db_SierpinskyCarpet.lua (100%) rename {scripts => share/grafx2/scripts}/pic_db_SierpinskyTriangle.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_Colorspace12bit.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_Colorspace15bit.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_Colorspace18bit.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_GlassGridFilter.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_Grid8.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_Grid8red.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_GridIso.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_PaletteX1.lua (100%) rename {scripts => share/grafx2/scripts}/pic_ni_PaletteX8.lua (100%) rename {scripts => share/grafx2/scripts}/scn_db_RemapImage2RGB.lua (100%) rename {scripts => share/grafx2/scripts}/scn_db_RemapImage2RGB_ed.lua (100%) rename {scripts => share/grafx2/scripts}/scn_db_RemapImageTo3bitPal.lua (100%) rename {skins => share/grafx2/skins}/font_Classic.png (100%) rename {skins => share/grafx2/skins}/font_DPaint.png (100%) rename {skins => share/grafx2/skins}/font_Fairlight.png (100%) rename {skins => share/grafx2/skins}/font_Fun.png (100%) rename {skins => share/grafx2/skins}/font_Melon.png (100%) rename {skins => share/grafx2/skins}/skin_DPaint.png (100%) rename {skins => share/grafx2/skins}/skin_classic.png (100%) rename {skins => share/grafx2/skins}/skin_modern.png (100%) rename {skins => share/grafx2/skins}/skin_remapped.png (100%) rename .DS_Store => src/.DS_Store (100%) rename {English.lproj => src/English.lproj}/InfoPlist.strings (100%) rename {Grafx2.xcodeproj => src/Grafx2.xcodeproj}/project.pbxproj (100%) rename {Grafx2.xcodeproj => src/Grafx2.xcodeproj}/xx.pbxuser (100%) rename {Grafx2.xcodeproj => src/Grafx2.xcodeproj}/xx.perspective (100%) rename Grafx2_Prefix.pch => src/Grafx2_Prefix.pch (100%) rename Makefile => src/Makefile (81%) rename Makefile.dep => src/Makefile.dep (100%) rename SDLMain.h => src/SDLMain.h (100%) rename SDLMain.m => src/SDLMain.m (100%) rename SFont.c => src/SFont.c (100%) rename SFont.h => src/SFont.h (100%) rename brush.c => src/brush.c (100%) rename brush.h => src/brush.h (100%) rename brush_ops.c => src/brush_ops.c (100%) rename buttons.c => src/buttons.c (100%) rename buttons.h => src/buttons.h (100%) rename buttons_effects.c => src/buttons_effects.c (100%) rename const.h => src/const.h (100%) rename engine.c => src/engine.c (100%) rename engine.h => src/engine.h (100%) rename errors.h => src/errors.h (100%) rename factory.c => src/factory.c (100%) rename factory.h => src/factory.h (100%) rename fileformats.c => src/fileformats.c (100%) rename filesel.c => src/filesel.c (100%) rename filesel.h => src/filesel.h (100%) rename gfx2.ico => src/gfx2.ico (100%) rename global.h => src/global.h (100%) rename graph.c => src/graph.c (100%) rename graph.h => src/graph.h (100%) rename help.c => src/help.c (100%) rename help.h => src/help.h (100%) rename helpfile.h => src/helpfile.h (100%) rename hotkeys.c => src/hotkeys.c (100%) rename hotkeys.h => src/hotkeys.h (100%) rename init.c => src/init.c (100%) rename init.h => src/init.h (100%) rename input.c => src/input.c (100%) rename input.h => src/input.h (100%) rename io.c => src/io.c (100%) rename io.h => src/io.h (100%) rename keyboard.c => src/keyboard.c (100%) rename keyboard.h => src/keyboard.h (100%) rename layers.c => src/layers.c (100%) rename layers.h => src/layers.h (100%) rename libraw2crtc.c => src/libraw2crtc.c (100%) rename libraw2crtc.h => src/libraw2crtc.h (100%) rename loadsave.c => src/loadsave.c (100%) rename loadsave.h => src/loadsave.h (100%) rename main.c => src/main.c (100%) rename misc.c => src/misc.c (100%) rename misc.h => src/misc.h (100%) rename miscfileformats.c => src/miscfileformats.c (100%) rename mountlist.c => src/mountlist.c (100%) rename mountlist.h => src/mountlist.h (100%) rename op_c.c => src/op_c.c (100%) rename op_c.h => src/op_c.h (100%) rename operatio.c => src/operatio.c (100%) rename operatio.h => src/operatio.h (100%) rename pages.c => src/pages.c (100%) rename pages.h => src/pages.h (100%) rename palette.c => src/palette.c (100%) rename palette.h => src/palette.h (100%) rename pversion.c => src/pversion.c (100%) rename pxdouble.c => src/pxdouble.c (100%) rename pxdouble.h => src/pxdouble.h (100%) rename pxquad.c => src/pxquad.c (100%) rename pxquad.h => src/pxquad.h (100%) rename pxsimple.c => src/pxsimple.c (100%) rename pxsimple.h => src/pxsimple.h (100%) rename pxtall.c => src/pxtall.c (100%) rename pxtall.h => src/pxtall.h (100%) rename pxtall2.c => src/pxtall2.c (100%) rename pxtall2.h => src/pxtall2.h (100%) rename pxtriple.c => src/pxtriple.c (100%) rename pxtriple.h => src/pxtriple.h (100%) rename pxwide.c => src/pxwide.c (100%) rename pxwide.h => src/pxwide.h (100%) rename pxwide2.c => src/pxwide2.c (100%) rename pxwide2.h => src/pxwide2.h (100%) rename readini.c => src/readini.c (100%) rename readini.h => src/readini.h (100%) rename readline.c => src/readline.c (100%) rename readline.h => src/readline.h (100%) rename realpath.c => src/realpath.c (100%) rename realpath.h => src/realpath.h (100%) rename saveini.c => src/saveini.c (100%) rename saveini.h => src/saveini.h (100%) rename sdlscreen.c => src/sdlscreen.c (100%) rename sdlscreen.h => src/sdlscreen.h (100%) rename setup.c => src/setup.c (90%) rename setup.h => src/setup.h (100%) rename shade.c => src/shade.c (100%) rename shade.h => src/shade.h (100%) rename special.c => src/special.c (100%) rename special.h => src/special.h (100%) rename struct.h => src/struct.h (100%) rename text.c => src/text.c (100%) rename text.h => src/text.h (100%) rename transform.c => src/transform.c (100%) rename transform.h => src/transform.h (100%) rename windows.c => src/windows.c (100%) rename windows.h => src/windows.h (100%) rename Doxyfile => tools/Doxyfile (99%) rename {doc => tools}/footer.html (100%) diff --git a/SDL.dll b/bin/SDL.dll similarity index 100% rename from SDL.dll rename to bin/SDL.dll diff --git a/SDL_image.dll b/bin/SDL_image.dll similarity index 100% rename from SDL_image.dll rename to bin/SDL_image.dll diff --git a/SDL_ttf.dll b/bin/SDL_ttf.dll similarity index 100% rename from SDL_ttf.dll rename to bin/SDL_ttf.dll diff --git a/libfreetype-6.dll b/bin/libfreetype-6.dll similarity index 100% rename from libfreetype-6.dll rename to bin/libfreetype-6.dll diff --git a/libpng13.dll b/bin/libpng13.dll similarity index 100% rename from libpng13.dll rename to bin/libpng13.dll diff --git a/zlib1.dll b/bin/zlib1.dll similarity index 100% rename from zlib1.dll rename to bin/zlib1.dll diff --git a/fonts/5pxtinyfont.png b/share/grafx2/fonts/5pxtinyfont.png similarity index 100% rename from fonts/5pxtinyfont.png rename to share/grafx2/fonts/5pxtinyfont.png diff --git a/fonts/8pxfont.png b/share/grafx2/fonts/8pxfont.png similarity index 100% rename from fonts/8pxfont.png rename to share/grafx2/fonts/8pxfont.png diff --git a/fonts/GrafX2_Black.gif b/share/grafx2/fonts/GrafX2_Black.gif similarity index 100% rename from fonts/GrafX2_Black.gif rename to share/grafx2/fonts/GrafX2_Black.gif diff --git a/fonts/GrafX2_Dark.gif b/share/grafx2/fonts/GrafX2_Dark.gif similarity index 100% rename from fonts/GrafX2_Dark.gif rename to share/grafx2/fonts/GrafX2_Dark.gif diff --git a/fonts/Tuffy.ttf b/share/grafx2/fonts/Tuffy.ttf similarity index 100% rename from fonts/Tuffy.ttf rename to share/grafx2/fonts/Tuffy.ttf diff --git a/fonts/colorfont.pcx b/share/grafx2/fonts/colorfont.pcx similarity index 100% rename from fonts/colorfont.pcx rename to share/grafx2/fonts/colorfont.pcx diff --git a/gfx2.gif b/share/grafx2/gfx2.gif similarity index 100% rename from gfx2.gif rename to share/grafx2/gfx2.gif diff --git a/gfx2.png b/share/grafx2/gfx2.png similarity index 100% rename from gfx2.png rename to share/grafx2/gfx2.png diff --git a/gfx2def.ini b/share/grafx2/gfx2def.ini similarity index 100% rename from gfx2def.ini rename to share/grafx2/gfx2def.ini diff --git a/scripts/_tst_AAFilter.lua b/share/grafx2/scripts/_tst_AAFilter.lua similarity index 100% rename from scripts/_tst_AAFilter.lua rename to share/grafx2/scripts/_tst_AAFilter.lua diff --git a/scripts/_tst_GradientBrush.lua b/share/grafx2/scripts/_tst_GradientBrush.lua similarity index 100% rename from scripts/_tst_GradientBrush.lua rename to share/grafx2/scripts/_tst_GradientBrush.lua diff --git a/scripts/_tst_Settings.lua b/share/grafx2/scripts/_tst_Settings.lua similarity index 100% rename from scripts/_tst_Settings.lua rename to share/grafx2/scripts/_tst_Settings.lua diff --git a/scripts/bru_db_Amigaball.lua b/share/grafx2/scripts/bru_db_Amigaball.lua similarity index 100% rename from scripts/bru_db_Amigaball.lua rename to share/grafx2/scripts/bru_db_Amigaball.lua diff --git a/scripts/bru_db_ColorSphere.lua b/share/grafx2/scripts/bru_db_ColorSphere.lua similarity index 100% rename from scripts/bru_db_ColorSphere.lua rename to share/grafx2/scripts/bru_db_ColorSphere.lua diff --git a/scripts/bru_db_FindAA.lua b/share/grafx2/scripts/bru_db_FindAA.lua similarity index 100% rename from scripts/bru_db_FindAA.lua rename to share/grafx2/scripts/bru_db_FindAA.lua diff --git a/scripts/bru_db_Fisheye.lua b/share/grafx2/scripts/bru_db_Fisheye.lua similarity index 100% rename from scripts/bru_db_Fisheye.lua rename to share/grafx2/scripts/bru_db_Fisheye.lua diff --git a/scripts/bru_db_GrayscaleAvg.lua b/share/grafx2/scripts/bru_db_GrayscaleAvg.lua similarity index 100% rename from scripts/bru_db_GrayscaleAvg.lua rename to share/grafx2/scripts/bru_db_GrayscaleAvg.lua diff --git a/scripts/bru_db_GrayscaleDesat.lua b/share/grafx2/scripts/bru_db_GrayscaleDesat.lua similarity index 100% rename from scripts/bru_db_GrayscaleDesat.lua rename to share/grafx2/scripts/bru_db_GrayscaleDesat.lua diff --git a/scripts/bru_db_Halfsmooth.lua b/share/grafx2/scripts/bru_db_Halfsmooth.lua similarity index 100% rename from scripts/bru_db_Halfsmooth.lua rename to share/grafx2/scripts/bru_db_Halfsmooth.lua diff --git a/scripts/bru_db_Mandelbrot.lua b/share/grafx2/scripts/bru_db_Mandelbrot.lua similarity index 100% rename from scripts/bru_db_Mandelbrot.lua rename to share/grafx2/scripts/bru_db_Mandelbrot.lua diff --git a/scripts/bru_db_Waves.lua b/share/grafx2/scripts/bru_db_Waves.lua similarity index 100% rename from scripts/bru_db_Waves.lua rename to share/grafx2/scripts/bru_db_Waves.lua diff --git a/scripts/pal_db_Desaturate.lua b/share/grafx2/scripts/pal_db_Desaturate.lua similarity index 100% rename from scripts/pal_db_Desaturate.lua rename to share/grafx2/scripts/pal_db_Desaturate.lua diff --git a/scripts/pal_db_ExpandColors.lua b/share/grafx2/scripts/pal_db_ExpandColors.lua similarity index 100% rename from scripts/pal_db_ExpandColors.lua rename to share/grafx2/scripts/pal_db_ExpandColors.lua diff --git a/scripts/pal_db_FillColorCube.lua b/share/grafx2/scripts/pal_db_FillColorCube.lua similarity index 100% rename from scripts/pal_db_FillColorCube.lua rename to share/grafx2/scripts/pal_db_FillColorCube.lua diff --git a/scripts/pal_db_InvertedRGB.lua b/share/grafx2/scripts/pal_db_InvertedRGB.lua similarity index 100% rename from scripts/pal_db_InvertedRGB.lua rename to share/grafx2/scripts/pal_db_InvertedRGB.lua diff --git a/scripts/pal_db_Set3bit.lua b/share/grafx2/scripts/pal_db_Set3bit.lua similarity index 100% rename from scripts/pal_db_Set3bit.lua rename to share/grafx2/scripts/pal_db_Set3bit.lua diff --git a/scripts/pal_db_Set6bit.lua b/share/grafx2/scripts/pal_db_Set6bit.lua similarity index 100% rename from scripts/pal_db_Set6bit.lua rename to share/grafx2/scripts/pal_db_Set6bit.lua diff --git a/scripts/pal_db_SetC64Palette.lua b/share/grafx2/scripts/pal_db_SetC64Palette.lua similarity index 100% rename from scripts/pal_db_SetC64Palette.lua rename to share/grafx2/scripts/pal_db_SetC64Palette.lua diff --git a/scripts/pal_db_ShiftHue.lua b/share/grafx2/scripts/pal_db_ShiftHue.lua similarity index 100% rename from scripts/pal_db_ShiftHue.lua rename to share/grafx2/scripts/pal_db_ShiftHue.lua diff --git a/scripts/pic_db_Pic2isometric.lua b/share/grafx2/scripts/pic_db_Pic2isometric.lua similarity index 100% rename from scripts/pic_db_Pic2isometric.lua rename to share/grafx2/scripts/pic_db_Pic2isometric.lua diff --git a/scripts/pic_db_Rainbow-Dark2Bright.lua b/share/grafx2/scripts/pic_db_Rainbow-Dark2Bright.lua similarity index 100% rename from scripts/pic_db_Rainbow-Dark2Bright.lua rename to share/grafx2/scripts/pic_db_Rainbow-Dark2Bright.lua diff --git a/scripts/pic_db_SierpinskyCarpet.lua b/share/grafx2/scripts/pic_db_SierpinskyCarpet.lua similarity index 100% rename from scripts/pic_db_SierpinskyCarpet.lua rename to share/grafx2/scripts/pic_db_SierpinskyCarpet.lua diff --git a/scripts/pic_db_SierpinskyTriangle.lua b/share/grafx2/scripts/pic_db_SierpinskyTriangle.lua similarity index 100% rename from scripts/pic_db_SierpinskyTriangle.lua rename to share/grafx2/scripts/pic_db_SierpinskyTriangle.lua diff --git a/scripts/pic_ni_Colorspace12bit.lua b/share/grafx2/scripts/pic_ni_Colorspace12bit.lua similarity index 100% rename from scripts/pic_ni_Colorspace12bit.lua rename to share/grafx2/scripts/pic_ni_Colorspace12bit.lua diff --git a/scripts/pic_ni_Colorspace15bit.lua b/share/grafx2/scripts/pic_ni_Colorspace15bit.lua similarity index 100% rename from scripts/pic_ni_Colorspace15bit.lua rename to share/grafx2/scripts/pic_ni_Colorspace15bit.lua diff --git a/scripts/pic_ni_Colorspace18bit.lua b/share/grafx2/scripts/pic_ni_Colorspace18bit.lua similarity index 100% rename from scripts/pic_ni_Colorspace18bit.lua rename to share/grafx2/scripts/pic_ni_Colorspace18bit.lua diff --git a/scripts/pic_ni_GlassGridFilter.lua b/share/grafx2/scripts/pic_ni_GlassGridFilter.lua similarity index 100% rename from scripts/pic_ni_GlassGridFilter.lua rename to share/grafx2/scripts/pic_ni_GlassGridFilter.lua diff --git a/scripts/pic_ni_Grid8.lua b/share/grafx2/scripts/pic_ni_Grid8.lua similarity index 100% rename from scripts/pic_ni_Grid8.lua rename to share/grafx2/scripts/pic_ni_Grid8.lua diff --git a/scripts/pic_ni_Grid8red.lua b/share/grafx2/scripts/pic_ni_Grid8red.lua similarity index 100% rename from scripts/pic_ni_Grid8red.lua rename to share/grafx2/scripts/pic_ni_Grid8red.lua diff --git a/scripts/pic_ni_GridIso.lua b/share/grafx2/scripts/pic_ni_GridIso.lua similarity index 100% rename from scripts/pic_ni_GridIso.lua rename to share/grafx2/scripts/pic_ni_GridIso.lua diff --git a/scripts/pic_ni_PaletteX1.lua b/share/grafx2/scripts/pic_ni_PaletteX1.lua similarity index 100% rename from scripts/pic_ni_PaletteX1.lua rename to share/grafx2/scripts/pic_ni_PaletteX1.lua diff --git a/scripts/pic_ni_PaletteX8.lua b/share/grafx2/scripts/pic_ni_PaletteX8.lua similarity index 100% rename from scripts/pic_ni_PaletteX8.lua rename to share/grafx2/scripts/pic_ni_PaletteX8.lua diff --git a/scripts/scn_db_RemapImage2RGB.lua b/share/grafx2/scripts/scn_db_RemapImage2RGB.lua similarity index 100% rename from scripts/scn_db_RemapImage2RGB.lua rename to share/grafx2/scripts/scn_db_RemapImage2RGB.lua diff --git a/scripts/scn_db_RemapImage2RGB_ed.lua b/share/grafx2/scripts/scn_db_RemapImage2RGB_ed.lua similarity index 100% rename from scripts/scn_db_RemapImage2RGB_ed.lua rename to share/grafx2/scripts/scn_db_RemapImage2RGB_ed.lua diff --git a/scripts/scn_db_RemapImageTo3bitPal.lua b/share/grafx2/scripts/scn_db_RemapImageTo3bitPal.lua similarity index 100% rename from scripts/scn_db_RemapImageTo3bitPal.lua rename to share/grafx2/scripts/scn_db_RemapImageTo3bitPal.lua diff --git a/skins/font_Classic.png b/share/grafx2/skins/font_Classic.png similarity index 100% rename from skins/font_Classic.png rename to share/grafx2/skins/font_Classic.png diff --git a/skins/font_DPaint.png b/share/grafx2/skins/font_DPaint.png similarity index 100% rename from skins/font_DPaint.png rename to share/grafx2/skins/font_DPaint.png diff --git a/skins/font_Fairlight.png b/share/grafx2/skins/font_Fairlight.png similarity index 100% rename from skins/font_Fairlight.png rename to share/grafx2/skins/font_Fairlight.png diff --git a/skins/font_Fun.png b/share/grafx2/skins/font_Fun.png similarity index 100% rename from skins/font_Fun.png rename to share/grafx2/skins/font_Fun.png diff --git a/skins/font_Melon.png b/share/grafx2/skins/font_Melon.png similarity index 100% rename from skins/font_Melon.png rename to share/grafx2/skins/font_Melon.png diff --git a/skins/skin_DPaint.png b/share/grafx2/skins/skin_DPaint.png similarity index 100% rename from skins/skin_DPaint.png rename to share/grafx2/skins/skin_DPaint.png diff --git a/skins/skin_classic.png b/share/grafx2/skins/skin_classic.png similarity index 100% rename from skins/skin_classic.png rename to share/grafx2/skins/skin_classic.png diff --git a/skins/skin_modern.png b/share/grafx2/skins/skin_modern.png similarity index 100% rename from skins/skin_modern.png rename to share/grafx2/skins/skin_modern.png diff --git a/skins/skin_remapped.png b/share/grafx2/skins/skin_remapped.png similarity index 100% rename from skins/skin_remapped.png rename to share/grafx2/skins/skin_remapped.png diff --git a/.DS_Store b/src/.DS_Store similarity index 100% rename from .DS_Store rename to src/.DS_Store diff --git a/English.lproj/InfoPlist.strings b/src/English.lproj/InfoPlist.strings similarity index 100% rename from English.lproj/InfoPlist.strings rename to src/English.lproj/InfoPlist.strings diff --git a/Grafx2.xcodeproj/project.pbxproj b/src/Grafx2.xcodeproj/project.pbxproj similarity index 100% rename from Grafx2.xcodeproj/project.pbxproj rename to src/Grafx2.xcodeproj/project.pbxproj diff --git a/Grafx2.xcodeproj/xx.pbxuser b/src/Grafx2.xcodeproj/xx.pbxuser similarity index 100% rename from Grafx2.xcodeproj/xx.pbxuser rename to src/Grafx2.xcodeproj/xx.pbxuser diff --git a/Grafx2.xcodeproj/xx.perspective b/src/Grafx2.xcodeproj/xx.perspective similarity index 100% rename from Grafx2.xcodeproj/xx.perspective rename to src/Grafx2.xcodeproj/xx.perspective diff --git a/Grafx2_Prefix.pch b/src/Grafx2_Prefix.pch similarity index 100% rename from Grafx2_Prefix.pch rename to src/Grafx2_Prefix.pch diff --git a/Makefile b/src/Makefile similarity index 81% rename from Makefile rename to src/Makefile index 423dcc39..96ef059e 100644 --- a/Makefile +++ b/src/Makefile @@ -41,18 +41,18 @@ ifdef COMSPEC MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2.exe + BIN = ../bin/grafx2.exe COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb `sdl-config --cflags` $(TTFCOPT) $(JOYCOPT) $(LUACOPT) $(LAYERCOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) LUALOPT = -llua CC = gcc - OBJDIR = obj/win32 + OBJDIR = ../obj/win32 # Resources (icon) WINDRES = windres.exe PLATFORMOBJ = $(OBJDIR)/winres.o PLATFORM = win32 #some misc files we have to add to the release archive under windows. - PLATFORMFILES = SDL.dll SDL_image.dll libpng13.dll zlib1.dll gfx2.ico $(TTFLIBS) + PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll bin/libpng13.dll bin/zlib1.dll $(TTFLIBS) ZIP = zip else @@ -65,11 +65,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -Wall -c -gstabs -mcrt=newlib `sdl-config --cflags` -I/SDK/Local/common/include/SDL -D__USE_INLINE__ $(TTFCOPT) LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lft2 CC = gcc - OBJDIR = obj/amiga + OBJDIR = ../obj/amiga ZIP = lha ZIPOPT = a @@ -82,7 +82,7 @@ else CP = cp ZIP = zip PLATFORMFILES = gfx2.png - BIN = grafx2 + BIN = ../bin/grafx2 # Where the SDL frameworks are located FWDIR = /Library/Frameworks SDLCOPT = -arch i386 -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE @@ -92,7 +92,7 @@ else # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. CC = gcc #CC = nccgen -ncgcc -ncld -ncfabs - OBJDIR = obj/macosx + OBJDIR = ../obj/macosx PLATFORMOBJ = $(OBJDIR)/SDLMain.o X11LOPT = MACAPPEXE = Grafx2.app/Contents/MacOS/Grafx2 @@ -104,11 +104,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -Wall -g `sdl-config --cflags` $(TTFCOPT) LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared CC = gcc - OBJDIR = obj/aros + OBJDIR = ../obj/aros STRIP = strip --strip-unneeded --remove-section .comment ZIP = lha ZIPOPT = a @@ -120,14 +120,14 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -Wall -gstabs -c `sdl-config --cflags` $(TTFCOPT) LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) CC = gcc - OBJDIR = obj/morphos + OBJDIR = ../obj/morphos ZIP = lha ZIPOPT = a - PLATFORMFILES = misc/grafx2.info + PLATFORMFILES = ../misc/grafx2.info else ifeq ($(PLATFORM),AMIGA) # 5 @@ -136,11 +136,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -Wall -gstabs -c `sdl-config --cflags` $(TTFCOPT) LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype CC = gcc - OBJDIR = obj/amiga + OBJDIR = ../obj/amiga ZIP = lha ZIPOPT = a @@ -151,11 +151,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT) -I/boot/home/config/include LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) CC = gcc - OBJDIR = obj/beos + OBJDIR = ../obj/beos ZIP = zip else @@ -165,11 +165,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT) -I/boot/common/include LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) CC = gcc - OBJDIR = obj/haiku + OBJDIR = ../obj/haiku ZIP = zip else @@ -179,11 +179,11 @@ else MKDIR = mkdir -p RMDIR = rmdir CP = cp - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -W -Wall -Wdeclaration-after-statement -c -g `sdl-config --cflags` $(TTFCOPT) LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) CC = gcc - OBJDIR = obj/skyos + OBJDIR = ../obj/skyos ZIP = zip else @@ -195,10 +195,10 @@ else CP = cp ZIP = zip PLATFORMFILES = gfx2.png - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -W -Wall -std=c99 -c -g -gstabs -D__TRU64__ `sdl-config --cflags` $(TTFCOPT) $(LUACOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) -lm - OBJDIR = obj/unix + OBJDIR = ../obj/unix X11LOPT = -lX11 CC = gcc @@ -210,10 +210,10 @@ else MKDIR = makedir RMDIR= delete CP = copy - BIN = grafx2 + BIN = ../bin/grafx2 COPT = -c99 -Ivbcc:PosixLib/include -D__amigaos__ $(TTFCOPT) CC = vc - OBJDIR = obj/amiga-vbcc + OBJDIR = ../obj/amiga-vbcc ZIP = lha ZIPOPT = a @@ -236,34 +236,34 @@ else ifdef WIN32CROSS #cross compile a Win32 executable CC = i586-mingw32msvc-gcc - BIN = grafx2.exe + BIN = ../bin/grafx2.exe COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT) LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs` -lSDL_image $(TTFLOPT) - OBJDIR = obj/win32 + OBJDIR = ../obj/win32 PLATFORM = win32 else ifdef GP2XCROSS #cross compile an exec for the gp2x CC = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-gcc - BIN = grafx2.gpe + BIN = ../grafx2.gpe COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -static -g -O3 -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --cflags` $(TTFCOPT) -D__GP2X__ LOPT = -static -lSDL_image `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --static-libs` -ljpeg -lpng -lz -lm $(TTFLOPT) - OBJDIR = obj/gp2x + OBJDIR = ../obj/gp2x NOTTF = 1 PLATFORM = gp2x STRIP = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-strip JOYCOPT = -DUSE_JOYSTICK else - # Compiles a regular linux exectutable for the native platform - BIN = grafx2 + # Compiles a regular linux executable for the native platform + BIN = ../bin/grafx2 COPT = -W -Wall -Wdeclaration-after-statement -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) $(LUACOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) -lm # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. CC = gcc #CC = nccgen -ncgcc -ncld -ncfabs - OBJDIR = obj/unix + OBJDIR = ../obj/unix X11LOPT = -lX11 endif endif @@ -290,7 +290,7 @@ ifeq ($(NOTTF),1) else TTFCOPT = TTFLOPT = -L/usr/local/lib -lSDL_ttf $(X11LOPT) - TTFLIBS = libfreetype-6.dll SDL_ttf.dll + TTFLIBS = bin/libfreetype-6.dll bin/SDL_ttf.dll TTFLABEL = endif @@ -328,7 +328,7 @@ endif # This is the list of the objects we want to build. Dependancies are built by "make depend" automatically. OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o $(OBJDIR)/factory.o $(PLATFORMOBJ) $(OBJDIR)/fileformats.o $(OBJDIR)/miscfileformats.o $(OBJDIR)/libraw2crtc.o $(OBJDIR)/brush_ops.o $(OBJDIR)/buttons_effects.o $(OBJDIR)/layers.o -SKIN_FILES = skins/skin_classic.png skins/skin_modern.png skins/font_Classic.png skins/font_Fun.png +SKIN_FILES = ../share/grafx2/skins/skin_classic.png ../share/grafx2/skins/skin_modern.png ../share/grafx2/skins/font_Classic.png ../share/grafx2/skins/font_Fun.png ifeq ($(PLATFORM),Darwin) all : $(MACAPPEXE) @@ -360,16 +360,17 @@ release : version $(BIN) ziprelease: version $(BIN) release echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.`svnversion` | tr " :" "_-" | sed -e "s/\(wip\)\\./\1/I" > $(OBJDIR)/versiontag - tar cvzf "src-`cat $(OBJDIR)/versiontag`.tgz" --transform 's,^,src/,g' *.c *.h Makefile Makefile.dep gfx2.ico - $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN) gfx2def.ini scripts/bru_*.lua scripts/pal_*.lua scripts/pic_*.lua scripts/scn_*.lua $(SKIN_FILES) gfx2.gif doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt fonts/8pxfont.png doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt fonts/Tuffy.ttf src-`cat $(OBJDIR)/versiontag`.tgz $(PLATFORMFILES) - $(DELCOMMAND) "src-`cat $(OBJDIR)/versiontag`.tgz" - tar cvzf "grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-src.tgz" --transform 's,^,grafx2/,g' *.c *.h Makefile Makefile.dep gfx2def.ini scripts/bru_*.lua scripts/pal_*.lua scripts/pic_*.lua scripts/scn_*.lua $(SKIN_FILES) gfx2.ico gfx2.gif doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt misc/unix/grafx2.1 misc/unix/grafx2.xpm misc/unix/grafx2.desktop fonts/8pxfont.png fonts/Tuffy.ttf + tar cvzf "../src-`cat $(OBJDIR)/versiontag`.tgz" --strip=1 ../src/*.c ../src/*.h ../src/Makefile ../src/Makefile.dep ../src/gfx2.ico + cd .. && $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR:../%=%)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN:../%=%) share/grafx2/gfx2def.ini share/grafx2/scripts/bru_*.lua share/grafx2/scripts/pal_*.lua share/grafx2/scripts/pic_*.lua share/grafx2/scripts/scn_*.lua $(SKIN_FILES:../%=%) share/grafx2/gfx2.gif doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt share/grafx2/fonts/8pxfont.png doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt share/grafx2/fonts/Tuffy.ttf src-`cat $(OBJDIR:../%=%)/versiontag`.tgz $(PLATFORMFILES:../%=%) + $(DELCOMMAND) "../src-`cat $(OBJDIR)/versiontag`.tgz" + tar cvzf "../grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-src.tgz" --strip=1 --transform 's,^,grafx2/,g' ../src/*.c ../src/*.h ../src/Makefile ../src/Makefile.dep ../share/grafx2/gfx2def.ini ../share/grafx2/scripts/bru_*.lua ../share/grafx2/scripts/pal_*.lua ../share/grafx2/scripts/pic_*.lua ../share/grafx2/scripts/scn_*.lua $(SKIN_FILES) ../src/gfx2.ico ../share/grafx2/gfx2.gif ../doc/README.txt ../doc/COMPILING.txt ../doc/gpl-2.0.txt ../misc/unix/grafx2.1 ../misc/unix/grafx2.xpm ../misc/unix/grafx2.desktop ../share/grafx2/fonts/8pxfont.png ../share/grafx2/fonts/Tuffy.ttf $(DELCOMMAND) "$(OBJDIR)/versiontag" testsed : $(BIN) : $(OBJ) - $(CC) $(OBJ) -o $(BIN) $(LOPT) + test -d ../bin || $(MKDIR) ../bin + $(CC) $(OBJ) -o $(BIN) $(LOPT) $(LFLAGS) # SVN revision number version.c : @@ -420,33 +421,27 @@ install : $(BIN) test -d $(DESTDIR)$(datadir)/grafx2/skins || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/skins test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications test -d $(DESTDIR)$(datadir)/icons || $(MKDIR) $(DESTDIR)$(datadir)/icons - # Generate launcher script - echo "#!/bin/sh" > $(DESTDIR)$(bindir)/grafx2 - echo $(datadir)/grafx2/$(BIN) '$$*' >> $(DESTDIR)$(bindir)/grafx2 - chmod 755 $(DESTDIR)$(bindir)/grafx2 # Copy files - $(CP) $(BIN) $(DESTDIR)$(datadir)/grafx2/ - $(CP) gfx2def.ini $(DESTDIR)$(datadir)/grafx2/ - $(CP) gfx2.gif $(DESTDIR)$(datadir)/grafx2/ - $(CP) fonts/* $(DESTDIR)$(datadir)/grafx2/fonts/ + $(CP) $(BIN) $(DESTDIR)$(bindir) + $(CP) ../share/grafx2/gfx2def.ini $(DESTDIR)$(datadir)/grafx2/ + $(CP) ../share/grafx2/gfx2.gif $(DESTDIR)$(datadir)/grafx2/ + $(CP) ../share/grafx2/fonts/* $(DESTDIR)$(datadir)/grafx2/fonts/ $(CP) $(SKIN_FILES) $(DESTDIR)$(datadir)/grafx2/skins/ # Icon and desktop file for debian - $(CP) misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/ - $(CP) misc/unix/grafx2.xpm $(DESTDIR)$(datadir)/icons/ + $(CP) ../misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/ + $(CP) ../misc/unix/grafx2.xpm $(DESTDIR)$(datadir)/icons/ @echo Install complete # Linux uninstallation of the program uninstall : $(DELCOMMAND) $(DESTDIR)$(bindir)/grafx2 - $(DELCOMMAND) $(DESTDIR)$(datadir)/grafx2/$(BIN) $(DELCOMMAND) $(DESTDIR)$(datadir)/grafx2/gfx2def.ini $(DELCOMMAND) $(DESTDIR)$(datadir)/grafx2/gfx2.gif $(DELCOMMAND) $(DESTDIR)$(datadir)/grafx2/fonts/* $(if $(wildcard $(DESTDIR)$(datadir)/grafx2/fonts),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2/fonts) - cd $(DESTDIR)$(datadir)/grafx2 - $(DELCOMMAND) $(SKIN_FILES) - cd .. + cd $(DESTDIR)$(datadir) && $(DELCOMMAND) $(SKIN_FILES) $(if $(wildcard $(DESTDIR)$(datadir)/grafx2/skins),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2/skins) + $(if $(wildcard $(DESTDIR)$(datadir)/grafx2),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2) # Icon and desktop file for debian $(DELCOMMAND) $(DESTDIR)$(datadir)/applications/grafx2.desktop $(DELCOMMAND) $(DESTDIR)$(datadir)/icons/grafx2.xpm diff --git a/Makefile.dep b/src/Makefile.dep similarity index 100% rename from Makefile.dep rename to src/Makefile.dep diff --git a/SDLMain.h b/src/SDLMain.h similarity index 100% rename from SDLMain.h rename to src/SDLMain.h diff --git a/SDLMain.m b/src/SDLMain.m similarity index 100% rename from SDLMain.m rename to src/SDLMain.m diff --git a/SFont.c b/src/SFont.c similarity index 100% rename from SFont.c rename to src/SFont.c diff --git a/SFont.h b/src/SFont.h similarity index 100% rename from SFont.h rename to src/SFont.h diff --git a/brush.c b/src/brush.c similarity index 100% rename from brush.c rename to src/brush.c diff --git a/brush.h b/src/brush.h similarity index 100% rename from brush.h rename to src/brush.h diff --git a/brush_ops.c b/src/brush_ops.c similarity index 100% rename from brush_ops.c rename to src/brush_ops.c diff --git a/buttons.c b/src/buttons.c similarity index 100% rename from buttons.c rename to src/buttons.c diff --git a/buttons.h b/src/buttons.h similarity index 100% rename from buttons.h rename to src/buttons.h diff --git a/buttons_effects.c b/src/buttons_effects.c similarity index 100% rename from buttons_effects.c rename to src/buttons_effects.c diff --git a/const.h b/src/const.h similarity index 100% rename from const.h rename to src/const.h diff --git a/engine.c b/src/engine.c similarity index 100% rename from engine.c rename to src/engine.c diff --git a/engine.h b/src/engine.h similarity index 100% rename from engine.h rename to src/engine.h diff --git a/errors.h b/src/errors.h similarity index 100% rename from errors.h rename to src/errors.h diff --git a/factory.c b/src/factory.c similarity index 100% rename from factory.c rename to src/factory.c diff --git a/factory.h b/src/factory.h similarity index 100% rename from factory.h rename to src/factory.h diff --git a/fileformats.c b/src/fileformats.c similarity index 100% rename from fileformats.c rename to src/fileformats.c diff --git a/filesel.c b/src/filesel.c similarity index 100% rename from filesel.c rename to src/filesel.c diff --git a/filesel.h b/src/filesel.h similarity index 100% rename from filesel.h rename to src/filesel.h diff --git a/gfx2.ico b/src/gfx2.ico similarity index 100% rename from gfx2.ico rename to src/gfx2.ico diff --git a/global.h b/src/global.h similarity index 100% rename from global.h rename to src/global.h diff --git a/graph.c b/src/graph.c similarity index 100% rename from graph.c rename to src/graph.c diff --git a/graph.h b/src/graph.h similarity index 100% rename from graph.h rename to src/graph.h diff --git a/help.c b/src/help.c similarity index 100% rename from help.c rename to src/help.c diff --git a/help.h b/src/help.h similarity index 100% rename from help.h rename to src/help.h diff --git a/helpfile.h b/src/helpfile.h similarity index 100% rename from helpfile.h rename to src/helpfile.h diff --git a/hotkeys.c b/src/hotkeys.c similarity index 100% rename from hotkeys.c rename to src/hotkeys.c diff --git a/hotkeys.h b/src/hotkeys.h similarity index 100% rename from hotkeys.h rename to src/hotkeys.h diff --git a/init.c b/src/init.c similarity index 100% rename from init.c rename to src/init.c diff --git a/init.h b/src/init.h similarity index 100% rename from init.h rename to src/init.h diff --git a/input.c b/src/input.c similarity index 100% rename from input.c rename to src/input.c diff --git a/input.h b/src/input.h similarity index 100% rename from input.h rename to src/input.h diff --git a/io.c b/src/io.c similarity index 100% rename from io.c rename to src/io.c diff --git a/io.h b/src/io.h similarity index 100% rename from io.h rename to src/io.h diff --git a/keyboard.c b/src/keyboard.c similarity index 100% rename from keyboard.c rename to src/keyboard.c diff --git a/keyboard.h b/src/keyboard.h similarity index 100% rename from keyboard.h rename to src/keyboard.h diff --git a/layers.c b/src/layers.c similarity index 100% rename from layers.c rename to src/layers.c diff --git a/layers.h b/src/layers.h similarity index 100% rename from layers.h rename to src/layers.h diff --git a/libraw2crtc.c b/src/libraw2crtc.c similarity index 100% rename from libraw2crtc.c rename to src/libraw2crtc.c diff --git a/libraw2crtc.h b/src/libraw2crtc.h similarity index 100% rename from libraw2crtc.h rename to src/libraw2crtc.h diff --git a/loadsave.c b/src/loadsave.c similarity index 100% rename from loadsave.c rename to src/loadsave.c diff --git a/loadsave.h b/src/loadsave.h similarity index 100% rename from loadsave.h rename to src/loadsave.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/misc.c b/src/misc.c similarity index 100% rename from misc.c rename to src/misc.c diff --git a/misc.h b/src/misc.h similarity index 100% rename from misc.h rename to src/misc.h diff --git a/miscfileformats.c b/src/miscfileformats.c similarity index 100% rename from miscfileformats.c rename to src/miscfileformats.c diff --git a/mountlist.c b/src/mountlist.c similarity index 100% rename from mountlist.c rename to src/mountlist.c diff --git a/mountlist.h b/src/mountlist.h similarity index 100% rename from mountlist.h rename to src/mountlist.h diff --git a/op_c.c b/src/op_c.c similarity index 100% rename from op_c.c rename to src/op_c.c diff --git a/op_c.h b/src/op_c.h similarity index 100% rename from op_c.h rename to src/op_c.h diff --git a/operatio.c b/src/operatio.c similarity index 100% rename from operatio.c rename to src/operatio.c diff --git a/operatio.h b/src/operatio.h similarity index 100% rename from operatio.h rename to src/operatio.h diff --git a/pages.c b/src/pages.c similarity index 100% rename from pages.c rename to src/pages.c diff --git a/pages.h b/src/pages.h similarity index 100% rename from pages.h rename to src/pages.h diff --git a/palette.c b/src/palette.c similarity index 100% rename from palette.c rename to src/palette.c diff --git a/palette.h b/src/palette.h similarity index 100% rename from palette.h rename to src/palette.h diff --git a/pversion.c b/src/pversion.c similarity index 100% rename from pversion.c rename to src/pversion.c diff --git a/pxdouble.c b/src/pxdouble.c similarity index 100% rename from pxdouble.c rename to src/pxdouble.c diff --git a/pxdouble.h b/src/pxdouble.h similarity index 100% rename from pxdouble.h rename to src/pxdouble.h diff --git a/pxquad.c b/src/pxquad.c similarity index 100% rename from pxquad.c rename to src/pxquad.c diff --git a/pxquad.h b/src/pxquad.h similarity index 100% rename from pxquad.h rename to src/pxquad.h diff --git a/pxsimple.c b/src/pxsimple.c similarity index 100% rename from pxsimple.c rename to src/pxsimple.c diff --git a/pxsimple.h b/src/pxsimple.h similarity index 100% rename from pxsimple.h rename to src/pxsimple.h diff --git a/pxtall.c b/src/pxtall.c similarity index 100% rename from pxtall.c rename to src/pxtall.c diff --git a/pxtall.h b/src/pxtall.h similarity index 100% rename from pxtall.h rename to src/pxtall.h diff --git a/pxtall2.c b/src/pxtall2.c similarity index 100% rename from pxtall2.c rename to src/pxtall2.c diff --git a/pxtall2.h b/src/pxtall2.h similarity index 100% rename from pxtall2.h rename to src/pxtall2.h diff --git a/pxtriple.c b/src/pxtriple.c similarity index 100% rename from pxtriple.c rename to src/pxtriple.c diff --git a/pxtriple.h b/src/pxtriple.h similarity index 100% rename from pxtriple.h rename to src/pxtriple.h diff --git a/pxwide.c b/src/pxwide.c similarity index 100% rename from pxwide.c rename to src/pxwide.c diff --git a/pxwide.h b/src/pxwide.h similarity index 100% rename from pxwide.h rename to src/pxwide.h diff --git a/pxwide2.c b/src/pxwide2.c similarity index 100% rename from pxwide2.c rename to src/pxwide2.c diff --git a/pxwide2.h b/src/pxwide2.h similarity index 100% rename from pxwide2.h rename to src/pxwide2.h diff --git a/readini.c b/src/readini.c similarity index 100% rename from readini.c rename to src/readini.c diff --git a/readini.h b/src/readini.h similarity index 100% rename from readini.h rename to src/readini.h diff --git a/readline.c b/src/readline.c similarity index 100% rename from readline.c rename to src/readline.c diff --git a/readline.h b/src/readline.h similarity index 100% rename from readline.h rename to src/readline.h diff --git a/realpath.c b/src/realpath.c similarity index 100% rename from realpath.c rename to src/realpath.c diff --git a/realpath.h b/src/realpath.h similarity index 100% rename from realpath.h rename to src/realpath.h diff --git a/saveini.c b/src/saveini.c similarity index 100% rename from saveini.c rename to src/saveini.c diff --git a/saveini.h b/src/saveini.h similarity index 100% rename from saveini.h rename to src/saveini.h diff --git a/sdlscreen.c b/src/sdlscreen.c similarity index 100% rename from sdlscreen.c rename to src/sdlscreen.c diff --git a/sdlscreen.h b/src/sdlscreen.h similarity index 100% rename from sdlscreen.h rename to src/sdlscreen.h diff --git a/setup.c b/src/setup.c similarity index 90% rename from setup.c rename to src/setup.c index c9163c81..c3f9e1a5 100644 --- a/setup.c +++ b/src/setup.c @@ -92,11 +92,17 @@ void Set_program_directory(ARG_UNUSED const char * argv0,char * program_dir) // OUT: Write into data_dir. Trailing / or \ is kept. void Set_data_directory(const char * program_dir, char * data_dir) { - // On all platforms, data is in the executable's directory + // On all platforms, data is relative to the executable's directory strcpy(data_dir,program_dir); - // Except MacOSX, here it is stored in a special folder: + // On MacOSX, it is stored in a special folder: #if defined(__macosx__) strcat(data_dir,"Contents/Resources/"); + // On GP2X, executable is not in bin/ + #elif defined (__gp2x__) + strcat(data_dir,"share/grafx2/"); + // All other targets, program is in a "bin" subdirectory + #else + strcat(data_dir,"../share/grafx2/"); #endif } @@ -124,8 +130,12 @@ void Set_config_directory(const char * program_dir, char * config_dir) #else char filename[MAX_PATH_CHARACTERS]; - // In priority: check own directory + // In priority: check root directory strcpy(config_dir, program_dir); + // On all these targets except OSX and GP2X, the executable is in ./bin + #if !defined(__macosx__) && !defined(__gp2x__) + strcat(config_dir, "../"); + #endif strcpy(filename, config_dir); strcat(filename, "gfx2.cfg"); @@ -176,6 +186,9 @@ void Set_config_directory(const char * program_dir, char * config_dir) { // Echec: on se rabat sur le repertoire de l'executable. strcpy(config_dir,program_dir); + #if !defined(__macosx__) && !defined(__gp2x__) + strcat(config_dir, "../"); + #endif } } } diff --git a/setup.h b/src/setup.h similarity index 100% rename from setup.h rename to src/setup.h diff --git a/shade.c b/src/shade.c similarity index 100% rename from shade.c rename to src/shade.c diff --git a/shade.h b/src/shade.h similarity index 100% rename from shade.h rename to src/shade.h diff --git a/special.c b/src/special.c similarity index 100% rename from special.c rename to src/special.c diff --git a/special.h b/src/special.h similarity index 100% rename from special.h rename to src/special.h diff --git a/struct.h b/src/struct.h similarity index 100% rename from struct.h rename to src/struct.h diff --git a/text.c b/src/text.c similarity index 100% rename from text.c rename to src/text.c diff --git a/text.h b/src/text.h similarity index 100% rename from text.h rename to src/text.h diff --git a/transform.c b/src/transform.c similarity index 100% rename from transform.c rename to src/transform.c diff --git a/transform.h b/src/transform.h similarity index 100% rename from transform.h rename to src/transform.h diff --git a/windows.c b/src/windows.c similarity index 100% rename from windows.c rename to src/windows.c diff --git a/windows.h b/src/windows.h similarity index 100% rename from windows.h rename to src/windows.h diff --git a/Doxyfile b/tools/Doxyfile similarity index 99% rename from Doxyfile rename to tools/Doxyfile index 8c26f435..55c8fdd9 100644 --- a/Doxyfile +++ b/tools/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NUMBER = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = ../doxydoc/ +OUTPUT_DIRECTORY = ../../doxydoc/ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -782,7 +782,7 @@ HTML_HEADER = # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = doc/footer.html +HTML_FOOTER = ../tools/footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to diff --git a/doc/footer.html b/tools/footer.html similarity index 100% rename from doc/footer.html rename to tools/footer.html