From e20a45f9ec06b083c37d475a16dbef8c45420f5c Mon Sep 17 00:00:00 2001 From: Glenn Jones Date: Wed, 22 Jul 2015 23:02:03 -0400 Subject: [PATCH] Added MAkefile.win and updated view.s - swapped #-1 for # --- Makefile.win | 45 +++++++++++++++++++++++++++++++++++++++++++++ views.s | 6 +++--- weegui.dsk | Bin 143360 -> 143360 bytes 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 Makefile.win diff --git a/Makefile.win b/Makefile.win new file mode 100644 index 0000000..0961957 --- /dev/null +++ b/Makefile.win @@ -0,0 +1,45 @@ +# +# Makefile +# WeeGUI +# +# Created by Quinn Dunki on 8/15/14. +# One Girl, One Laptop Productions +# http://www.quinndunki.com +# http://www.quinndunki.com/blondihacks +# + + +CL65=cl65 +AC=AppleCommander.jar +ADDR=7b00 +ADDRDEMO=6000 + +PGM=weegui +DEMO=asmdemo + +all: $(DEMO) $(PGM) + + +$(DEMO): +# @PATH=$(PATH):/usr/local/bin; + $(CL65) -t apple2enh --start-addr $(ADDRDEMO) -l$(DEMO).lst $(DEMO).s + java -jar $(AC) -d $(PGM).dsk $(DEMO) + java -jar $(AC) -p $(PGM).dsk $(DEMO) BIN 0x$(ADDRDEMO) < $(DEMO) + rm -f $(DEMO) + rm -f $(DEMO).o + +$(PGM): +# @PATH=$(PATH):/usr/local/bin; + $(CL65) -t apple2enh --start-addr $(ADDR) -l$(PGM).lst $(PGM).s + java -jar $(AC) -d $(PGM).dsk $(PGM) + java -jar $(AC) -p $(PGM).dsk $(PGM) BIN 0x$(ADDR) < $(PGM) + rm -f $(PGM) + rm -f $(PGM).o +# osascript V2Make.scpt $(PROJECT_DIR) $(DEMO) $(PGM) + +clean: + rm -f $(DEMO) + rm -f $(DEMO).o + rm -f $(PGM) + rm -f $(PGM).o + diff --git a/views.s b/views.s index de0d059..7d6e464 100644 --- a/views.s +++ b/views.s @@ -1026,7 +1026,7 @@ WGPendingViewAction_hasCallback: cmp #WG_FEATURE_RT bne WGPendingViewAction_done - lda #-1 ; Right arrow + lda #$FF ; Right arrow jsr WGScrollXBy jsr WGViewFocus jsr WGViewFocusAction ; Trigger application to redraw contents @@ -1047,7 +1047,7 @@ WGPendingViewAction_up: bra WGPendingViewAction_done WGPendingViewAction_down: - lda #-1 ; Down arrow + lda #$FF ; Down arrow jsr WGScrollYBy jsr WGViewFocusQuiet jsr WGViewFocusAction ; Trigger application to redraw contents @@ -1381,7 +1381,7 @@ WGViewPaintAll_next: bne WGViewPaintAll_loop WGViewPaintAll_done: - lda #-1 + lda #$FF jsr WGSelectView RESTORE_AXY diff --git a/weegui.dsk b/weegui.dsk index a3ce4ca23f4f60c641972231060d7c01f0b85943..54e40e8ed2e371b2cce0c607f95b9fccaa3a6766 100644 GIT binary patch delta 5054 zcma)A4R90Joqzi9O2P&!m=8(eiAEQ<0cBcj3ljz=!|=EDSanP;LgYq`4l=2fqK? zm4uxpX*HUC@BQEZ|NDQxw~{bq6^5+c8*~5pU4;HT>)~k#T}C{c7}4A{rKLYuUA7XX zKiqtjkL<22TP?61XwQABR0<)0c~(uH{_G26 zb+2r7xgP6Os>ANjQX|g9Yu>2z{Hoc8-%8tS&Nh!u=zDR$J@7|W_O)emDoaFw%Nj`6Q#l(3tr+|+%Srn$J2RP`zw!fx+9 z!X0a1&8#tlIW_ z&dl2svdPwB*(n&6Cu!valaBhei0oIqqSL!qT2$HS*t-)zgd<-Uso4bzswor;Wo}dV z_hoC`kg$5~(!{D~4IfEct7gvA_3dE{k2z}GqC3kTGI^KzH3^ekS@I5Pdi~G{Zv>cJR42!VU)wJZoU)djQZ?Lj^~nlfU+V(SrfOiAQZ-K)N{8$-9}n^a zOy~8^8^fkbKnbeP4Qe?JWP`4&ABl2l2I9(G^Y53Gmt9 zbBU7Vo(>c}Zb5l2Tv^L+x6~GIe|r0kMpKi$DYX5__6s{2cm7QHRozETjiP=O%KJT2Z7zYrg6c)ej}<6DgnHI+Aon>w2uf%gMD>z0UnYk$AXQs)_{R`T;U zN^956nDKTkwv&$hmo&|qmreFhlu_~lB`2iNx~I709$=3gFc?jS1I8zA8%lmU{cRLM z5T`C)wX`B*s!#Y7n+`<~HrFb1JxZ=eF|u#e*<19vMm?D7K?c$0aUbnF2_zzRc;Fp;`uj^>cvU*K&T(%P_1X)Fy*GX{kr#OsczoK2=SwP9ufYFNQ?qgN z4~b+jmPFPYIA~z#e!AhFMM>KC2G@RGdk$*P3)I(sk?tF!`-ZjkCGB~c?i-=|uF!o~ z>Aq`pUyAy0pR{4aw1+YPilKdwwqKy_muUNCs+hAFSvjWYng*7YeljD?_CWj+1sK2p z0Mp+D5Vt|eL#)$f&>0({g@Wjmxk7)Avvq_@{D!Gde6xa_u?m>}E1GRrwdWW+bv4y^ ziI`EOpw>Z(KaxWHlq$UhJ7X7VVZQo^Czhll7duZyOKgye*4PCq+I(@NdKYfo88@qw z<2kA$Zc_7wsrY9CHjBbUY^fKl_+RS<6PD`n6G5M7J8+vfPV`%SqQxh2%t=6nGZ$dt zOxC`I4_mtK{^!HA)w**O6z9u*hFt}%O3U{42v#?Q40`gWgilh@2t zpw2*Aw5oZU?bRI^U)ZrNHn@~7{L2Vc?chX`I<^7}*UR3_OlgIKE;d(mOwPeOEW9pQgMg>+zB8hX!ebtE-=mxVk5%P3@;- zu2OOus(_rN!UR~TIk78LxT>YPI%*+BZM-sWpC@ycpr$zjFgWkIqKiTHv6$9>U!YM`;Qoxg4 zBw+^x^qqcP5Ff9_H$_O9(9;EmnO?IJ-jl6HnQOfUH*IT*0`55S6-K_Qk!8+q)M6%E z{C1mPsX2vZ9I#lNcK^;xFu_0XC_xlk`Q0T>wz>pwvG zw=|002vF%p;Vxh+GmOP!079aGWpx4hqyZ93ZZ=?Nqwrmbf&V0pT}gRAuJ?%x_&Wub zFw2}ee_WY4wr1Lay~d2GYj!_EU4uz7=aDTQ+3JyPo~-#vTCDYEvDTa}m)4#z*tEKq zHrLI5CezKVi~CqVShS~Ad+L19pFT0un?9Z-Xj?yRgMuG^QBSi6QsE;ILoGi{JuILE zfDEO^rjhzwzt$u`)!wFL3pg^iN*r*0fWaJg7Uck+;FO(g@K0t$)o9m)`4LF++iIT77TZo0xqN^f&vh$jD3Dq(;RMOWtJMUCq|&z`m~c4lIQfu zE>9#skS+d=>8^$|3QkogJ5^n9=nYbrwt$02=FTN)Xt8WLcbY zwN#dR;e|ik^61K?Fz#dH3WQ`fmLv39%aWy4KtIq@S;c1m*-}+j2fs{waH!+WVIGIF6xEC!0Uo~};MoDr;hBxV5Iso~2Hs1< zI3z9FJA2y8gvUGUG|45RHtem%o2BRX7TotI_Hvl}OVJIb4}Eizb`6AoEyq0aA3gFf zJo09b((Q?!qGEaUwDkJkfAmjjURGMU9HG0L*OaYTwg$~|Rh2nD( zcjFtRfvdM@Hg~?kc@z}p;C}LjIUZag4~M`RrEVOV91QDbk+(CGcQTV6 zZE}b-9|{NG^=pebY3>aN-wU%S9t8iH;<T3|4csqVDms&batRuoB?%u+^rV0LbBgL`}=w=iR+OeJo%JR z250%fa0mR78HgPWtG2=O;e@R(C42(^LahIdbJ9SVh$NN_lLmrYh;-k36~<3%rSF`= zejJ&CKMr)|ke)3Tg2;SC?9-w)lDG@r@@yn}J4h@fIvONa;>0cjQgp1JGiNP9;lxGMbK_6pYo3rL)djf90%S>M5$d63KGZ3)^Y`p~UCi8Za2X>POcaufCqx8T2!Jk8v-ibMcmRdg;I0@Ai)dg*=_wbIVLdgSav%+|OPMFTp<< zXDJz=v0?2#I|KLG1xn6oud84Nw(jo!dGx^NaW3&(wD delta 5101 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