Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10627/apps/build/bakefiles
Modified Files:
apps.bkl
Removed Files:
sources.bkl
Log Message:
fixed problem with top_srcdir (autoconf) fixed EOL for MSVC6prj; switch to 26 as wx default version
--- sources.bkl DELETED ---
Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** apps.bkl 23 Jan 2006 21:20:28 -0000 1.15
--- apps.bkl 25 Jan 2006 18:35:58 -0000 1.16
***************
*** 19,35 ****
<if cond="TARGETING_WIN32=='1'">
<!-- Win32 makefiles will be put in BUILD/MSW -->
! <set var="WXLUA_BASEDIR">..$(DIRSEP)..$(DIRSEP)..</set>
! <set var="WXLUA_APPSDIR">..$(DIRSEP)..</set>
</if>
<if cond="TARGETING_WIN32=='0'">
! <!-- Unix makefiles will be put in the main folder -->
! <set var="WXLUA_BASEDIR">..</set>
! <set var="WXLUA_APPSDIR">.</set>
</if>
- <!-- Put all the objects files generated by -->
- <!-- the compilation in a subfolder of BUILD -->
- <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if>
-
<!-- ================================================================== -->
--- 19,34 ----
<if cond="TARGETING_WIN32=='1'">
<!-- Win32 makefiles will be put in BUILD/MSW -->
! <set var="WXLUA_BASEDIR">../../..</set>
! <set var="WXLUA_APPSDIR">../..</set>
</if>
<if cond="TARGETING_WIN32=='0'">
! <!-- In this way we support makefiles created from folders != root folder;
! i.e. with this trick you can do:
! mkdir mybuild && cd mybuild && ../configure && make
! -->
! <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
! <set var="WXLUA_APPSDIR">$(top_srcdir)/apps</set>
</if>
<!-- ================================================================== -->
***************
*** 37,43 ****
<!-- ================================================================== -->
! <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
! <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
! <include file="sources.bkl"/>
--- 36,47 ----
<!-- ================================================================== -->
! <set var="SRCDIR">$(WXLUA_APPSDIR.replace('$(top_srcdir)', '..'))</set>
!
! <set var="WXLUAAPP_SRC">$(fileList('wxlua/src/*.cpp'))</set>
! <set var="WXLUAAPP_HDR">$(fileList('wxlua/src/*.h'))</set>
!
! <set var="WXLUAEDITAPP_SRC">$(fileList('wxluaedit/src/*.cpp'))</set>
! <set var="WXLUAEDITAPP_HDR">$(fileList('wxluaedit/src/*.h'))</set>
!
***************
*** 58,66 ****
as a module target... this would lead to problems when creating global DSW file... -->
<exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
<app-type>gui</app-type>
<sources>$(WXLUAAPP_SRC)</sources>
<headers>$(WXLUAAPP_HDR)</headers>
! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
<install-to>$(BINDIR)</install-to>
--- 62,71 ----
as a module target... this would lead to problems when creating global DSW file... -->
<exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
+ <srcdir>$(WXLUA_APPSDIR)</srcdir>
<app-type>gui</app-type>
<sources>$(WXLUAAPP_SRC)</sources>
<headers>$(WXLUAAPP_HDR)</headers>
! <dirname>$(WXLUA_BASEDIR)/bin</dirname>
<install-to>$(BINDIR)</install-to>
***************
*** 68,75 ****
<win32-res>wxlua/src/wxlua.rc</win32-res>
- <if cond="FORMAT=='msvc6prj' or FORMAT=='msvc'">
- <ldflags>/nodefaultlib:"MSVCRT.lib"</ldflags>
- </if>
-
<!-- Libraries must be put in this EXACT order ! -->
<wxlua-lib>wxluasocket</wxlua-lib>
--- 73,76 ----
***************
*** 94,97 ****
--- 95,99 ----
<exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'">
+ <srcdir>$(WXLUA_APPSDIR)</srcdir>
<app-type>gui</app-type>
<sources>$(WXLUAEDITAPP_SRC)</sources>
***************
*** 99,103 ****
<install-to>$(BINDIR)</install-to>
! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
<exename>wxluaedit</exename>
--- 101,105 ----
<install-to>$(BINDIR)</install-to>
! <dirname>$(WXLUA_BASEDIR)/bin</dirname>
<exename>wxluaedit</exename>
***************
*** 112,120 ****
</if>
! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
!
! <if cond="FORMAT=='msvc6prj' or FORMAT=='msvc'">
! <ldflags>/nodefaultlib:"MSVCRT.lib"</ldflags>
! </if>
<!-- Libraries must be put in the reverse order they'll be loaded -->
--- 114,118 ----
</if>
! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if>
<!-- Libraries must be put in the reverse order they'll be loaded -->
***************
*** 126,130 ****
<wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit -->
-
<wx-lib>stc</wx-lib>
--- 124,127 ----
***************
*** 137,141 ****
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
-
</exe>
--- 134,137 ----
|
