Browse Source

Merge branch 'master' of https://github.com/acplt/open62541 into automation

Conflicts:
	Makefile.am
Stasik0 10 years ago
parent
commit
98b590e7f0
2 changed files with 25 additions and 6 deletions
  1. 11 2
      Makefile.am
  2. 14 4
      README.md

+ 11 - 2
Makefile.am

@@ -1,8 +1,14 @@
 #AM_CFLAGS  = -std=c99 -pedantic -pipe -fPIC -fno-exceptions -fstack-protector -Wl,-z,relro -Wl,-z,now -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wformat -Wreturn-type -Wsign-compare -Wmultichar -Wformat-nonliteral -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -Werror
-AM_CFLAGS  = -std=c99 -pedantic -pipe -fPIC -fno-exceptions -fstack-protector -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wformat -Wreturn-type -Wsign-compare -Wmultichar -Wformat-nonliteral -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -Werror
+AM_CFLAGS  = -std=c99 -pedantic -pipe -funsigned-char -Wno-pointer-sign -fno-exceptions -fstack-protector -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wformat -Wreturn-type -Wsign-compare -Wmultichar -Wformat-nonliteral -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -Werror
 AM_LDFLAGS =
 AM_LDADD =
 
+if TARGET_WIN
+else
+AM_CFLAGS += -fPIC 
+endif
+
+
 if DEBUG
 AM_CFLAGS += -g3 -O0
 else
@@ -29,5 +35,8 @@ endif
 if ENABLE_DOXYGEN
 	SUBS+= doc
 endif
+	
+if TARGET_WIN
+else
 SUBDIRS = $(SUBS) examples/src	
-
+endif

+ 14 - 4
README.md

@@ -68,17 +68,22 @@ $ mingw-get install libexpat
 ```
 
 ##### Get Python and lxml:
-* download Python at https://python.org/downloads (recommended version: 3.4.x)
+* download Python (Windows x86 MSI Installer) at https://python.org/downloads (necessary version: 2.7.x)
 * install the executable
-* add the install directory (e. g. "c:\python34") to your windows path variable [Selectable in the setup-options]
+* add the install directory (e. g. "c:\python27") to your windows path variable [Selectable in the setup-options]
 * restart mingw console
-* install lxml by either downloading and installing http://www.lfd.uci.edu/~gohlke/pythonlibs/#lxml (choose the version which fits    to your python installation) or by following the instructions
+* install lxml by either downloading and installing http://www.lfd.uci.edu/~gohlke/pythonlibs/#lxml (choose the version which fits    to your python installation (x86 version)) or by following the instructions
   given here: http://lxml.de/installation.html 
-* [HINT for Windows x64 Users]: To use the first option to install lxml, it is necessary to edit the registry: The install path of python needs to be copyed in an other registry directroy: [FROM]: HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Python\PythonCore\3.4\InstallPath [TO]: HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\3.4\InstallPath
+* add ("C:\Python27\Tools\Scripts") to your windows path variable
+
 
 ##### Get git (IMPORTANT: get 1.8.4, since 1.8.5.2 has a bug):
 * http://code.google.com/p/msysgit/downloads/detail?name=Git-1.8.4-preview20130916.exe&can=2&q=
 
+##### SVN:
+* download: http://tortoisesvn.net/downloads.html
+* install svn @ c:\MinGW\
+
 ##### Getting and installing *check* as unit testing framework (http://check.sourceforge.net/):
 * Open MinGW\msys\1.0\msys.bat
 
@@ -91,6 +96,11 @@ $ make
 $ make install
 ```
 
+##### Adjusting MinGW
+* open the file c:\MinGW\include\io.h and replace every off64_t with _off64_t (4x should off64_t appear)
+* open the file c:\MinGW\include\unistd.h and replace every off_t with _off_t (2x should off_t appear)
+* download the queue.h header @ http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h and copy it to c:\MinGW\include\sys
+
 ## Building 
 * use autogen.sh only first time and whenever aclocal.m4 or configure.ac were modified
 ```bash