m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,496 Commits 1 Branch 0 Tags
Commit Graph

69 Commits

Author SHA1 Message Date
Adrien Destugues
ff9f228b5f On Haiku, there are two different versions of gcc available (gcc2 and gcc4). Since 
mixing them in the same binary result in linker error, build them in separate dirs.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1961 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-06-02 09:05:54 +00:00
Adrien Destugues
493d998375 Use pkg-config to detect libpng when building for unix, this helps with Debian package system. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1955 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-05-13 07:02:13 +00:00
Yves Rizoud
641be48aad Removed last occurrence of 'NOLAYERS' and refreshed Makefile dependencies 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1915 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-04 17:10:26 +00:00
Franck Charlet
8ea1ab7fc8 fixed makefile for macosx again 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1905 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-02-20 19:56:52 +00:00
Adrien Destugues
46f2ec9475 Patch by Syllable software to complete Syllable support. Thanks! 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1900 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-15 13:52:31 +00:00
Adrien Destugues
941817b915 More fixes (still not ok...) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1897 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-08 21:52:35 +00:00
Adrien Destugues
44d8a23fbe More improvements to the makefile to get everything in. But still not working... 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1896 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-08 21:49:26 +00:00
Adrien Destugues
5a8d016691 Fix Makefile for Mac OS X: 
* Switch to Mac OS X Lion (doesn't xhange much, if someone still wants to do a build on Tiger for PPC support it's easy)
 * Cleanup things that got messed up by the $(shell) changes
 * Add some comments that can be uncommented when building with MacPorts, instead of the more official OSX frameworks. This seems easier to setup, but does not provide portable binaries (the SDL framework can't be embedded in the app).

Many thanks to Rikard Lang for giving access to an OSX computer so I could debug stuff!


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1892 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-08 20:32:02 +00:00
Adrien Destugues
ad7e0d3f1a OpenBSD compatibiliy patch from issue 461. 
Thanks !

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1886 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-01 13:05:45 +00:00
Adrien Destugues
48a3ccd54e Preliminary Syllable support. 
Completely untested...

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1880 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-12-30 19:14:38 +00:00
Adrien Destugues
d3a107bb7c Finished working on the new color lookup system. 
There is room for optimization and maybe bugfixing.
The cluster table size is now:
511*15 = 7665bytes, this is 1094 times better than the color table.

Please test and report your results !


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1874 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-11-22 21:38:03 +00:00
Yves Rizoud
914ec63c90 Compilation fix for GNU make v3.79 : "else ifeq" is only supported on v3.81+ 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1862 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-11-09 19:57:39 +00:00
Yves Rizoud
ef030fec3f Tilemap mode improved to analyze and detect identical tiles, so you write in real time on all occurences of same tile. Works very well but unfinished, will crash or have other problems when you resize image 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1859 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-11-08 23:11:18 +00:00
nokturnal
66ff11b4f2 added extra step for Atari MiNT/TOS target (cross and native builds). Explicit program flags and stack setting. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1822 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-08-03 16:16:05 +00:00
Yves Rizoud
51ddfe4f86 Fix build on Windows ( $shell in makefile). Lua: waitinput now additionally returns mouse position in image coordinates 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1819 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-07-16 18:57:55 +00:00
Adrien Destugues
e875597964 Merge the "CPC Mode 5" branch to trunk. 
Note this alsoincludes the "oldies" branch.

This has the following consequences :
[C64]
 * Loading and saving of screen-only, and color-only C64 picture is removed
 * Loading and saving in FLI mode is now possible
 * FLI constraint checker : tries to convert your image to FLI format, and put all the areas where it couldn't find a solution in a separate layer for you to fixup
 * This is currently accessible only with a shortcut. Menu will come next.
[Amstrad CPC]
 * Loading and saving of pictures in "Mode 5" is now possible. This custom format allows overscan mode 1 with rasters on 2 inks and split rasters on a 3rd one.
 * Mode 5 constraint enforcer : will ensure you can only draw pictures that are valid in mode 5. Each ink is seen as a layer.
 * This is accessible from a new button in the FX menu.
[Generic]
 * Added patch as I saw it : platform that don't support reporting "free space" on disk will not display anything (instead of "0 bytesÃ" as before)
 * For other platforms, when the free space is 0, we now have a disk full message.

The merge was not straight forward. I hope I didn't break too much things.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1810 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-19 20:15:22 +00:00
Adrien Destugues
706049a2d9 Merge all changes from trunk in CPCMode5 branch. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1809 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-19 18:30:53 +00:00
Adrien Destugues
f53734636d Use $(shell ...) instead of ... for calling the shell in variable configuration. 
Consequences :
 * This is a GNU Make extension, so it may not work with BSD Make and others
 * However, backticks relied on an sh shell, which may not be the case everywhere (AmigaOS comes to mind)

Why did I do that : $(shell) is evaluated at variable assignment, not each time a command with the variable is executed. This is cleaner and should get the build 
running a little faster.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1806 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-18 16:00:26 +00:00
nokturnal
78e1745ef1 replaced hardcoded lua script and libs paths with defines, Atari build stack adjustments (reduced it's size to 8k) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1800 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-15 22:40:43 +00:00
nokturnal
7184fb857f bugfix in Add_element_to_list(), there were changes in function interface, but they were not applied in function call, so this resulted in program hang when calling fileselector. 
Bugfix there was no Atari_Memory_free() declaration when __MINT_ define was declared.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1799 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-15 19:29:11 +00:00
Yves Rizoud
2f3e1e3294 Lua: added 'matchcolor2' that uses DawnBringer's perceptual formula. Updated scripts numbering to 2.4 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1797 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-12 19:03:14 +00:00
Franck Charlet
1da0c96db8 fixed makefile for OSX regarding scripts 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1788 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-05-23 22:36:39 +00:00
Yves Rizoud
1f10338f60 Merged trunk into branches/mode5 (=update mode5 branch to latest) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1785 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-25 15:17:18 +00:00
Yves Rizoud
c9d96e6087 Removed skins Clax2 Clax3 from makefile, and thus default 2.3 package 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1770 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-04 22:35:30 +00:00
Yves Rizoud
65b3c4290a Fix critical bug: Grafx2 failing to load when no old config file is present (because of attempt to flash red screen, now has interactive mouse feedback, doesn't work before grafx2 is started). Fixed make install/make uninstall, tested on MSYS's shell for the moment 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1767 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-03 18:32:27 +00:00
Yves Rizoud
7571dcf3e2 Changed makefile according to scripts reorganization. make ziprelease works, still need to check install/uninstall 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1766 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-03 17:02:34 +00:00
Franck Charlet
92b76f2126 svn files excluded from archivbe OSX building 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1759 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-16 22:08:40 +00:00
Franck Charlet
14e891f3e6 using cut instead of tr to extract svn revision to generate archive name 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1758 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-16 21:58:04 +00:00
Franck Charlet
c16d9dab4c added automatic archive generation on OSX 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1757 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-16 21:13:54 +00:00
Franck Charlet
48c11e15a6 fixed a typo in makefile 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1755 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-11 23:03:23 +00:00
Franck Charlet
ec6fa4eab0 Added support for LUA in Mac OS X version 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1754 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-11 22:54:11 +00:00
Franck Charlet
a5fc3d9fec new OSX version should be ready 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1753 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-10 23:38:38 +00:00
Franck Charlet
431484914e more work done on Mac OSX version 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1752 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-10 22:16:42 +00:00
Franck Charlet
c1ede1f657 started to bring Mac OS X version up to date 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1751 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-03-10 18:29:53 +00:00
Adrien Destugues
eba26aaa96 Merge trunk to the cpcmode5 branch. This gets us a more recent grafx2 with the cpcmode5 drawing. Now to make this mode optional so users can still work in regular mode :) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1719 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-13 21:49:31 +00:00
Adrien Destugues
4e60f5ad74 Import the WIP CPC-Mode5 code from the sourcearchive 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1718 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-13 21:20:45 +00:00
Yves Rizoud
d0aaabf6b2 Merge of r1709 into trunk: Atari Falcon port 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1710 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-06 19:30:55 +00:00
Yves Rizoud
eebf3784c3 Fix makefile for deleted scripts 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1690 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-01-19 21:44:22 +00:00
Adrien Destugues
83ecd4a6e8 Patch by sm4tik (arch linux packager): allow putting the icons in pixmap/ instead of icons/. Thanks! 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1684 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-01-17 19:29:57 +00:00
Yves Rizoud
c55b9854df Makefile fixes for OSX, kindly contributed by gruber.kristof (Issue 397) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1651 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-12-01 14:22:35 +00:00
masta.uy
0bfc627094 Some minor changes to make it compile on AROS. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1649 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-11-13 20:05:12 +00:00
Yves Rizoud
a28f574b3b Virtual keyboard for numeric entry 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1637 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-10-07 18:57:44 +00:00
Yves Rizoud
dbac6dcfe3 Lua: Only shows files ending in '.lua'. All system libraries available. Allow loading 'libs/foo.lua' by using 'require(''foo'')'. New 'memory' library, to allow persistence of data. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1628 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-09-27 01:14:54 +00:00
Adrien Destugues
0631f57399 Enable lua scripting on Haiku. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1586 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-22 18:02:31 +00:00
Adrien Destugues
27f4033076 Try gain again to fix the makefile for lua detection. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1578 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-17 12:40:59 +00:00
Adrien Destugues
84e81bbb3f * Try again to fix (or rather work around) pkg-config lua detection. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1566 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-09 09:30:06 +00:00
Yves Rizoud
9b3ce1cc8a Fix makefile for new version of libpng 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1514 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-06-17 21:38:24 +00:00
Adrien Destugues
ca18967d11 Sorry ! 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1505 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-06-15 09:02:17 +00:00
Adrien Destugues
83753d9d79 * Use libpng1.4 on windows (the "1.3" version doesn't even exist, where did we got this file ?) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1502 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-06-14 17:31:54 +00:00
Adrien Destugues
a8cf59b531 Fix issue 355. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1500 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-06-14 17:03:41 +00:00