187 Commits

Author SHA1 Message Date
Adrien Destugues
cf56a34992 Update some things after the switch to git.
- Do not use svnversion to find the version, instead use a revision
  count from git. As a result, the version number jumps back, however,
  so we should have a 2.5 release soon!
- Fix some URLs pointing to either the svn repo,
  or even to google code (!).
2017-03-23 07:29:26 +01:00
Adrien Destugues
2d4ad537ad Haiku: use pkg-config to find lua
The Lua package for Haiku now comes with a pkg-config file, and the
includes were moved around, so get things working again.
2017-03-19 09:03:30 +01:00
Adrien Destugues
76d4630b4c Patch by Thomas Bernard: improve detection of SDL and Lua for macOS.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2174 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2017-01-14 08:47:42 +00:00
Adrien Destugues
9c6f343215 Patch by Thomas Bernard to fix compilation on FreeBSD.
Thanks!

Fixes #50.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2173 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2017-01-03 18:25:35 +00:00
Adrien Destugues
0eaf3fce96 Use iconv to convert filenames from UTF-8.
Patch by miniupnp, with some C89 adjustments.
Enabled for Haiku and the generic Linux/*BSD part of the Makefile.
Please adjust as needed.

Fixes #10 for codepages for which we have a font.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2172 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2016-12-02 19:43:23 +00:00
Adrien Destugues
8808625851 Add a "tall 3" drawing mode.
Pixels with 3:4 aspect ratio. Why not?

Contributed by Nic Soudée (zoner/xylem). Thanks!


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2166 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2016-10-15 18:57:14 +00:00
Adrien Destugues
f2797f6648 Fix more things for Haiku port
* Add an icon in the native format
* Add "resource definition" to the executable (including icon and version info)
* Use the proper API to find the share directory.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2126 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2015-08-16 12:27:21 +00:00
Adrien Destugues
cc05157ae9 Fix install when datadir is not named "share".
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2119 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2015-04-29 20:32:54 +00:00
Adrien Destugues
78fcc648c3 Partial merge of the SDL2 branch into trunk
* Mainly get the cleanup of window drawing functions.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2102 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2015-03-02 13:44:18 +00:00
Adrien Destugues
6a225eb4ed Fix Haiku build.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2087 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2015-02-23 19:33:41 +00:00
Adrien Destugues
61c8dca353 Add a port to the GCW Zero, contributed by David Knight.
Untested since I don't have the hardware.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2080 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2015-02-10 20:13:57 +00:00
Yves Rizoud
567cf087b0 Makefile fix for Windows. Looks like I didnt build libPNG exactly the same way
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2065 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2013-08-30 03:37:23 +00:00
Adrien Destugues
72d8f5a49d Apply patch from #305 and #525. Use FontConfig on linux to get true type fonts instead of
the X11 functions.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2050 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2013-02-02 08:45:33 +00:00
Yves Rizoud
46d3207c7e Makefile: fix missing files in packages: Tiler.lua, haiku.cpp, Grafx2_Prefix.pch, SDLMain.m, grafx2.info
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2023 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-10-01 19:11:36 +00:00
Yves Rizoud
144a28412b Issue 453 : Virtual keyboard setting
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1999 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-09-18 23:41:55 +00:00
mazzearos
ce8fbe076d Started to add Lua support to AROS.
src/Makefile: link with lua. Note that I'm currently using an absolute path to include/lua
which only exits on my machine until AROS has support for pkg-config.

src/setup.h: added valid path to lua scripts.

src/io.c: take colon into account when checking for last separator.

src/factory.c: use luaL_newstate() instead of lua_open() because latter doesn't exist anymore in Lua-5.2.
Note: that fix should be valid for all platforms.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1977 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-08-03 19:10:44 +00:00
mazzearos
c68f05cda5 Some fixes for AROS:
src/text.c: Added path for truetype fonts.

src/Makefile: Create GrafX2 binary in the root directory. This allows
running without any prior installation.

src/readline.c: Added ':' to the forbidden charactersS.

src/const.h: Use '/' as indicator for parent directory.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1972 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-08-02 13:02:00 +00:00
Adrien Destugues
d4d57f750d In brush factory, when the selected entry is not a file, display the full path in the description window.
Since the factory can open in an empty or even non-existing (!) dir, this is helpful to locate where you are.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1962 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2012-06-09 20:41:05 +00:00
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