tweaked to run on MC9090 (see note)

There are only a few adjustments needed to run on MC3000 vs. MC9090.  This
commit is meant to store the diff until a better solution can be found for
building the various "flavors" in a convenient manner.
This commit is contained in:
Lance Edgar 2011-12-28 19:22:32 -06:00
parent 5d7b3af547
commit 0be31c6d06
6 changed files with 52 additions and 41 deletions

View file

@ -80,9 +80,9 @@ IDR_MAINFRAME MENU PRELOAD DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&New", ID_FILE_NEW
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Open...", ID_FILE_OPEN
MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE_X MENUITEM "&Save", ID_FILE_SAVE_X
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "E&xit", ID_APP_EXIT MENUITEM "E&xit", ID_APP_EXIT
END END
@ -121,34 +121,35 @@ END
// Dialog // Dialog
// //
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 151, 62 IDD_ABOUTBOX DIALOGEX 0, 0, 122, 62
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE 0x80000000L EXSTYLE 0x80000000L
CAPTION "About Rattail CE" CAPTION "About Rattail CE"
FONT 8, "System" FONT 8, "System"
BEGIN BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,13,19,21,20 ICON IDR_MAINFRAME,IDC_STATIC,7,21,21,20
LTEXT "Rattail CE v0.1",IDC_STATIC,40,10,56,8,SS_NOPREFIX LTEXT "Rattail CE v0.1",IDC_STATIC,35,7,56,8,SS_NOPREFIX
LTEXT "Copyright © 2011 Lance Edgar",IDC_STATIC,40,25,101,8 LTEXT "Copyright © 2011",IDC_STATIC,35,20,61,8
LTEXT "http://rattail.edbob.org/",IDC_STATIC,40,41,80,8 LTEXT "http://rattail.edbob.org/",IDC_STATIC,35,46,80,8
LTEXT "Lance Edgar",IDC_STATIC,45,33,40,8
END END
IDD_RATTAILCE_FORM DIALOG DISCARDABLE 0, 0, 183, 153 IDD_RATTAILCE_FORM DIALOG DISCARDABLE 0, 0, 135, 151
STYLE WS_CHILD STYLE WS_CHILD
FONT 8, "System" FONT 8, "System"
BEGIN BEGIN
CONTROL "List1",IDC_SCANS,"SysListView32",LVS_REPORT | CONTROL "List1",IDC_SCANS,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP, LVS_SINGLESEL | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,
7,7,169,118 7,7,121,118
EDITTEXT IDC_SCANCODE,7,134,91,12 EDITTEXT IDC_SCANCODE,7,132,61,12,ES_MULTILINE
EDITTEXT IDC_CASE_QUANTITY,117,134,21,12,ES_RIGHT | ES_MULTILINE | EDITTEXT IDC_CASE_QUANTITY,81,132,17,12,ES_RIGHT | ES_MULTILINE |
ES_NUMBER ES_NUMBER
CONTROL "",IDC_STOP_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, CONTROL "",IDC_STOP_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
104,135,8,11 71,133,8,11
EDITTEXT IDC_UNIT_QUANTITY,156,134,20,12,ES_RIGHT | ES_MULTILINE | EDITTEXT IDC_UNIT_QUANTITY,111,132,17,12,ES_RIGHT | ES_MULTILINE |
ES_NUMBER ES_NUMBER
CONTROL "",IDC_STOP_UNIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, CONTROL "",IDC_STOP_UNIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
143,135,8,11 101,133,8,11
END END
@ -206,7 +207,7 @@ BEGIN
IDD_ABOUTBOX, DIALOG IDD_ABOUTBOX, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 144 RIGHTMARGIN, 115
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 55 BOTTOMMARGIN, 55
END END
@ -214,9 +215,9 @@ BEGIN
IDD_RATTAILCE_FORM, DIALOG IDD_RATTAILCE_FORM, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 176 RIGHTMARGIN, 128
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 146 BOTTOMMARGIN, 144
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED

Binary file not shown.

View file

@ -16,8 +16,8 @@ Class4=CMainFrame
Class5=CAboutDlg Class5=CAboutDlg
ResourceCount=3 ResourceCount=3
Resource1=IDR_MAINFRAME Resource1=IDD_ABOUTBOX
Resource2=IDD_ABOUTBOX Resource2=IDR_MAINFRAME
Resource3=IDD_RATTAILCE_FORM Resource3=IDD_RATTAILCE_FORM
[CLS:CRattailCEApp] [CLS:CRattailCEApp]
@ -67,11 +67,12 @@ LastObject=CAboutDlg
[DLG:IDD_ABOUTBOX] [DLG:IDD_ABOUTBOX]
Type=1 Type=1
Class=CAboutDlg Class=CAboutDlg
ControlCount=4 ControlCount=5
Control1=IDC_STATIC,static,1342177283 Control1=IDC_STATIC,static,1342177283
Control2=IDC_STATIC,static,1342308480 Control2=IDC_STATIC,static,1342308480
Control3=IDC_STATIC,static,1342308352 Control3=IDC_STATIC,static,1342308352
Control4=IDC_STATIC,static,1342308352 Control4=IDC_STATIC,static,1342308352
Control5=IDC_STATIC,static,1342308352
[MNU:IDR_MAINFRAME] [MNU:IDR_MAINFRAME]
Type=1 Type=1
@ -106,7 +107,7 @@ Type=1
Class=CRattailCEView Class=CRattailCEView
ControlCount=6 ControlCount=6
Control1=IDC_SCANS,SysListView32,1350631685 Control1=IDC_SCANS,SysListView32,1350631685
Control2=IDC_SCANCODE,edit,1350631424 Control2=IDC_SCANCODE,edit,1350631428
Control3=IDC_CASE_QUANTITY,edit,1350639622 Control3=IDC_CASE_QUANTITY,edit,1350639622
Control4=IDC_STOP_CASE,button,1342242819 Control4=IDC_STOP_CASE,button,1342242819
Control5=IDC_UNIT_QUANTITY,edit,1350639622 Control5=IDC_UNIT_QUANTITY,edit,1350639622

Binary file not shown.

View file

@ -45,19 +45,20 @@ RSC=rc.exe
# PROP Intermediate_Dir "ARMV4IRel" # PROP Intermediate_Dir "ARMV4IRel"
# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}" # PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /d "_AFXDLL" /r # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /d "_AFXDLL" /r
# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /d "_AFXDLL" /r # ADD RSC /l 0x409 /fo"ARMV4IRel/RattailCE.res" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /d "_AFXDLL" /r
# ADD BASE CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c # ADD BASE CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
# ADD CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /Fp"ARMV4IRel/RattailCE.pch" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo /o"ARMV4IRel/RattailCE.bsc"
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:THUMB # ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:THUMB
# ADD LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:THUMB # ADD LINK32 SCNAPI32.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /out:"ARMV4IRel/RattailCE.exe" /subsystem:$(CESubsystem) /MACHINE:THUMB
!ELSEIF "$(CFG)" == "Rattail CE - Win32 (WCE ARMV4I) Debug" !ELSEIF "$(CFG)" == "Rattail CE - Win32 (WCE ARMV4I) Debug"
@ -116,12 +117,14 @@ DEP_CPP_RATTA=\
".\Rattail CEDoc.h"\ ".\Rattail CEDoc.h"\
".\Rattail CEView.h"\ ".\Rattail CEView.h"\
".\StdAfx.h"\ ".\StdAfx.h"\
{$(INCLUDE)}"RSMDefs.h"\
{$(INCLUDE)}"ScanCApi.h"\ NODEP_CPP_RATTA=\
{$(INCLUDE)}"ScanDef.h"\ ".\canCApi.h"\
{$(INCLUDE)}"ScanErr.h"\ ".\canDef.h"\
{$(INCLUDE)}"ScanMacr.h"\ ".\canErr.h"\
{$(INCLUDE)}"StrucInf.h"\ ".\canMacr.h"\
".\SMDefs.h"\
".\trucInf.h"\
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -145,12 +148,14 @@ DEP_CPP_RATTAIL=\
".\Rattail CEDoc.h"\ ".\Rattail CEDoc.h"\
".\Rattail CEView.h"\ ".\Rattail CEView.h"\
".\StdAfx.h"\ ".\StdAfx.h"\
{$(INCLUDE)}"RSMDefs.h"\
{$(INCLUDE)}"ScanCApi.h"\ NODEP_CPP_RATTAIL=\
{$(INCLUDE)}"ScanDef.h"\ ".\canCApi.h"\
{$(INCLUDE)}"ScanErr.h"\ ".\canDef.h"\
{$(INCLUDE)}"ScanMacr.h"\ ".\canErr.h"\
{$(INCLUDE)}"StrucInf.h"\ ".\canMacr.h"\
".\SMDefs.h"\
".\trucInf.h"\
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -211,6 +216,10 @@ SOURCE=".\res\Rattail CE.rc2"
# End Group # End Group
# Begin Source File # Begin Source File
SOURCE=.\RattailCE.vcn
# End Source File
# Begin Source File
SOURCE=.\ReadMe.txt SOURCE=.\ReadMe.txt
# End Source File # End Source File
# End Target # End Target

View file

@ -112,11 +112,11 @@ void CRattailCEView::OnInitialUpdate()
// TODO: Add your specialized code here and/or call the base class // TODO: Add your specialized code here and/or call the base class
if (! m_bInited) { if (! m_bInited) {
m_Scans.InsertColumn(0, L"Scan Code"); m_Scans.InsertColumn(0, L"Scan Code");
m_Scans.SetColumnWidth(0, 160); m_Scans.SetColumnWidth(0, 115);
m_Scans.InsertColumn(1, L"Case", LVCFMT_RIGHT); m_Scans.InsertColumn(1, L"Case", LVCFMT_RIGHT);
m_Scans.SetColumnWidth(1, 50); m_Scans.SetColumnWidth(1, 37);
m_Scans.InsertColumn(2, L"Unit", LVCFMT_RIGHT); m_Scans.InsertColumn(2, L"Unit", LVCFMT_RIGHT);
m_Scans.SetColumnWidth(2, 50); m_Scans.SetColumnWidth(2, 37);
m_CaseQuantity.SetWindowText(L"0"); m_CaseQuantity.SetWindowText(L"0");
m_StopUnit.SetCheck(BST_CHECKED); m_StopUnit.SetCheck(BST_CHECKED);
m_UnitQuantity.SetWindowText(L"1"); m_UnitQuantity.SetWindowText(L"1");