You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/03 09:04:47 UTC
svn commit: r1814145 - in /commons/proper/daemon/trunk/src/native/windows:
apps/prunmgr/Makefile apps/prunsrv/Makefile include/Makefile.inc
Author: markt
Date: Fri Nov 3 09:04:46 2017
New Revision: 1814145
URL: http://svn.apache.org/viewvc?rev=1814145&view=rev
Log:
Make files were hard-coded to support Unicode so remove it as an option
Modified:
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile?rev=1814145&r1=1814144&r2=1814145&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile Fri Nov 3 09:04:46 2017
@@ -15,7 +15,6 @@
TARGET = GUI
PROJECT = prunmgr
-UNICODE = 1
!include <..\..\include\Makefile.inc>
!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile?rev=1814145&r1=1814144&r2=1814145&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile Fri Nov 3 09:04:46 2017
@@ -15,7 +15,6 @@
TARGET = EXE
PROJECT = prunsrv
-UNICODE = 1
!include <..\..\include\Makefile.inc>
!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
Modified: commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc?rev=1814145&r1=1814144&r2=1814145&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc Fri Nov 3 09:04:46 2017
@@ -45,9 +45,6 @@
# GUI Windows GUI executable
# DLL Dynamic Link Library
# LIB Static library
-# UNICODE Build unicode version
-# If definded and not empty -D_UNICODE is added
-# to CFLAGS; -D_MBCS is added otherwise
# Environment variables used:
# EXTRA_CFLAGS Added to the common CFLAGS
# EXTRA_CXXFLAGS Added to the common CXXFLAGS
@@ -200,11 +197,8 @@ CMN_CFLAGS = $(CMN_CFLAGS) -D_CONSOLE
# Mark that extern C newer throws C++ exception
CMN_CFLAGS = $(CMN_CFLAGS) -EHsc
-!IF !DEFINED(UNICODE) || "$(UNICODE)" == ""
-CMN_CFLAGS = $(CMN_CFLAGS) -D_MBCS -DMBCS
-!ELSE
+# All supported platforms support unicode
CMN_CFLAGS = $(CMN_CFLAGS) -D_UNICODE -DUNICODE
-!ENDIF
!IF "$(CPU)" == "X86"
CPU_CFLAGS = -D_X86_=1