From 6c9e05e04f42e7009fcdd7717a1e58b63eb65e90 Mon Sep 17 00:00:00 2001
From: Daniel Dragan <bulk88@hotmail.com>
Date: Sun, 28 Dec 2014 15:38:18 -0500
Subject: [PATCH] makefile fixes for WinCE

-OPTIMIZE makefile define was used by the ce makefile but never defined
 before, now its defined
-BUILDOPT contained CECFLAGS, but CFLAGS->DEFINES->CECFLAGS
 and the root define CFLAGS_O, contains $(CFLAGS) and $(BUILDOPT), CECFLAGS
 which 2-3 console lines long, was given to the CC twice, this give
 unecesserily long console output, so remove the duplicate CECFLAGS
-unblock Time::Piece, it got fixed for CE and applied to blead
-Win32CORE needs to be static like on desktop Perl
-remove unused PCHFLAGS define, it has never been used on desktop makefile
-remove comment from config.ce, that wasn't a comment! and went to linker
 cmd line
-add NO_MATHOMS, this is a resource limited device
---
 win32/Makefile.ce |   30 ++++++++++++++++++------------
 win32/config.ce   |    2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index e3fd4bf..2f8683c 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -387,23 +387,24 @@ CEDEFS    = -D_WINDOWS -D_WIN32_WCE=$(CEVersion) -DUNDER_CE=$(CEVersion) \
 CECFLAGS  = $(CEDEFS) -Zi
 
 !if "$(CFG)" == "DEBUG"
-CECFLAGS  = $(CECFLAGS) -Od
+OPTIMIZE        = -Od
 !endif
 
 !if "$(CFG)" == "RELEASE"
 # -O2 and -Ot give internal compiler error in perl.c and lexer.
 # Also the dll cannot be loaded by perl.exe...
 !if "$(CPU)" == "SH3"
+OPTIMIZE        = -Od
 !else
-CECFLAGS  = $(CECFLAGS) -O1
+OPTIMIZE        = -O1
 !endif
 !  IF "$(CCTYPE)" != "MSVC60"
 #turn on LTCG optimization for CCs that have it
-CECFLAGS	= $(CECFLAGS) -GL
+OPTIMIZE	= $(OPTIMIZE) -GL
 !  ENDIF
 !  IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC90"
 #no stack security cookie for CCs where its on by default
-CECFLAGS	= $(CECFLAGS) -GS-
+$(OPTIMIZE)	= $(OPTIMIZE) -GS-
 !  ENDIF
 !endif
 
@@ -432,7 +433,7 @@ RCDEFS    = /l 0x407 /r /d "UNICODE" /d UNDER_CE=$(CEVersion) \
 # Additional compiler flags can be specified here.
 #
 
-BUILDOPT	= $(BUILDOPT) $(CECFLAGS) -DUSE_CROSS_COMPILE
+BUILDOPT	= $(BUILDOPT) -DUSE_CROSS_COMPILE
 
 
 !IF "$(CRYPT_SRC)$(CRYPT_LIB)" == ""
@@ -510,7 +511,7 @@ LIB32		= $(LINK32) -lib
 RSC		= rc
 
 INCLUDES	= -I.\include -I. -I..
-DEFINES		= -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) $(CECFLAGS)
+DEFINES		= -DWIN32 -D_CONSOLE -DNO_STRICT -DNO_MATHOMS $(CRYPT_FLAG) $(CECFLAGS)
 LOCDEFS		= -DPERLDLL -DPERL_CORE
 CXX_FLAG	= -TP
 
@@ -540,8 +541,8 @@ LIBBASEFILES	= $(CRYPT_LIB) $(CELIBS)
 
 LIBFILES	= $(LIBBASEFILES) $(LIBC)
 
-CFLAGS		= -nologo -GF -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
-		$(PCHFLAGS) $(OPTIMIZE)
+CFLAGS		= -nologo -GF -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS)\
+		$(OPTIMIZE)
 
 LINK_FLAGS	= -nologo -debug -opt:ref,icf -machine:$(PROCESSOR_ARCHITECTURE)
 
@@ -732,7 +733,7 @@ DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX attributes B re \
 		Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
 		Sys/Hostname
 
-STATIC_EXT	= DynaLoader
+STATIC_EXT	= DynaLoader Win32CORE
 
 DYNALOADER	= $(EXTDIR)\DynaLoader\DynaLoader
 
@@ -851,8 +852,12 @@ NOT_COMPILE_EXT = $(NOT_COMPILE_EXT) !XS/Typemap
 
 Extensions: ..\make_ext.pl $(CONFIGPM)
 	$(HPERL) -I..\lib -I. ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR)  --all \
-	!POSIX !Win32 !Win32API/File !Time/HiRes !Time/Piece !re !SDBM_File $(NOT_COMPILE_EXT)
+	!POSIX !Win32 !Win32API/File !Time/HiRes !re !SDBM_File $(NOT_COMPILE_EXT)
 
+Extensions_static : ..\make_ext.pl ..\lib\buildcustomize.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
+	$(XCOPY) ..\*.h $(COREDIR)\*.*
+	$(HPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --static
+	$(HPERL) -I..\lib list_static_libs.pl > Extensions_static
 
 Extensions_nonxs: ..\make_ext.pl ..\lib\buildcustomize.pl $(CONFIGPM) ..\pod\perlfunc.pod
 	$(XCOPY) ..\*.h $(COREDIR)\*.*
@@ -877,6 +882,7 @@ clean: Extensions_clean
 	-@$(DEL) ..\git_version.h
   -@$(DEL) config.h perl.res
   -@$(DEL) ..\t\test_state
+  -@$(DEL) Extensions_static
 
 XDLLOBJS = \
 $(DLLDIR)\av.obj \
@@ -974,11 +980,11 @@ perldll.def : $(HPERL) $(CONFIGPM) ..\embed.fnc ..\makedef.pl create_perllibst_h
 	$(HPERL) -I..\lib -w ..\makedef.pl PLATFORM=wince $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
 	    CCTYPE=$(CCTYPE) -DPERL_DLL=$(PERLDLL) TARG_DIR=..\ > perldll.def
 
-$(PERLDLL) : header_check lib_check $(DLLDIR) perldll.def $(XDLLOBJS) $(PERLDLL_RES)
+$(PERLDLL) : header_check lib_check $(DLLDIR) perldll.def $(XDLLOBJS) $(PERLDLL_RES) Extensions_static
 	$(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ \
                   $(SUBSYS) $(LDLIBPATH) \
 		  $(LINK_FLAGS) $(LIBFILES) \
-		  $(XDLLOBJS) $(PERLDLL_RES)
+		  $(XDLLOBJS) @Extensions_static $(PERLDLL_RES)
 
 $(DLLDIR) :
 	if not exist "$(DLLDIR)" mkdir "$(DLLDIR)"
diff --git a/win32/config.ce b/win32/config.ce
index f49379f..1578171 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -11,7 +11,7 @@ RCSfile='$RCSfile'
 Revision='$Revision'
 Source=''
 State=''
-_a='.lib' # keep this for WinCE, as it is used by some mods...
+_a='.lib'
 _exe='.exe'
 _o='.obj'
 afs='false'
-- 
1.7.9.msysgit.0