Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-07-06 04:28:55 +00:00
Code Issues Projects Releases Wiki Activity
351 Commits 2 Branches 1 Tag 21 MiB
66f3971027
Commit Graph

234 Commits

Author SHA1 Message Date
Dagen Brock
e403bdc8f7 Merge branch 'host_config' into 'experimental' 
add F4-text UI for selecting host file directory.

This only displays folders. Return enters a folder as usual. Press Space to select a folder

(Space also selects a file in the ROM/disk image file selector)

See merge request !8
 2017-04-05 09:39:43 -05:00
Dagen Brock
9910f290af Merge branch 'to_pro-ftypes' into 'experimental' 
to_pro tweaks

1. sniff filetype from finder info, if available
2. -bin flag to use a default file type of binary
3. -txt flag to use a default file type of text
4. -cr flag to do text file lf/cr conversion.
5. check for invalid disk size numbers.
6. check for maximum prodos image size

See merge request !11
 2017-04-05 09:32:29 -05:00
Dagen Brock
1cd10bb3a1 remove printf 2017-04-05 09:18:04 -05:00
Kelvin Sherlock
b2870733c8 remove uint8_t 2017-03-11 22:43:23 -05:00
Kelvin Sherlock
7b87bb391f to_pro tweaks: 
1. sniff filetype from finder info, if available
2. -bin flag to use a default file type of binary
3. -txt flag to use a default file type of text
4 -cr flag to do text file lf/cr conversion.
 2017-03-11 20:48:18 -05:00
Kelvin Sherlock
98cc8b1223 tweak the apple menu bar to add option-key to all key equivalents. Eg, Command-Q => Option+Command-Q 2017-02-10 20:06:11 -05:00
Kelvin Sherlock
41e000329c add F4-text UI for selecting host file directory. This only displays folders. Return enters a folder as usual. Press Space to select a folder 
(Space also selects a file in the ROM/disk image file selector)
 2017-02-02 15:28:56 -05:00
Dagen Brock
3ce80ce333 woops. left debug -O0 flag on builds 2017-01-23 11:16:44 -06:00
Dagen Brock
91359379ab fix missing include 2017-01-23 09:55:14 -06:00
Dagen Brock
2a4712c7b6 missed rom3 patch message 2017-01-23 09:38:14 -06:00
Dagen Brock
a58478a401 superficial changes to test CI 2017-01-23 09:26:32 -06:00
Dagen Brock
b9eb3fde74 cleanup to test build issue 2017-01-22 19:13:18 -06:00
Dagen Brock
cb8a7a1d62 formatting cleanup, add help option, fix quit behavior to ignore command-Q 2017-01-22 12:33:43 -06:00
Dagen Brock
c5fbc76e18 log cleanup 2017-01-21 21:44:44 -06:00
Dagen Brock
0ff8dc524c scanline simulator is back. yay. 2017-01-21 16:31:32 -06:00
Kelvin Sherlock
2c87f2ae20 headless driver. Does not implement any i/o whatsoever. Possibly useful for running gno/me or proline in the background. 2017-01-20 22:30:44 -05:00
Dagen Brock
9906f0187e remove extra newlines from switch to glogf() 2017-01-20 14:19:07 -06:00
Dagen Brock
624aefbe08 remove erroneous printf and warnings 2017-01-20 13:58:01 -06:00
Dagen Brock
aa240efdc8 manually redoing Kelvin's glogf work 2017-01-20 13:28:09 -06:00
Dagen Brock
e584e82f35 Merge branch 'win32_icon' into 'experimental' 
win32 icon.

replace the fugly old win32 icon with a new one based on the gsp_icon_xxx.png files.  includes script used to generate the icon (`perl -w  make_ico.pl gsp_icon_16.png gsp_icon_32.png gsp_icon_64.png gsp_icon_128.png gsp_icon_256.png`).

See merge request !6
 2017-01-20 11:51:54 -06:00
Dagen Brock
78ccf27da9 Merge branch 'ksherlock/gsplus-debugger_fix' into experimental 2017-01-20 11:43:59 -06:00
Dagen Brock
9e9395cb49 Merge branch 'experimental' into 'win32_host' 
# Conflicts:
#   src/host_fst.c
 2017-01-20 11:39:36 -06:00
Dagen Brock
df15c0f6d9 Merge branch 'fix_64_bit_win32_sound' into 'experimental' 
64-bit fixes for win sound driver

This fixes the win32 sound driver so it can be compiled (and run) with 64-bit Cygwin/gcc. Previously, it would crash due to pointer/int conversion losing information.

See merge request !3
 2017-01-20 11:33:04 -06:00
Dagen Brock
9ce2f0e35d Merge branch 'experimental' of centralserv.gotgeeks.com:dbrock/gsplus into experimental 2017-01-20 10:57:10 -06:00
Dagen Brock
f00002eeb3 Merge branch 'experimental' into 'experimental_host_fst' 
# Conflicts:
#   src/host_fst.c
 2017-01-20 10:50:56 -06:00
Dagen Brock
74815bfe70 Merge branch 'master' of github.com:digarok/gsplus 2017-01-20 10:38:38 -06:00
Dagen Brock
9950bc3e4a Merge branch 'master' of github.com:digarok/gsplus into experimental 2017-01-20 10:38:00 -06:00
Dagen Brock
a7302310c5 Merge pull request #6 from ksherlock/sdl_dnd 
Adds code to, theoretically, insert a drag-n-drop disk image.
 2017-01-20 10:34:39 -06:00
Dagen Brock
841bcff724 dmg background appley-fied 2017-01-20 10:17:58 -06:00
Dagen Brock
8d1161b224 fix for segfault on screenshot w/ no dir specified 2017-01-19 22:53:30 -06:00
Kelvin Sherlock
563411ffb3 win32 icon. 2016-12-15 22:00:19 -05:00
Kelvin Sherlock
9d3fd44cb1 debugger - fix problem where fd 0 is closed when it shouldn't be. 2016-12-03 20:59:06 -05:00
Kelvin Sherlock
d4bb8f3e0d freebsd/aix xattr includes 2016-11-27 15:09:35 -05:00
Kelvin Sherlock
827f381ead updated makefiles for host / win32_host 2016-11-27 15:04:29 -05:00
Kelvin Sherlock
34d0af713d compile with mingw too! 2016-11-27 14:47:28 -05:00
Kelvin Sherlock
9d0a242487 support the read_only flag, more consistent storage type checks. 2016-11-27 14:28:13 -05:00
Kelvin Sherlock
c20257e5fe map windows locked/hidden attributes. 2016-11-27 13:53:07 -05:00
Kelvin Sherlock
a2d165840b AFP_AfpInfo attribute support! 2016-11-26 21:46:05 -05:00
Kelvin Sherlock
a84dd7b424 win32 attribute mapping. 2016-11-26 20:40:10 -05:00
Kelvin Sherlock
a648aac400 fix time conversion. 2016-11-26 15:39:08 -05:00
Kelvin Sherlock
e7cf527ee3 fix get file info 2016-11-26 15:23:25 -05:00
Kelvin Sherlock
e482260d32 more win32-specific code. 2016-11-26 15:14:37 -05:00
Kelvin Sherlock
bb6015df36 synchronize host_fst, fixup a couple bugs . 2016-11-25 21:57:17 -05:00
Kelvin Sherlock
bc75666810 fix fst_read to actually read. 2016-11-25 15:10:25 -05:00
Kelvin Sherlock
0bde878d05 move win32 host to separate file. (in progress). 2016-11-25 14:54:21 -05:00
Kelvin Sherlock
e6f9adc1de work in progress for windows/cygwin host fst 2016-11-24 13:04:37 -05:00
Kelvin Sherlock
92f78df754 64-bit fixes for win sound driver 2016-11-24 13:03:41 -05:00
Dagen Brock
ae94f457cd Merge branch 'experimental' of centralserv.gotgeeks.com:dbrock/gsplus into experimental 2016-11-02 21:54:15 -05:00
Dagen Brock
480b065a6e logs cleans, manual refresh 2016-11-02 21:52:40 -05:00
Dagen Brock
85e71f201d icons and branding refresh 2016-11-02 21:28:16 -05:00
Dagen Brock
732adb1bb1 build for linux host fst 2016-10-30 20:24:06 -05:00
Dagen Brock
472bf10144 added winsdl defs and removed utimes call 2016-10-30 18:11:23 -07:00
Dagen Brock
ca1679a968 switch win32 to linux style, unused code? 2016-10-30 11:21:07 -07:00
Kelvin Sherlock
008aafc490 fix up linux compile errors 2016-10-30 14:11:15 -04:00
Dagen Brock
2ca153f1f8 attempt to enable host fst on linux 2016-10-30 12:39:26 -05:00
Dagen Brock
89edb6d3aa Merge branch 'experimental_host_fst' into 'experimental' 
Experimental host fst

Host FST support. Works on OS X. In theory may work elsewhere but hasn't been tested or compiled yet.

See merge request !1
 2016-10-30 12:24:28 -05:00
Kelvin Sherlock
91e7a1e98e get/set 32 bit memory 2016-10-29 12:50:01 -04:00
Kelvin Sherlock
a745f91b78 host config. 2016-10-29 12:49:24 -04:00
Kelvin Sherlock
be1b9663e9 host fst code (part 1) 2016-10-29 12:46:41 -04:00
Dagen Brock
b4b0382826 nicer ROM missing messaging 2016-10-28 21:34:42 -05:00
Dagen Brock
2e537a4985 missing include 2016-10-28 21:34:11 -05:00
Dagen Brock
9d1422e6cc more log cleanup 2016-10-28 14:44:16 -05:00
Dagen Brock
669f9c1814 it helps to add the actual code for logging 2016-10-28 12:14:45 -05:00
Dagen Brock
aa32d6f08f add prettier, but hacky, logging 2016-10-28 11:42:50 -05:00
Dagen Brock
966389b5ef duh, add config.txt 2016-10-27 21:32:34 -05:00
Dagen Brock
f7314ea6bf test package of config.txt 2016-10-27 21:07:17 -05:00
Dagen Brock
7e1bd6a82a add screenshot dir argument 2016-10-26 10:57:57 -05:00
Dagen Brock
64d8dcd3a3 fix for relative paths in -config argument 2016-10-25 15:38:30 -05:00
Dagen Brock
d5ef2a2a11 attempt more warning cleanup 2016-10-23 21:17:22 -05:00
Dagen Brock
9337414c17 clean up warnings 2016-10-23 09:24:03 -05:00
Dagen Brock
9a1b99f5da add todo (really just more build testing) 2016-10-20 09:22:26 -05:00
Dagen Brock
7c8faa0132 doh, forgot linker libs for sdlimage 2016-10-19 14:49:40 -05:00
Dagen Brock
d8a011058d remove more x stuff from ubuntu sdl 2016-10-19 14:46:26 -05:00
Dagen Brock
ab38ee8fe5 fix build was wrong target 2016-10-19 14:39:41 -05:00
Dagen Brock
38e699e134 adding sdl_image 2016-10-19 13:49:17 -05:00
Dagen Brock
aab120d482 trying to fix breakage on screenshot feature builds 2016-10-19 13:20:27 -05:00
Dagen Brock
225505c32e omg adding debugger to experimental branch 2016-10-19 13:12:19 -05:00
Dagen Brock
8fd37324a8 add memory functions to moremem.c for debugger integration 2016-10-19 12:41:38 -05:00
Dagen Brock
2beff689d0 minor additions 2016-10-19 12:04:01 -05:00
Dagen Brock
0c21e1a072 Windows SDL version (builds, not functioning) 2016-10-18 22:01:19 -07:00
Dagen Brock
56b15c4305 Merge branch 'experimental' of centralserv.gotgeeks.com:dbrock/gsplus into experimental 2016-10-17 07:29:39 -07:00
Dagen Brock
a69e2274d2 start of sdl2 build on win32 2016-10-17 07:27:06 -07:00
Dagen Brock
5111be42db simplify win32 build for separate artifact packaging 2016-10-14 15:30:41 -05:00
Dagen Brock
e7506ef085 fix for missing osx dir (not needed) 2016-10-14 15:21:48 -05:00
Dagen Brock
bca946fa07 latest osx artifact (and some cleaning) 2016-10-14 14:44:58 -05:00
Kelvin Sherlock
c0d628cc80 Adds code to, theoretically, insert a drag-n-drop disk image. 
This is only a theory since SDL2 or OS X 10.12 seem to have a nasty bug where drag-n-drop overfrees some memory and crashes (which happens even without this code in place).
 2016-10-04 22:29:08 -04:00
Kelvin Sherlock
ec5a297187 fix up previous code :) 
for windows, \r\n is pasted as \r.
for everyone else, \n is pasted as \r
 2016-10-03 16:48:18 -04:00
Kelvin Sherlock
a8a07ffb56 use SDL function to get clipboard text for F5 paste. 2016-10-02 20:37:45 -04:00
Dagen Brock
98596ba8ab add -config flag to use named config 2016-05-21 06:08:48 -05:00
Dagen Brock
d85bd0790f formatting of debug commands 2016-05-21 04:35:47 -05:00
Dagen Brock
8403c16dca remove unused code, fix warning for version string 2016-05-02 11:30:15 -05:00
Dagen Brock
078b07c858 add clipboard support to SDL2 2016-05-01 07:56:02 -05:00
Dagen Brock
e450e63a94 add icon & associated code (OSX SDL2 only) 2016-04-30 16:01:28 -05:00
Dagen Brock
7f14207be3 branding update - minor cleanup 2016-04-27 21:58:38 -05:00
Dagen Brock
6fdd04c78e cygwin build 2016-04-24 09:42:13 -05:00
Dagen Brock
3dda640f8f fix open-apple/PB0 bug that only occurred with SDL driver when joysticks are not plugged in. 
been looking for this way too long
 2016-04-20 02:11:16 -05:00
Dagen Brock
9163432d4b latest vars 2016-04-19 23:51:34 -05:00
Dagen Brock
83a3adb4f9 fix for refresh on window changes (fullscreen) 2016-04-18 23:02:44 -05:00
Dagen Brock
ca91bc4ab4 fix target for linux x11 build 2016-03-04 09:45:42 -06:00
Dagen Brock
0bbfc94967 attempt to clean some make inconsistencies 2016-03-04 09:42:31 -06:00
Dagen Brock
f0a0488f7a fix driver name 2016-03-04 09:21:11 -06:00
Dagen Brock
17ac4c3183 rename as sdl driver is now generic and not just 'osx' 2016-03-03 21:23:33 -06:00
Dagen Brock
8e9c568db5 sdl2 ubuntu build 2016-03-03 15:25:24 -06:00
Dagen Brock
d9dde67041 uhm 2016-02-07 23:01:25 -06:00
Dagen Brock
b3ad34bdff linux sdl build 2016-02-07 12:48:07 -06:00
Dagen Brock
5e3cb3d769 clean defines 2016-02-07 12:47:30 -06:00
Dagen Brock
aa5411d0ca fixes for build on ubuntu / gitlabci 2016-02-06 09:30:48 -06:00
Dagen Brock
8fb354d841 Merge branch 'master' of github.com:digarok/gsplus 2016-02-06 07:34:07 -06:00
Dagen Brock
c3eec89ecb make vars names consistent 2016-02-06 07:27:37 -06:00
Dagen Brock
253129eb5f latest vars 2016-02-04 00:43:57 -06:00
Dagen Brock
06f32df824 update name and copyright 2016-02-04 00:37:39 -06:00
Dagen Brock
798be244e0 really? warnings people. 2016-02-03 21:43:30 -06:00
Dagen Brock
37faff03ec fix double assignment 2016-02-01 21:42:36 -06:00
Dagen Brock
78d21514aa remove debug info from make builds 2016-01-31 11:03:58 -06:00
Dagen Brock
c116b3a0eb add binary to make/git 2016-01-31 10:43:43 -06:00
Dagen Brock
b16ca436e6 osx/sdl vars file 2016-01-30 13:32:29 -06:00
Dagen Brock
46022c0789 latest make 2016-01-30 13:32:01 -06:00
Dagen Brock
3051175c66 remove middle click debug halt 2016-01-30 13:31:44 -06:00
Dagen Brock
d55965c129 working joystick 2016-01-29 12:13:04 -06:00
Dagen Brock
300e766fcb No more XLibs 2016-01-29 08:59:14 -06:00
Dagen Brock
fc2fe6ff5c more X removal 2016-01-28 21:36:19 -06:00
Dagen Brock
cd2cd5f22d fix border resolution 2016-01-26 21:48:50 -06:00
Dagen Brock
7888c25d40 working audio 2016-01-26 17:47:44 -06:00
Dagen Brock
800a792359 stubbed in sdl audio 2016-01-23 10:12:23 -06:00
Dagen Brock
3ce1729bb6 fudged borders, but solid borders work now 2016-01-22 11:42:23 -06:00
Dagen Brock
a2bba98032 option/command keys added 2016-01-20 10:51:40 -06:00
Dagen Brock
d152517883 improved shift key 2016-01-20 10:42:37 -06:00
Dagen Brock
d8bd306c8a mouse button 2016-01-20 10:17:01 -06:00
Dagen Brock
e610584ff0 partial mouse support 2016-01-20 09:58:46 -06:00
Dagen Brock
cf00aafb2d a partial SDL implementation 2016-01-20 08:46:03 -06:00
Dagen Brock
daaca08929 skipping AF_PACKET stuff for now. if networking doesn't work on Mac, 
this is why.
 2015-11-25 15:32:08 -06:00
Dagen Brock
fa6cab3b6f do stuff for OSX builds 2015-11-25 15:18:53 -06:00
Dagen Brock
edc84dc60d branching linux to osx to start over without carbon 2015-11-24 15:23:04 -06:00
Dagen Brock
c3c2db5eb5 initial commit 2015-11-05 14:23:46 -06:00