fix wine-environment

diff --git a/Makefile b/Makefile
index 34412f2d2b5d48b9310bc82c5bc3b53cd7fad83f..0ec20e9b786ccc6a97753f4157a5c32a2736fc4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,13 @@
 # The directory where your MSVC for StrongARM and the SDK is installed.
 # You should set up WINE (see /etc/wine.reg) so that it "sees" this drive
 #BASE=d:\\msvc-arm
 # The directory where your MSVC for StrongARM and the SDK is installed.
 # You should set up WINE (see /etc/wine.reg) so that it "sees" this drive
 #BASE=d:\\msvc-arm

-BASE=c:\\evc
+BASE=d:\\msvc-arm\\bin

 
 #=========================================================== Compilers ======#
 # Set some env vars for msvc to use
 WINEPATH=$(BASE)\\
 
 #=========================================================== Compilers ======#
 # Set some env vars for msvc to use
 WINEPATH=$(BASE)\\

-WINE=wine --debugmsg fixme-console
+WINE=wine
+export WINEDEBUG=-all

 
 # Output directory
 OUT=out/
 
 # Output directory
 OUT=out/


@@ -34,7 +35,7 @@ OBJS = $(SUB4:%.res=$(OUT)%-res.obj)
 
 # You shouldn't need to change anything below.
 
 
 # You shouldn't need to change anything below.
 

-CXX=$(WINE) -- $(BASE)\\clarm.exe -c
+CXX=$(WINE) $(BASE)\\clarm.exe -c

 
 CXXFLAGS.DEF=-DARM -D_ARM_ -DUNICODE -D_UNICODE -DUNDER_CE=300 -D_WIN32_WCE=300
 CXXFLAGS.INC=-Iinclude -I$(INCLUDE) $(CFLAGS)
 
 CXXFLAGS.DEF=-DARM -D_ARM_ -DUNICODE -D_UNICODE -DUNDER_CE=300 -D_WIN32_WCE=300
 CXXFLAGS.INC=-Iinclude -I$(INCLUDE) $(CFLAGS)


@@ -43,31 +44,29 @@ CXXFLAGS.INC=-Iinclude -I$(INCLUDE) $(CFLAGS)
 # Uncomment this for Dell Axim
 #CXXFLAGS.DEF+=-DAXIM
 
 # Uncomment this for Dell Axim
 #CXXFLAGS.DEF+=-DAXIM
 

-CXXFLAGS=-nologo -W3 -Zi -Od $(CXXFLAGS.DEF) $(CXXFLAGS.INC)
+CXXFLAGS=-nologo -W3 $(CXXFLAGS.DEF) $(CXXFLAGS.INC)

 
 
 
 

-ASM=$(WINE) -- $(BASE)\\armasm.exe
+ASM=$(WINE) $(BASE)\\armasm.exe

 #ASMFLAGS=-arch 4 -cpu StrongARM1 -32
 
 
 #ASMFLAGS=-arch 4 -cpu StrongARM1 -32
 
 

-RC=$(WINE) -- $(BASE)\\rc.exe
+RC=$(WINE) $(BASE)\\rc.exe

 #RCFLAGS=-r -l 0x409 $(CXXFLAGS.DEF) $(CXXFLAGS.INC)
 RCFLAGS=$(CXXFLAGS.DEF) $(CXXFLAGS.INC)
 
 
 #RCFLAGS=-r -l 0x409 $(CXXFLAGS.DEF) $(CXXFLAGS.INC)
 RCFLAGS=$(CXXFLAGS.DEF) $(CXXFLAGS.INC)
 
 

-CVTRES=$(WINE) -- $(BASE)\\cvtres.exe
+CVTRES=$(WINE) $(BASE)\\cvtres.exe

 CVTRESFLAGS=-machine:arm -windowsce
 
 
 CVTRESFLAGS=-machine:arm -windowsce
 
 

-LD=$(WINE) -- $(BASE)\\link.exe
+LD=$(WINE) $(BASE)\\link.exe

 
 
 
 # From EVC project settings
 LDFLAGS= \
     -nologo \
 
 
 
 # From EVC project settings
 LDFLAGS= \
     -nologo \

-    -base:"0x00010000" \
-    -stack:0x10000,0x1000 \

     -entry:"WinMainCRTStartup" \
     -align:"4096" \
     -machine:ARM \
     -entry:"WinMainCRTStartup" \
     -align:"4096" \
     -machine:ARM \

diff --git a/Makefile.project b/Makefile.project
index c25460b08d17723fc2bece905c5bcee54972c876..21dbb0c62a5e91fd5da5373fa1b9669eb519cc32 100644 (file)
--- a/Makefile.project
+++ b/Makefile.project
@@ -24,7 +24,7 @@ SRCS = \
 #CFLAGS = -DSTRONGARM=1
 LIBS = aygshell.lib
 
 #CFLAGS = -DSTRONGARM=1
 LIBS = aygshell.lib
 

-INCLUDE=/opt/toolchain/arm-wince-pe/include/ppc/
-LIB=/opt/toolchain/arm-wince-pe/lib/ppc/
+INCLUDE=d:\\msvc-arm\\include
+LIB=d:\\msvc-arm\\lib