Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/build makefile.bcc,1.1,1.2 makefile.gcc,1.1,1.2 makefile.gnu,1.2,1.3 makefile.vc,1.1,1.2 makefile.wat,1.1,1.2 wxbindcustom.bkl,1.2,1.3
|
From: Francesco M. <fr...@us...> - 2006-02-03 16:51:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18016/modules/wxbind/build Modified Files: makefile.bcc makefile.gcc makefile.gnu makefile.vc makefile.wat wxbindcustom.bkl Log Message: now wxbindcustom makefiles work on Unix Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.bcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.bcc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.bcc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 67,76 **** # The folder where user's custom wxluasetup.h is searched !ifndef WXLUASETUP_DIR ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src !endif # The folder where user's custom wxLuaBind library is sent !ifndef WXLUABINDLIB_DIR ! WXLUABINDLIB_DIR = ..\..\..\lib !endif --- 67,76 ---- # The folder where user's custom wxluasetup.h is searched !ifndef WXLUASETUP_DIR ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup !endif # The folder where user's custom wxLuaBind library is sent !ifndef WXLUABINDLIB_DIR ! WXLUABINDLIB_DIR = ../../..\lib !endif *************** *** 87,92 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ --- 87,91 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ *************** *** 130,135 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ --- 129,134 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ *************** *** 172,178 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" - WX3RDPARTYLIBPOSTFIX = d - !endif !if "$(WX_SHARED)" == "0" __wxbindcustom_lib___depname = \ --- 171,174 ---- *************** *** 182,191 **** __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll !endif - !if "$(WX_SHARED)" == "0" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib$(WXLIBPOSTFIX) - !endif - !if "$(WX_SHARED)" == "1" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll$(WXLIBPOSTFIX) - !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE --- 178,181 ---- *************** *** 195,220 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL ! !endif ! !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 ! !endif ! !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_SHARED)" == "0" ! __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 185,204 ---- !endif !if "$(WX_SHARED)" == "0" ! __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 227,230 **** --- 211,220 ---- WXLIBPOSTFIX = ud !endif + !if "$(WX_DEBUG)" == "0" + ____WX_DEBUG_1 = -v- + !endif + !if "$(WX_DEBUG)" == "1" + ____WX_DEBUG_1 = -v + !endif *************** *** 260,265 **** !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDCUSTOM_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom $@ --- 250,255 ---- !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_1) @&&| ! c0d32.obj $(WXBINDCUSTOM_DLL_OBJECTS),$@,, wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib import32.lib cw32.lib,, | implib -f $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom $@ Index: wxbindcustom.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/wxbindcustom.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbindcustom.bkl 3 Feb 2006 15:42:54 -0000 1.2 --- wxbindcustom.bkl 3 Feb 2006 16:51:38 -0000 1.3 *************** *** 20,27 **** <!-- the default path for the wxluasetup.h file --> ! <set var="WXLUASETUP_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/modules/wxbind/src'))</set> <!-- the default output path for wxLuaBind library --> ! <set var="WXLUABINDLIB_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/lib'))</set> --- 20,33 ---- <!-- the default path for the wxluasetup.h file --> ! <set var="WXLUASETUP_DIR_DEFAULT"> ! <if cond="TARGETING_UNIX=='1'">../setup</if> ! <if cond="TARGETING_WIN32=='1'">$(WXLUA_BASEDIR)\modules\wxbind\setup</if> ! </set> <!-- the default output path for wxLuaBind library --> ! <set var="WXLUABINDLIB_DIR_DEFAULT"> ! <if cond="TARGETING_UNIX=='1'">../../../lib</if> ! <if cond="TARGETING_WIN32=='1'">$(WXLUA_BASEDIR)\lib</if> ! </set> *************** *** 54,64 **** <!-- ================================================================== --> ! <!-- the CUSTOM wxBind lib & dll --> ! <wxlua_lib id="wxbindcustom_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_lib> ! <wxlua_dll id="wxbindcustom_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> --- 60,72 ---- <!-- ================================================================== --> ! <!-- the CUSTOM wxBind lib & dll ! NOTE: we won't use the wxlua-lib template since that supposes that you need ! include paths (e.g. WXLUABASEDIR/modules) which we don't need ! --> ! <wxlua_lib id="wxbindcustom_lib" template="wx-lib,wxbase" cond="WX_SHARED=='0'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_lib> ! <wxlua_dll id="wxbindcustom_dll" template="wx-lib,wxbase" cond="WX_SHARED=='1'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.wat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.wat 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.wat 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 43,50 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 43,50 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 71,78 **** ### Conditionally set variables: ### - WX3RDPARTYLIBPOSTFIX = - !ifeq WX_DEBUG 1 - WX3RDPARTYLIBPOSTFIX = d - !endif __wxbindcustom_lib___depname = !ifeq WX_SHARED 0 --- 71,74 ---- *************** *** 91,101 **** ____WX_DEBUG_14_16 = debug all !endif - __WXLUA_OUTPUT_FOLDER_FILENAMES = - !ifeq WX_SHARED 0 - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib$(WXLIBPOSTFIX) - !endif - !ifeq WX_SHARED 1 - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll$(WXLIBPOSTFIX) - !endif __WXUNICODE_DEFINE_p = !ifeq WX_UNICODE 1 --- 87,90 ---- *************** *** 106,109 **** --- 95,105 ---- __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif + __WXLIBPATH_FILENAMES = + !ifeq WX_SHARED 0 + __WXLIBPATH_FILENAMES = \lib\wat_lib + !endif + !ifeq WX_SHARED 1 + __WXLIBPATH_FILENAMES = \lib\wat_dll + !endif ____WX_SHARED = !ifeq WX_SHARED 0 *************** *** 134,144 **** ____WX_DEBUG_0 = -d2 !endif - __WXLIBPATH_FILENAMES = - !ifeq WX_SHARED 0 - __WXLIBPATH_FILENAMES = \lib\wat_lib - !endif - !ifeq WX_SHARED 1 - __WXLIBPATH_FILENAMES = \lib\wat_dll - !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 --- 130,133 ---- *************** *** 163,168 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -i=$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj & --- 152,157 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=$(WX_DIR)\contrib\include -i=$(WXLUASETUP_DIR) & ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj & *************** *** 205,211 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXBINDCUSTOM_MAKINGDLL -i=$(WXLUASETUP_DIR) & ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj & --- 194,199 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=$(WX_DIR)\contrib\include -dWXBINDCUSTOM_MAKINGDLL & ! -i=$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj & *************** *** 278,284 **** @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_14_16) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDCUSTOM_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc file %i ! @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc system nr_dll --- 266,272 ---- @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc $(LDFLAGS) $(____WX_DEBUG_14_16) @for %i in ($(WXBINDCUSTOM_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc file %i ! @for %i in ( wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc system nr_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.gcc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.gcc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 39,46 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 39,46 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 57,62 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ ! -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o \ --- 57,62 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o \ *************** *** 100,106 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ ! -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o \ --- 100,105 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL \ ! -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o \ *************** *** 143,149 **** ### Conditionally set variables: ### - ifeq ($(WX_DEBUG),1) - WX3RDPARTYLIBPOSTFIX = d - endif ifeq ($(WX_SHARED),0) __wxbindcustom_lib___depname = \ --- 142,145 ---- *************** *** 153,162 **** __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll endif - ifeq ($(WX_SHARED),0) - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib$(WXLIBPOSTFIX) - endif - ifeq ($(WX_SHARED),1) - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll$(WXLIBPOSTFIX) - endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE --- 149,152 ---- *************** *** 166,169 **** --- 156,165 ---- endif ifeq ($(WX_SHARED),0) + __WXLIBPATH_FILENAMES = \lib\gcc_lib + endif + ifeq ($(WX_SHARED),1) + __WXLIBPATH_FILENAMES = \lib\gcc_dll + endif + ifeq ($(WX_SHARED),0) ____WX_SHARED = endif *************** *** 183,198 **** ____WX_DEBUG = -O0 endif - ifeq ($(WX_SHARED),0) - __WXLIBPATH_FILENAMES = \lib\gcc_lib - endif - ifeq ($(WX_SHARED),1) - __WXLIBPATH_FILENAMES = \lib\gcc_dll - endif - ifeq ($(WX_DEBUG),0) - ____WX_DEBUG_2 = - endif - ifeq ($(WX_DEBUG),1) - ____WX_DEBUG_2 = -g - endif ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) --- 179,182 ---- *************** *** 210,213 **** --- 194,203 ---- endif endif + ifeq ($(WX_DEBUG),0) + ____WX_DEBUG_2 = + endif + ifeq ($(WX_DEBUG),1) + ____WX_DEBUG_2 = -g + endif *************** *** 236,240 **** ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,$(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 226,230 ---- ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -mthreads $(____WX_DEBUG_2) -Wl,--out-implib,$(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) endif Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.vc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.vc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.vc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 43,50 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 43,50 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 62,67 **** $(____WX_DEBUG_1) $(______WX_DEBUG) \ /Fd$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ --- 62,67 ---- $(____WX_DEBUG_1) $(______WX_DEBUG) \ /Fd$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.pdb \ ! /I$(WX_DIR)\contrib\include /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ *************** *** 106,112 **** /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) \ ! /Fd$(WXLUABINDLIB_DIR)\wxbindcustom_dll.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(WX_DIR)\contrib\include /DWXBINDCUSTOM_MAKINGDLL \ ! /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ --- 106,112 ---- /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) \ ! /Fd$(WXLUABINDLIB_DIR)\wxbindcustom_dll.pdb /I$(WX_DIR)\contrib\include \ ! /DWXBINDCUSTOM_MAKINGDLL /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ *************** *** 149,155 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" - WX3RDPARTYLIBPOSTFIX = d - !endif !if "$(WX_SHARED)" == "0" __wxbindcustom_lib___depname = \ --- 149,152 ---- *************** *** 165,174 **** ____WX_DEBUG_20_22 = /DEBUG !endif - !if "$(WX_SHARED)" == "0" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_lib$(WXLIBPOSTFIX) - !endif - !if "$(WX_SHARED)" == "1" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll$(WXLIBPOSTFIX) - !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE --- 162,165 ---- *************** *** 178,181 **** --- 169,178 ---- !endif !if "$(WX_SHARED)" == "0" + __WXLIBPATH_FILENAMES = \lib\vc_lib + !endif + !if "$(WX_SHARED)" == "1" + __WXLIBPATH_FILENAMES = \lib\vc_dll + !endif + !if "$(WX_SHARED)" == "0" ____WX_SHARED = !endif *************** *** 213,222 **** ____WX_DEBUG_2 = d !endif - !if "$(WX_SHARED)" == "0" - __WXLIBPATH_FILENAMES = \lib\vc_lib - !endif - !if "$(WX_SHARED)" == "1" - __WXLIBPATH_FILENAMES = \lib\vc_dll - !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u --- 210,213 ---- *************** *** 258,263 **** !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20_22) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDCUSTOM_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib << !endif --- 249,254 ---- !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(____WX_DEBUG_20_22) @<< ! $(WXBINDCUSTOM_DLL_OBJECTS) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib /IMPLIB:$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib << !endif Index: makefile.gnu =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.gnu,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gnu 3 Feb 2006 15:42:54 -0000 1.2 --- makefile.gnu 3 Feb 2006 16:51:38 -0000 1.3 *************** *** 57,61 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../../modules/wxbind/src # The folder where user's custom wxLuaBind library is sent --- 57,61 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../setup # The folder where user's custom wxLuaBind library is sent *************** *** 71,76 **** CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD ! WXBINDCUSTOM_LIB_CXXFLAGS = -I../../../modules -I./../../.. \ ! -I$(WXLUASETUP_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ gnu/wxbindcustom_lib_wxlua.o \ --- 71,76 ---- CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD ! WXBINDCUSTOM_LIB_CXXFLAGS = -I$(WXLUASETUP_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ gnu/wxbindcustom_lib_wxlua.o \ *************** *** 110,116 **** gnu/wxbindcustom_lib_thread.o \ gnu/wxbindcustom_lib_help.o ! WXBINDCUSTOM_DLL_CXXFLAGS = -I../../../modules -I./../../.. \ ! -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) -fPIC -DPIC $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ gnu/wxbindcustom_dll_wxlua.o \ --- 110,115 ---- gnu/wxbindcustom_lib_thread.o \ gnu/wxbindcustom_lib_help.o ! WXBINDCUSTOM_DLL_CXXFLAGS = -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) -fPIC \ ! -DPIC $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ gnu/wxbindcustom_dll_wxlua.o \ *************** *** 248,252 **** ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)/libwxlua_$(WX_PORT)_wxbindcustom-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).so: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -L../../../lib $(WX_LIBS) endif --- 247,251 ---- ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)/libwxlua_$(WX_PORT)_wxbindcustom-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).so: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) $(WX_LIBS) endif |
