summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2010-11-09 13:26:37 +0000
committerscuri <scuri>2010-11-09 13:26:37 +0000
commit7c8e1fc2a2044be0082b90adc194ab3e188fa723 (patch)
tree440da97895c4da75a331d43db1e2015b993c5926
parent47695ef9390718f6ee3b8ea184debda973531d30 (diff)
*** empty log message ***
-rw-r--r--html/en/guide.html24
-rw-r--r--src/Makefile4
-rw-r--r--tecmake.mak (renamed from src/tecmake.mak)0
-rw-r--r--tecmakewin.mak (renamed from src/tecmakewin.mak)8
4 files changed, 22 insertions, 14 deletions
diff --git a/html/en/guide.html b/html/en/guide.html
index 6e8aba1..dcb8eca 100644
--- a/html/en/guide.html
+++ b/html/en/guide.html
@@ -63,14 +63,14 @@
<h3 align="left"><a name="buildlib">Building the Library</a> </h3>
-<p>In the Downloads you will ne able to find pre-compiled binaries for many
+<p>In the Downloads you will be able to find pre-compiled binaries for many
platforms, all those binaries were built using Tecmake. Tecmake is a command line multi compiler build tool
based on GNU make, available at
<a target="_blank" href="http://www.tecgraf.puc-rio.br/tecmake">http://www.tecgraf.puc-rio.br/tecmake</a>. Tecmake is
used by all the Tecgraf libraries and many applications.</p>
-<p>In UNIX, you do not need to install Tecmake, a compact version of Tecmake for
-UNIX is already included in the source code package. Just type &quot;make&quot; in the
-command line on the &quot;src&quot; folder and all libraries and executables will be
+<p>In UNIX, you do not need to install Tecmake, a version for
+Posix systems is already included in the source code package. Just type &quot;make&quot; in the
+command line on the &quot;src&quot; folder and all libraries will be
build.
Set the TECTOOLS_HOME environment variable to the folder were the Lua libraries
are installed, by default it will assume &quot;TECTOOLS_HOME=../..&quot;.</p>
@@ -78,12 +78,20 @@ are installed, by default it will assume &quot;TECTOOLS_HOME=../..&quot;.</p>
Linux</a>&quot; guide.</p>
<p>In Windows, the easiest way to build everything is to install the Tecmake tool into your system. It is easy and helps a lot.
The Tecmake configuration files (*.mak) available at the &quot;src&quot; folder are very easy to understand also.
-Also there are files named
+There are files named
<i>make_uname.bat</i> that build the libraries using <b>Tecmake</b>. To build for Windows using
- Visual C 7.0 (2005) for example, just execute <i>&quot;make_uname vc7&quot;</i> , or the
-DLLs with Visual C++ 9 (2008) type <i>&quot;make_uname dll9&quot;</i>. The Visual
+ Visual C 9.0 (2008) for example, just execute <i>&quot;make_uname vc9&quot;</i> , or
+for the
+DLLs type <i>&quot;make_uname dll9&quot;</i>. The Visual
Studio workspaces with the respective projects available in the source package
is for debugging purposes only.</p>
+<p>If you don't want to install Tecmake you can use the version for Windows
+systems that is included in the source code package. BUt is is more complicated
+that its Posix counterpart. First the GNU make must be installed and in the PATH
+before other makes. In the command line you must specify the compiler path and
+the TEC_UNAME variable. For example:</p>
+<pre>make -f tecmakewin.mak TEC_UNAME=mingw4 MINGW4=c:/mingw
+make -f tecmakewin.mak TEC_UNAME=gcc4 GCC4=c:/cygwin (Cygwin building for Win32)</pre>
<p>Make sure you have all the dependencies for the library you want installed,
see the documentation bellow.</p>
<p>If you are going to build all the libraries,
@@ -120,7 +128,7 @@ imlua_process51 -&gt; imlua51
-&gt; im_process</pre>
<p>As a general rule (excluding system dependencies and included third party
libraries): IM has NO external dependencies, and IMLua depends on Lua.</p>
-<p>The Lua binding for IM (Makfiles and Pre-compiled binaries) depend on the
+<p>The Lua binding for IM (Makefiles and Pre-compiled binaries) depend on the
<a href="http://luabinaries.luaforge.net/">LuaBinaries</a> distribution. So if
you are going to build all use the <strong>LuaBinaries</strong> source package
also, not the <strong>Lua.org</strong> original source package. If you like to
diff --git a/src/Makefile b/src/Makefile
index c819fb0..8021b71 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,8 @@
ifeq ($(OS), Windows_NT)
- TECMAKE_CMD = $(MAKE) --no-print-directory -f tecmakewin.mak TEC_UNAME=$(TEC_UNAME)
+ TECMAKE_CMD = $(MAKE) --no-print-directory -f ../tecmakewin.mak TEC_UNAME=$(TEC_UNAME)
WINLIBS = im_avi im_wmv imlua_avi imlua_wmv im_capture imlua_capture5
else
- TECMAKE_CMD = $(MAKE) --no-print-directory -f tecmake.mak
+ TECMAKE_CMD = $(MAKE) --no-print-directory -f ../tecmake.mak
endif
.PHONY: do_all im im_jp2 im_process im_fftw imlua3 imlua5 imlua_jp2 imlua_process5 imlua_fftw5 $(WINLIBS)
diff --git a/src/tecmake.mak b/tecmake.mak
index 2426d5b..2426d5b 100644
--- a/src/tecmake.mak
+++ b/tecmake.mak
diff --git a/src/tecmakewin.mak b/tecmakewin.mak
index 90506ed..71987d9 100644
--- a/src/tecmakewin.mak
+++ b/tecmakewin.mak
@@ -26,14 +26,14 @@ TECMAKE = $(TECMAKE_HOME)/tecmakewin.mak
# If tecmake.bat is not used,
# then at least define main system variables.
-WIN32NAMES = vc10 vc9 vc8 vc7 vc6 owc1 bc55 bc56 bc6 gcc3 gcc4 mingw3 mingw4 dllw4 dllg4 dll dll7 dll8 dll9 dll10
+WIN32UNAMES = vc10 vc9 vc8 vc7 vc6 owc1 bc55 bc56 bc6 gcc3 gcc4 mingw3 mingw4 dllw4 dllg4 dll dll7 dll8 dll9 dll10
WIN64UNAMES = vc10_64 vc9_64 vc8_64 dll8_64 dll9_64 dll10_64
ifdef TEC_UNAME
- ifneq ($(findstring $(TEC_UNAME), $(WIN32NAMES)), )
+ ifneq ($(findstring $(TEC_UNAME), $(WIN32UNAMES)), )
TEC_WIN32 = Yes
else
- ifneq ($(findstring $(TEC_UNAME), $(WIN64NAMES)), )
+ ifneq ($(findstring $(TEC_UNAME), $(WIN64UNAMES)), )
TEC_WIN64 = Yes
endif
endif
@@ -64,7 +64,7 @@ sysinfo:
#---------------------------------#
# Known platforms
-UNAMES = $(WIN32NAMES) $(WIN64NAMES)
+UNAMES = $(WIN32UNAMES) $(WIN64UNAMES)
#---------------------------------#