update so works again.

This commit is contained in:
ehouse 2005-02-11 02:48:13 +00:00
parent 6a4bd1bb4a
commit 0899f69ac7
2 changed files with 25 additions and 13 deletions

View file

@ -1,9 +1,10 @@
# -*- mode: Makefile; -*- # -*- mode: Makefile; -*-
ifeq (x$(shell echo $$WINCE_DEV_PATH)x,xx) ifeq (x$(shell echo $$PPC_SDK_PPC)x,xx)
WINCE_PATH = "PLEASE DEFINE shell env variable WINCE_DEV_PATH" WINCE_PATH = "PLEASE DEFINE shell env variable WINCE_DEV_PATH"
include exit_right_now
else else
WINCE_PATH = $(shell echo $$WINCE_DEV_PATH) WINCE_PATH = $(shell echo $$PPC_SDK_PPC)
endif endif
PLATOBJ = \ PLATOBJ = \
@ -17,13 +18,22 @@ PLATOBJ = \
$(PLATFORM)/ceprefs.o \ $(PLATFORM)/ceprefs.o \
$(PLATFORM)/cestrbx.o \ $(PLATFORM)/cestrbx.o \
$(PLATFORM)/ceutil.o \ $(PLATFORM)/ceutil.o \
$(PLATFORM)/ceclrsel.o \
$(PLATFORM)/cehntlim.o \
XW_BOTH_DEFINES = \
/D XWFEATURE_STANDALONE_ONLY \
/DXWFEATURE_STANDALONE_ONLY /DNODE_CAN_4 /DMY_COLOR_SEL \
/DCOLOR_SUPPORT /DFEATURE_TRAY_EDIT /DXWFEATURE_SEARCHLIMIT \
/DXWFEATURE_HINT_CONFIG \
/D POINTER_SUPPORT /D KEY_SUPPORT /D __LITTLE_ENDIAN \
$(DEBUG) $(MEM_DEBUG) \
XW_C_DEFINES = \ XW_C_DEFINES = \
/D __LITTLE_ENDIAN /D POINTER_SUPPORT /D KEY_SUPPORT \ $(XW_BOTH_DEFINES) \
/D XWFEATURE_STANDALONE_ONLY $(DEBUG) $(MEM_DEBUG)
XW_RES_DEFINES = \ XW_RES_DEFINES = \
/d XWFEATURE_STANDALONE_ONLY $(DEBUG) $(MEM_DEBUG) $(XW_BOTH_DEFINES)
all: $(TARGET) all: $(TARGET)

View file

@ -3,19 +3,21 @@
PLATFORM = emulatorDbg PLATFORM = emulatorDbg
TARGET = $(PLATFORM)/xwords4.exe TARGET = $(PLATFORM)/xwords4.exe
LIBS = commctrl.lib coredll.lib corelibc.lib winsock.lib LIBS = commctrl.lib coredll.lib corelibc.lib winsock.lib aygshell.lib
RSRC = $(PLATFORM)/xwords4.res RSRC = $(PLATFORM)/xwords4.res
MAKE = make -f simrel.mk MAKE = make -f simrel.mk
CC = $(WCE420)/bin/cl.exe
LINK = $(WCE420)/bin/link.exe
RC = $(VSDIR)/Common/MSDev98/Bin/rc.exe
include ../common/config.mk include ../common/config.mk
include ./shared.mk include ./shared.mk
C_CMD = \ C_CMD = \
mkdir -p $(dir $@) && \ $(CC) /nologo /W3 /Zi /Od \
cl.exe /nologo /W3 /Zi /Od \ /I "$(WINCE_PATH)\Include\Emulator" \
/I "$(WINCE_DEV_PATH)\Include\Emulator" \
/I "..\common" /I "." /D "DEBUG" /D "_i386_" /D UNDER_CE=420 \ /I "..\common" /I "." /D "DEBUG" /D "_i386_" /D UNDER_CE=420 \
/D _WIN32_WCE=420 /D "WIN32_PLATFORM_PSPC=400" /D "i_386_" \ /D _WIN32_WCE=420 /D "WIN32_PLATFORM_PSPC=400" /D "i_386_" \
/D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" $(XW_C_DEFINES) \ /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" $(XW_C_DEFINES) \
@ -31,8 +33,8 @@ $(PLATFORM)/%.o: %.c
$(C_CMD) $(C_CMD)
$(RSRC): xwords4.rc $(RSRC): xwords4.rc
rc.exe /l 0x409 /fo$@ \ $(RC) /l 0x409 /fo$@ \
/i "$(WINCE_DEV_PATH)\Include\Emulator" \ /i "$(WINCE_PATH)\Include\Emulator" \
/d "WIN32_PLATFORM_PSPC=400" /d UNDER_CE=420 /d _WIN32_WCE=420 \ /d "WIN32_PLATFORM_PSPC=400" /d UNDER_CE=420 /d _WIN32_WCE=420 \
/d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" \ /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" \
$(XW_RES_DEFINES) \ $(XW_RES_DEFINES) \
@ -42,14 +44,14 @@ test:
echo $(basename $(TARGET)).pdb echo $(basename $(TARGET)).pdb
$(TARGET): $(COMMONOBJ) $(PLATOBJ) $(RSRC) $(TARGET): $(COMMONOBJ) $(PLATOBJ) $(RSRC)
link.exe $(LIBS) /nologo /base:"0x00010000" /stack:0x10000,0x1000 \ $(LINK) $(LIBS) /nologo /base:"0x00010000" /stack:0x10000,0x1000 \
/entry:"WinMainCRTStartup" /incremental:yes \ /entry:"WinMainCRTStartup" /incremental:yes \
/pdb:$(basename $(TARGET)).pdb \ /pdb:$(basename $(TARGET)).pdb \
/debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib \ /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib \
/nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib \ /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib \
/nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib \ /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib \
/nodefaultlib:msvcrtd.lib /out:$@ \ /nodefaultlib:msvcrtd.lib /out:$@ \
/libpath:"$(WINCE_DEV_PATH)\Lib\emulator" \ /libpath:"$(WINCE_PATH)\Lib\emulator" \
/subsystem:windowsce,4.20 /MACHINE:IX86 \ /subsystem:windowsce,4.20 /MACHINE:IX86 \
$(COMMONOBJ) $(PLATOBJ) $(RSRC) $(COMMONOBJ) $(PLATOBJ) $(RSRC)