summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2009-06-26 19:43:05 +0000
committerscuri <scuri>2009-06-26 19:43:05 +0000
commitd718eeaef158211909dc0e4e4a5ff025d3d06909 (patch)
treef814a3a326a1b76264a843e4827e2a2d218f79db
parentf0c4fccc0b6e6d885b4220d044fbbd19647b6f4f (diff)
*** empty log message ***cd_5_2
-rw-r--r--html/en/download_tips.html27
-rw-r--r--src/tecmake_compact.mak6
2 files changed, 20 insertions, 13 deletions
diff --git a/html/en/download_tips.html b/html/en/download_tips.html
index b7bd258..47286c2 100644
--- a/html/en/download_tips.html
+++ b/html/en/download_tips.html
@@ -94,19 +94,22 @@ stub libraries and Includes for Windows to use with Visual C++
3) &quot;-liup&quot; to specify the library files</pre>
<p>For IDEs the configuration involves the same 3 steps above, but each IDE has a different dialog. The IUP toolkit
has a Guide for some IDEs:</p>
-<p class="info"><strong>Open Watcom</strong> - <a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/owc.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/owc.html</a>
-<br>
- <strong>Dev-C++</strong> - <a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/dev-cpp.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/dev-cpp.html</a>
-<br>
+<p class="info">
<strong>Borland C++ BuilderX</strong> -
<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/cppbx.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/cppbx.html</a><br>
- <strong>Microsoft Visual C++</strong> (Visual Studio 2003) -
-<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc.html</a><br>
- <strong>Microsoft Visual C++</strong> (Visual Studio 2005) -
-<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc8.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc8.html</a><br>
+<strong>Code Blocks</strong> - <a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/codeblocks.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/codeblocks.html</a><br>
+ <strong>Dev-C++</strong> - <a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/dev-cpp.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/dev-cpp.html</a>
+<br>
<strong>Eclipse for C++</strong> -
<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/eclipse.html">
http://www.tecgraf.puc-rio.br/iup/en/ide_guide/eclipse.html</a>
+<br>
+<strong>Microsoft Visual C++</strong> (Visual Studio 2003) -
+<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc.html</a><br>
+ <strong>Microsoft Visual C++</strong> (Visual Studio 2005) -
+<a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc8.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/msvc8.html</a><br>
+<strong>Open Watcom</strong> - <a href="http://www.tecgraf.puc-rio.br/iup/en/ide_guide/owc.html">http://www.tecgraf.puc-rio.br/iup/en/ide_guide/owc.html</a>
+<br>
</p>
<h3><a name="plat">Available Platforms</a></h3>
<p>The following platforms can be available:</p>
@@ -282,13 +285,15 @@ http://www.tecgraf.puc-rio.br/iup/en/ide_guide/eclipse.html</a>
<a href="http://www.mingw.org/" style="text-decoration: none">http://www.mingw.org/</a>
¹<br>
&nbsp;Also compatible with Dev-C++ -
- <a href="http://www.bloodshed.net/devcpp.html" style="text-decoration: none">http://www.bloodshed.net/devcpp.html</a>
+ <a href="http://www.bloodshed.net/devcpp.html" style="text-decoration: none">http://www.bloodshed.net/devcpp.html</a><br>
+&nbsp;and with Code Blocks - <a href="http://www.codeblocks.org/">
+ http://www.codeblocks.org/</a>
¹</td>
</tr>
<tr>
<td bgcolor="#C0C0C0" align="right"><b>Win32_mingw4</b></td>
- <td bgcolor="#C0C0C0">&nbsp;MingW gcc 4.x (unofficial) -
- <a href="http://www.develer.com/oss/GccWinBinaries" style="text-decoration: none">http://www.develer.com/oss/GccWinBinaries</a>
+ <td bgcolor="#C0C0C0">&nbsp;MingW gcc 4.4 -
+ <a href="http://www.mingw.org/" style="text-decoration: none">http://www.mingw.org/</a>
¹</td>
</tr>
<tr>
diff --git a/src/tecmake_compact.mak b/src/tecmake_compact.mak
index d1a61ff..d4fe0af 100644
--- a/src/tecmake_compact.mak
+++ b/src/tecmake_compact.mak
@@ -635,8 +635,10 @@ ifdef USE_LUA
ifndef NO_LUALIB
LIBS += lualib$(LUASUFX)
endif
- LIBS += lua$(LUASUFX)
- LDIR += $(LUA_LIB)
+ ifndef NO_LUALINK
+ LIBS += lua$(LUASUFX)
+ LDIR += $(LUA_LIB)
+ endif
endif
LUA_INC ?= $(LUA)/include