Fixed bug in UCS2/UCS4 detection. Thx to Sanghyeon Seo · pythonnet/pythonnet@529cf1f · GitHub

pythonnet / pythonnet Public

• Notifications You must be signed in to change notification settings
• Fork 780
• Star 5.5k

• Code
• Issues 153
• Pull requests 12
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 529cf1f

Browse filesBrowse the repository at this point in the historyBrowse files

tiran

committed

Fixed bug in UCS2/UCS4 detection. Thx to Sanghyeon Seo

1 parent 221715e commit 529cf1f
Copy full SHA for 529cf1f

1 file changed

+8-6Lines changed: 8 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• pythonnet
  • Makefile

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎pythonnet/Makefile‎

Copy file name to clipboardExpand all lines: pythonnet/Makefile

+8-6Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -9,9 +9,10 @@ RELEASE = pythonnet-2.0-alpha2
9	9	KEYFILE = pythonnet.key
10	10
11	11	PYTHON ?= python
12		- PYTHONVER ?= $(shell $(PYTHON) -c "import sys; print 'PYTHON%i%i' % sys.version_info[:2]")
13		- UCS ?= $(shell $(PYTHON) -c "from distutils.sysconfig import get_config_var; \
14		- print 'UCS%i' % (get_config_var('Py_UNICODE_SIZE') or 2)")
	12	+ PYTHONVER ?= $(shell $(PYTHON) -c "import sys; \
	13	+ print 'PYTHON%i%i' % sys.version_info[:2]")
	14	+ UCS ?= $(shell $(PYTHON) -c "import sys; \
	15	+ print 'UCS%i' % ((sys.maxunicode > 65536) and 4 or 2)")
15	16	SITEPACKAGES = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; \
16	17	print get_python_lib(plat_specific=1, standard_lib=0)")
17	18	INSTALL=/usr/bin/install -m644
@@ -37,16 +38,16 @@ else
37	38	endif
38	39
39	40	ifeq ($(origin DEFINE), undefined)
40		- _DEFINE = $(PYTHONVER),$(UCS)
	41	+ _DEFINE =
41	42	else
42		- _DEFINE = $(DEFINE),$(PYTHONVER),$(UCS)
	43	+ _DEFINE = /define:$(DEFINE)
43	44	endif
44	45
45	46	ifeq ($(UCS), UCS4)
46	47	RUNTIME_REF = /reference:Mono.Posix.dll
47	48	endif
48	49
49		- CSC += /define:$(_DEFINE) /nologo $(CSCARGS)
	50	+ CSC += /define:$(PYTHONVER) /define:$(UCS) $(_DEFINE) /nologo $(CSCARGS)
50	51
51	52	BASEDIR = $(shell pwd)
52	53
@@ -172,3 +173,4 @@ install: all
172	173
173	174	mkkey:
174	175	$(SN) -k $(KEYFILE)
	176	+

0 commit comments

Comments

0 (0)