You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
From: John L. <jr...@us...> - 2011-11-16 04:40:51
|
Update of /cvsroot/wxlua/wxLua/samples In directory vz-cvs-4.sog:/tmp/cvs-serv3909/samples Modified Files: printing.wx.lua Log Message: wxPrintSetupDialog and wxPrintDialog are derived from wxObject so we can/should delete() them. Index: printing.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** printing.wx.lua 22 Feb 2008 19:04:32 -0000 1.19 --- printing.wx.lua 16 Nov 2011 04:40:48 -0000 1.20 *************** *** 194,203 **** function PrintSetup() ! -- NOTE : this function crashes in wxWidgets GTK wxWidgets 2.8.2 local printDialogData = wx.wxPrintDialogData(printData) local printerDialog = wx.wxPrintDialog(frame, printDialogData) ! --printerDialog:GetPrintDialogData():SetSetupDialog(true) ! printerDialog:ShowModal() ! printData = printerDialog:GetPrintDialogData():GetPrintData():Copy() end --- 194,205 ---- function PrintSetup() ! -- NOTE : This function crashes in wxWidgets GTK wxWidgets 2.8.12 ! -- The wxWidgets print sample doesn't even demonstate this. local printDialogData = wx.wxPrintDialogData(printData) local printerDialog = wx.wxPrintDialog(frame, printDialogData) ! printerDialog:GetPrintDialogData():SetSetupDialog(true) ! if (printerDialog:ShowModal() == wx.wxID_OK) then ! printData = printerDialog:GetPrintDialogData():GetPrintData():Copy() ! end end *************** *** 205,211 **** printData = pageSetupDialogData:GetPrintData():Copy() local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupDialogData) ! pageSetupDialog:ShowModal() ! printData = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy() ! pageSetupDialogData = pageSetupDialog:GetPageSetupDialogData():Copy() pageSetupDialog:delete() end --- 207,214 ---- printData = pageSetupDialogData:GetPrintData():Copy() local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupDialogData) ! if (pageSetupDialog:ShowModal() == wx.wxID_OK) then ! printData = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy() ! pageSetupDialogData = pageSetupDialog:GetPageSetupDialogData():Copy() ! end pageSetupDialog:delete() end *************** *** 240,244 **** local fileMenu = wx.wxMenu() fileMenu:Append(ID_PAGESETUP, "Page S&etup...", "Set up the page") ! fileMenu:Append(ID_PRINTSETUP, "Print &Setup...", "Set up the printer") fileMenu:Append(ID_PRINTPREVIEW, "Print Pre&view...", "Preview the test print") fileMenu:Append(ID_PRINT, "&Print...", "Print the test print") --- 243,247 ---- local fileMenu = wx.wxMenu() fileMenu:Append(ID_PAGESETUP, "Page S&etup...", "Set up the page") ! --fileMenu:Append(ID_PRINTSETUP, "Print &Setup...", "Set up the printer") fileMenu:Append(ID_PRINTPREVIEW, "Print Pre&view...", "Preview the test print") fileMenu:Append(ID_PRINT, "&Print...", "Print the test print") |
From: John L. <jr...@us...> - 2011-11-16 04:40:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory vz-cvs-4.sog:/tmp/cvs-serv3909/modules/wxbind/src Modified Files: wxcore_print.cpp Log Message: wxPrintSetupDialog and wxPrintDialog are derived from wxObject so we can/should delete() them. Index: wxcore_print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_print.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxcore_print.cpp 1 Oct 2009 04:21:01 -0000 1.17 --- wxcore_print.cpp 16 Nov 2011 04:40:48 -0000 1.18 *************** *** 2133,2136 **** --- 2133,2139 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxPageSetupDialog_delete[] = { &wxluatype_wxPageSetupDialog, NULL }; + static wxLuaBindCFunc s_wxluafunc_wxLua_wxPageSetupDialog_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxPageSetupDialog_delete }}; + static wxLuaArgType s_wxluatypeArray_wxLua_wxPageSetupDialog_constructor[] = { &wxluatype_wxWindow, &wxluatype_wxPageSetupDialogData, NULL }; static int LUACALL wxLua_wxPageSetupDialog_constructor(lua_State *L); *************** *** 2147,2150 **** --- 2150,2155 ---- // call constructor wxPageSetupDialog* returns = new wxPageSetupDialog(parent, data); + // add to tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxPageSetupDialog); // push the constructed class pointer wxluaT_pushuserdatatype(L, returns, wxluatype_wxPageSetupDialog); *************** *** 2166,2169 **** --- 2171,2175 ---- { "GetPageSetupDialogData", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPageSetupDialog_GetPageSetupDialogData, 1, NULL }, { "ShowModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPageSetupDialog_ShowModal, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPageSetupDialog_delete, 1, NULL }, { "wxPageSetupDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPageSetupDialog_constructor, 1, NULL }, *************** *** 2251,2254 **** --- 2257,2263 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxPrintDialog_delete[] = { &wxluatype_wxPrintDialog, NULL }; + static wxLuaBindCFunc s_wxluafunc_wxLua_wxPrintDialog_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxPrintDialog_delete }}; + static wxLuaArgType s_wxluatypeArray_wxLua_wxPrintDialog_constructor[] = { &wxluatype_wxWindow, &wxluatype_wxPrintDialogData, NULL }; static int LUACALL wxLua_wxPrintDialog_constructor(lua_State *L); *************** *** 2265,2268 **** --- 2274,2279 ---- // call constructor wxPrintDialog* returns = new wxPrintDialog(parent, data); + // add to tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxPrintDialog); // push the constructed class pointer wxluaT_pushuserdatatype(L, returns, wxluatype_wxPrintDialog); *************** *** 2289,2292 **** --- 2300,2304 ---- { "GetPrintDialogData", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialog_GetPrintDialogData, 1, NULL }, { "ShowModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialog_ShowModal, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrintDialog_delete, 1, NULL }, { "wxPrintDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPrintDialog_constructor, 1, NULL }, |
From: John L. <jr...@us...> - 2011-11-15 04:59:15
|
Update of /cvsroot/wxlua/wxLua/build In directory vz-cvs-4.sog:/tmp/cvs-serv13675/build Modified Files: CMakeFunctions.txt Log Message: Add new client/server example, thanks to Andre Arpin. Fix image sample bug. Minor CMake build fixes. Index: CMakeFunctions.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/CMakeFunctions.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CMakeFunctions.txt 12 Nov 2011 05:44:48 -0000 1.4 --- CMakeFunctions.txt 15 Nov 2011 04:59:13 -0000 1.5 *************** *** 19,23 **** # ADD_TEST() - overrides CMake's ADD_TEST(), remembers what was added # ADD_GTEST() - Add a test using Google's GTest, tests for failure. ! # ADD_STATIC_ANALYSIS_TEST() - Add test using cppcheck (if available) # # ADD_LIBRARY_FULL() - Complete wrapper for ADD_LIBRARY() with many conveniences. --- 19,23 ---- # ADD_TEST() - overrides CMake's ADD_TEST(), remembers what was added # ADD_GTEST() - Add a test using Google's GTest, tests for failure. ! # ADD_CPPCHECK_TEST() - Add a static analysis test using cppcheck (if available) # # ADD_LIBRARY_FULL() - Complete wrapper for ADD_LIBRARY() with many conveniences. *************** *** 39,52 **** # are not cached so it needs to be be run for each configuration. # Using properties does the trick of storing a variable per configuration run, ! # accessible at all scopes, but having it cleared for the next run. # =========================================================================== ! get_property(PROP_CMAKEFUNCTIONS_RUN_ONCE GLOBAL PROPERTY CMAKEFUNCTIONS_RUN_ONCE SET) ! if (PROP_CMAKEFUNCTIONS_RUN_ONCE) return() endif() ! set_property(GLOBAL PROPERTY CMAKEFUNCTIONS_RUN_ONCE TRUE) # =========================================================================== --- 39,54 ---- # are not cached so it needs to be be run for each configuration. # Using properties does the trick of storing a variable per configuration run, ! # accessible at all scopes like a cache var, but it is cleared each run. # =========================================================================== ! get_property(CMAKEFUNCTIONS_RUN_ONCE_CALLED DIRECTORY ${CMAKE_HOME_DIRECTORY} ! PROPERTY CMAKEFUNCTIONS_RUN_ONCE SET) ! if (CMAKEFUNCTIONS_RUN_ONCE_CALLED) return() endif() ! set_property(DIRECTORY ${CMAKE_HOME_DIRECTORY} ! PROPERTY CMAKEFUNCTIONS_RUN_ONCE TRUE) # =========================================================================== *************** *** 122,126 **** endif() endforeach() - ENDFUNCTION() --- 124,127 ---- *************** *** 136,140 **** FUNCTION( GET_OBJECT_FILES target_name object_file_list source_files ) - if (MSVC) foreach(f ${source_files}) --- 137,140 ---- *************** *** 149,153 **** endforeach() else() - # Backwards compat to CMake <= 2.8.4 if ("${CMAKE_CURRENT_LIST_DIR}" STREQUAL "") --- 149,152 ---- *************** *** 182,188 **** UNSET(ADD_TEST_DIR_LIST CACHE) UNSET(ADD_TEST_DIR_NAME_LIST CACHE) ! UNSET(ADD_STATIC_ANALYSIS_TEST_LIST CACHE) ! UNSET(ADD_STATIC_ANALYSIS_TEST_DIR_LIST CACHE) ! UNSET(ADD_STATIC_ANALYSIS_TEST_DIR_NAME_LIST CACHE) # --------------------------------------------------------------------------- --- 181,187 ---- UNSET(ADD_TEST_DIR_LIST CACHE) UNSET(ADD_TEST_DIR_NAME_LIST CACHE) ! UNSET(ADD_CPPCHECK_TEST_LIST CACHE) ! UNSET(ADD_CPPCHECK_TEST_DIR_LIST CACHE) ! UNSET(ADD_CPPCHECK_TEST_DIR_NAME_LIST CACHE) # --------------------------------------------------------------------------- *************** *** 190,197 **** # --------------------------------------------------------------------------- FUNCTION( PRINT_ADD_SUBDIRECTORY ) ! MESSAGE( STATUS "* Subdirectories that contain generated build files from ADD_SUBDIRECTORY():" ) ! LIST(SORT ADD_SUBDIRECTORY_LIST) # ok to sort this list inplace ! STRING(REGEX REPLACE ";" "\n* - " ADD_SUBDIRECTORY_LIST_STR "${ADD_SUBDIRECTORY_LIST}") MESSAGE( STATUS "* - ${ADD_SUBDIRECTORY_LIST_STR}") ENDFUNCTION() --- 189,197 ---- # --------------------------------------------------------------------------- FUNCTION( PRINT_ADD_SUBDIRECTORY ) ! MESSAGE( STATUS "* Subdirectories that contain projects from ADD_SUBDIRECTORY():" ) ! SET(ADD_SUBDIRECTORY_LIST_SORTED ${ADD_SUBDIRECTORY_LIST}) ! LIST(SORT ADD_SUBDIRECTORY_LIST_SORTED) ! STRING(REGEX REPLACE ";" "\n* - " ADD_SUBDIRECTORY_LIST_STR "${ADD_SUBDIRECTORY_LIST_SORTED}") MESSAGE( STATUS "* - ${ADD_SUBDIRECTORY_LIST_STR}") ENDFUNCTION() *************** *** 222,226 **** # --------------------------------------------------------------------------- ! # Replace the ADD_SUBDIRECTORY() function to remember what # subdirectories were added so we can do things with them. # --------------------------------------------------------------------------- --- 222,226 ---- # --------------------------------------------------------------------------- ! # Replace the ADD_SUBDIRECTORY(source_dir) function to remember what # subdirectories were added so we can do things with them. # --------------------------------------------------------------------------- *************** *** 242,246 **** # --------------------------------------------------------------------------- ! # Replace the ADD_LIBRARY() function to remember what # library targets were added so we can do things with them. # --------------------------------------------------------------------------- --- 242,246 ---- # --------------------------------------------------------------------------- ! # Replace the ADD_LIBRARY(name ...) function to remember what # library targets were added so we can do things with them. # --------------------------------------------------------------------------- *************** *** 257,261 **** # --------------------------------------------------------------------------- ! # Replace the ADD_EXECUTABLE() function to remember what # executable targets were added so we can do things with them. # --------------------------------------------------------------------------- --- 257,261 ---- # --------------------------------------------------------------------------- ! # Replace the ADD_EXECUTABLE(name ...) function to remember what # executable targets were added so we can do things with them. # --------------------------------------------------------------------------- *************** *** 272,276 **** # --------------------------------------------------------------------------- ! # Replace the ADD_TEST() function to remember what # test targets were added so we can do things with them. # --------------------------------------------------------------------------- --- 272,276 ---- # --------------------------------------------------------------------------- ! # Replace the ADD_TEST(name ...) function to remember what # test targets were added so we can do things with them. # --------------------------------------------------------------------------- *************** *** 287,290 **** --- 287,291 ---- # --------------------------------------------------------------------------- + # ADD_GTEST(exe_target_name) # Add a function to create an ADD_TEST() that properly checks the output # of Google GTests. Use this function instead of ADD_TEST for running GTests in your exe. *************** *** 298,301 **** --- 299,303 ---- # --------------------------------------------------------------------------- + # ADD_CPPCHECK_TEST( name ) # Add a function to call cppcheck to do a static analysis test on the project # source dir and its children dirs using the cppcheck program. *************** *** 304,308 **** # --------------------------------------------------------------------------- ! FUNCTION( ADD_STATIC_ANALYSIS_TEST name ) IF ( "${cppcheck}" STREQUAL "") # Find the program cppcheck; ${cppcheck} will be either the exe path or "cppcheck-NOTFOUND" --- 306,310 ---- # --------------------------------------------------------------------------- ! FUNCTION( ADD_CPPCHECK_TEST name ) IF ( "${cppcheck}" STREQUAL "") # Find the program cppcheck; ${cppcheck} will be either the exe path or "cppcheck-NOTFOUND" *************** *** 310,316 **** IF ( "${cppcheck}" STREQUAL "cppcheck-NOTFOUND" ) ! MESSAGE( STATUS "* WARNING: cppcheck NOT found, NOT generating ADD_STATIC_ANALYSIS_TEST() tests" ) ELSE() ! MESSAGE( STATUS "* cppcheck found, generating ADD_STATIC_ANALYSIS_TEST() tests" ) ENDIF() ENDIF() --- 312,318 ---- IF ( "${cppcheck}" STREQUAL "cppcheck-NOTFOUND" ) ! MESSAGE( STATUS "* WARNING: cppcheck NOT found, NOT generating ADD_CPPCHECK_TEST() tests" ) ELSE() ! MESSAGE( STATUS "* cppcheck found, generating ADD_CPPCHECK_TEST() tests" ) ENDIF() ENDIF() *************** *** 321,335 **** STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! LIST(FIND ADD_STATIC_ANALYSIS_TEST_DIR_LIST ${PROJ_DIR_TEMP} PROJ_DIR_IDX_TEMP) IF ("${PROJ_DIR_IDX_TEMP}" GREATER "-1") ! MESSAGE(STATUS "* WARNING: Duplicate static_analysis tests for dir ${CMAKE_CURRENT_SOURCE_DIR} with names ${name}, you need only one ADD_STATIC_ANALYSIS_TEST per directory.") ELSE() ADD_TEST( ${name} ${cppcheck} "--verbose" "--quiet" ${CMAKE_CURRENT_SOURCE_DIR} ) SET_TESTS_PROPERTIES( ${name} PROPERTIES FAIL_REGULAR_EXPRESSION "(error)") ! SET(ADD_STATIC_ANALYSIS_TEST_LIST ${ADD_STATIC_ANALYSIS_TEST_LIST} "${name}" CACHE INTERNAL "") ! SET(ADD_STATIC_ANALYSIS_TEST_DIR_LIST ${ADD_STATIC_ANALYSIS_TEST_DIR_LIST} "${PROJ_DIR_TEMP}" CACHE INTERNAL "") ! SET(ADD_STATIC_ANALYSIS_TEST_DIR_NAME_LIST ${ADD_STATIC_ANALYSIS_TEST_DIR_NAME_LIST} "${PROJ_DIR_TEMP}/${name}" CACHE INTERNAL "") ENDIF() ENDIF() --- 323,337 ---- STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! LIST(FIND ADD_CPPCHECK_TEST_DIR_LIST ${PROJ_DIR_TEMP} PROJ_DIR_IDX_TEMP) IF ("${PROJ_DIR_IDX_TEMP}" GREATER "-1") ! MESSAGE(STATUS "* WARNING: Duplicate cppcheck tests for dir ${CMAKE_CURRENT_SOURCE_DIR} with names ${name}, you need only one ADD_CPPCHECK_TEST per directory.") ELSE() ADD_TEST( ${name} ${cppcheck} "--verbose" "--quiet" ${CMAKE_CURRENT_SOURCE_DIR} ) SET_TESTS_PROPERTIES( ${name} PROPERTIES FAIL_REGULAR_EXPRESSION "(error)") ! SET(ADD_CPPCHECK_TEST_LIST ${ADD_CPPCHECK_TEST_LIST} "${name}" CACHE INTERNAL "") ! SET(ADD_CPPCHECK_TEST_DIR_LIST ${ADD_CPPCHECK_TEST_DIR_LIST} "${PROJ_DIR_TEMP}" CACHE INTERNAL "") ! SET(ADD_CPPCHECK_TEST_DIR_NAME_LIST ${ADD_CPPCHECK_TEST_DIR_NAME_LIST} "${PROJ_DIR_TEMP}/${name}" CACHE INTERNAL "") ENDIF() ENDIF() *************** *** 719,725 **** FOREACH(arg ${ARGN}) - if (PROPERTIES) - # We get the old prop value, append the new and apply it to each target --- 721,725 ---- *************** *** 739,743 **** set(PROP_NAME "") endif() - elseif ("${arg}" STREQUAL "PROPERTIES") set(PROPERTIES TRUE) --- 739,742 ---- *************** *** 769,775 **** FOREACH(arg ${ARGN}) - if (PROPERTIES) - # We get the old prop value, append the new and apply it to each target --- 768,772 ---- *************** *** 789,793 **** set(PROP_NAME "") endif() - elseif ("${arg}" STREQUAL "PROPERTIES") set(PROPERTIES TRUE) --- 786,789 ---- *************** *** 810,814 **** # Note that MSVC will error for SOURCES that do not have the line # #include "PCH_INCLUDE" (where PCH_INCLUDE is identical to what's passed to this function) ! # See FORCE_INCLUDE flag for a workaround. # # FORCE_INCLUDE flag may be used to tell the compiler to include the precomp header --- 806,813 ---- # Note that MSVC will error for SOURCES that do not have the line # #include "PCH_INCLUDE" (where PCH_INCLUDE is identical to what's passed to this function) ! # See FORCE_INCLUDE flag for a workaround that uses the compiler's ! # directive to #include a file before compilation. ! # This also works well for GCC and allows you to use precomp headers w/o ! # modifying any code at all. # # FORCE_INCLUDE flag may be used to tell the compiler to include the precomp header *************** *** 1011,1015 **** # --------------------------------------------------------------------------- ! # ADD_DOXYGEN() function to make adding a doxygen target easy. # Usage : ADD_DOXYGEN( doc # ${CMAKE_SOURCE_DIR}/build/Doxyfile.in --- 1010,1017 ---- # --------------------------------------------------------------------------- ! # ADD_DOXYGEN(target_name doxyfile_in doxyfile_out doxygen_working_dir) ! # A function to make adding a doxygen target easy, the doxyfile_in will have ! # @vars@ replaced by configure and copied to doxyfile_out and a target_name will ! # made to call "doxygen ${doxyfile_out}" from the doxygen_working_dir. # Usage : ADD_DOXYGEN( doc # ${CMAKE_SOURCE_DIR}/build/Doxyfile.in *************** *** 1046,1077 **** macro(GET_ALL_CMAKE_VARIABLES all_vars cache_vars) ! get_cmake_property(props VARIABLES) ! foreach(var ${props}) ! #message( STATUS "@ VARIABLES: ${var} = \"${${var}}\"" ) ! set(${all_vars} ${${all_vars}} "${var}") endforeach() ! unset(var) ! unset(props) ! get_cmake_property(props CACHE_VARIABLES) ! foreach(var ${props}) ! #message( STATUS "@ CACHE_VARIABLES: ${var} = \"${${var}}\"" ) ! set(${all_vars} ${${all_vars}} "${var}") ! set(${cache_vars} ${${cache_vars}} "${var}") endforeach() ! unset(var) ! unset(props) # merge the VARIABLES and CACHE_VARIABLES since they're mostly the same list(SORT ${all_vars}) list(REMOVE_DUPLICATES ${all_vars}) - endmacro() macro(PRINT_ALL_CMAKE_VARIABLES) - set(CMAKE_ALL_VARIABLES_LIST) set(CMAKE_ALL_CACHE_VARIABLES_LIST) --- 1048,1077 ---- macro(GET_ALL_CMAKE_VARIABLES all_vars cache_vars) ! get_cmake_property(_props VARIABLES) ! foreach(_var ${_props}) ! #message( STATUS "@ VARIABLES: ${_var} = \"${${_var}}\"" ) ! set(${all_vars} ${${all_vars}} "${_var}") endforeach() ! unset(_var) ! unset(_props) ! get_cmake_property(_props CACHE_VARIABLES) ! foreach(_var ${_props}) ! #message( STATUS "@ CACHE_VARIABLES: ${_var} = \"${${_var}}\"" ) ! set(${all_vars} ${${all_vars}} "${_var}") ! set(${cache_vars} ${${cache_vars}} "${_var}") endforeach() ! unset(_var) ! unset(_props) # merge the VARIABLES and CACHE_VARIABLES since they're mostly the same list(SORT ${all_vars}) list(REMOVE_DUPLICATES ${all_vars}) endmacro() macro(PRINT_ALL_CMAKE_VARIABLES) set(CMAKE_ALL_VARIABLES_LIST) set(CMAKE_ALL_CACHE_VARIABLES_LIST) *************** *** 1084,1116 **** message( STATUS "@----------------------------------------------------------------------------") ! foreach(var ${CMAKE_ALL_VARIABLES_LIST}) ! list(FIND CMAKE_ALL_CACHE_VARIABLES_LIST ${var} _IS_CACHED) ! if (_IS_CACHED GREATER "-1") ! message( STATUS "@ CACHE VAR: ${var} = \"${${var}}\"" ) else() ! message( STATUS "@ VARIABLE : ${var} = \"${${var}}\"" ) endif() endforeach() ! get_cmake_property(props COMMANDS) ! foreach(var ${props}) ! message( STATUS "@ COMMANDS: ${var} = \"${${var}}\"" ) endforeach() ! get_cmake_property(props MACROS) ! foreach(var ${props}) ! message( STATUS "@ MACROS: ${var} = \"${${var}}\"" ) endforeach() ! get_cmake_property(props COMPONENTS) ! foreach(var ${props}) ! message( STATUS "@ COMPONENTS: ${var} = \"${${var}}\"" ) endforeach() # Unset the variables for the PRINT_NEW_CMAKE_VARIABLES() macro ! unset(var) ! unset(props) ! unset(_IS_CACHED) message( STATUS "@----------------------------------------------------------------------------") --- 1084,1116 ---- message( STATUS "@----------------------------------------------------------------------------") ! foreach(_var ${CMAKE_ALL_VARIABLES_LIST}) ! list(FIND CMAKE_ALL_CACHE_VARIABLES_LIST ${_var} _is_cached) ! if (_is_cached GREATER "-1") ! message( STATUS "@ CACHE VAR: ${_var} = \"${${_var}}\"" ) else() ! message( STATUS "@ VARIABLE : ${_var} = \"${${_var}}\"" ) endif() endforeach() ! get_cmake_property(_props COMMANDS) ! foreach(_var ${_props}) ! message( STATUS "@ COMMANDS: ${_var} = \"${${_var}}\"" ) endforeach() ! get_cmake_property(_props MACROS) ! foreach(_var ${_props}) ! message( STATUS "@ MACROS: ${_var} = \"${${_var}}\"" ) endforeach() ! get_cmake_property(_props COMPONENTS) ! foreach(_var ${_props}) ! message( STATUS "@ COMPONENTS: ${_var} = \"${${_var}}\"" ) endforeach() # Unset the variables for the PRINT_NEW_CMAKE_VARIABLES() macro ! unset(_var) ! unset(_props) ! unset(_is_cached) message( STATUS "@----------------------------------------------------------------------------") *************** *** 1118,1122 **** message( STATUS "@----------------------------------------------------------------------------") message( STATUS " ") - endmacro() --- 1118,1121 ---- *************** *** 1126,1130 **** macro( PRINT_NEW_CMAKE_VARIABLES ) - message( STATUS " ") message( STATUS "@----------------------------------------------------------------------------") --- 1125,1128 ---- *************** *** 1138,1149 **** # merge the VARIABLES and CACHE_VARIABLES since they're mostly the same ! foreach(var ${CMAKE_ALL_VARIABLES_LIST2}) ! list(FIND CMAKE_ALL_VARIABLES_LIST ${var} _IS_NEW) ! if (_IS_NEW EQUAL "-1") ! list(FIND CMAKE_ALL_CACHE_VARIABLES_LIST ${var} _IS_CACHED) ! if (_IS_CACHED GREATER "-1") ! message( STATUS "@ CACHE VAR: ${var} = \"${${var}}\"" ) else() ! message( STATUS "@ VARIABLE : ${var} = \"${${var}}\"" ) endif() endif() --- 1136,1147 ---- # merge the VARIABLES and CACHE_VARIABLES since they're mostly the same ! foreach(_var ${CMAKE_ALL_VARIABLES_LIST2}) ! list(FIND CMAKE_ALL_VARIABLES_LIST ${_var} _is_new) ! if (_is_new EQUAL "-1") ! list(FIND CMAKE_ALL_CACHE_VARIABLES_LIST ${_var} _is_cached) ! if (_is_cached GREATER "-1") ! message( STATUS "@ CACHE VAR: ${_var} = \"${${_var}}\"" ) else() ! message( STATUS "@ VARIABLE : ${_var} = \"${${_var}}\"" ) endif() endif() *************** *** 1155,1165 **** message( STATUS " ") ! unset(var) ! unset(_IS_NEW) ! unset(_IS_CACHED) set(CMAKE_ALL_VARIABLES_LIST ${CMAKE_ALL_VARIABLES_LIST2}) set(CMAKE_ALL_CACHE_VARIABLES_LIST ${CMAKE_ALL_CACHE_VARIABLES_LIST2}) - endmacro() --- 1153,1162 ---- message( STATUS " ") ! unset(_var) ! unset(_is_new) ! unset(_is_cached) set(CMAKE_ALL_VARIABLES_LIST ${CMAKE_ALL_VARIABLES_LIST2}) set(CMAKE_ALL_CACHE_VARIABLES_LIST ${CMAKE_ALL_CACHE_VARIABLES_LIST2}) endmacro() *************** *** 1177,1185 **** if ( CMAKE_DEBUG_VARIABLES ) PRINT_ALL_CMAKE_VARIABLES() - - #set(aaa "5") - #PRINT_NEW_CMAKE_VARIABLES() - #set(bbb "5") - #PRINT_NEW_CMAKE_VARIABLES() endif() - --- 1174,1176 ---- |
From: John L. <jr...@us...> - 2011-11-12 05:44:50
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv26193/modules Modified Files: CMakeLists.txt Log Message: Fix CMake build for Linux, allow specifying what wx bindings to add. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CMakeLists.txt 10 Nov 2011 14:01:15 -0000 1.7 --- CMakeLists.txt 12 Nov 2011 05:44:48 -0000 1.8 *************** *** 26,32 **** function (wxLua_Modules_wxBind_TARGETS) if (wxLuaBind_SEPARATE_LIBS) ! if (WX_adv OR WX_advd OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_adv_Lib --- 26,35 ---- function (wxLua_Modules_wxBind_TARGETS) + + + if (wxLuaBind_SEPARATE_LIBS) ! if (WXLUA_BINDTO_adv) ADD_LIBRARY_FULL( wxLuaBind_adv_Lib *************** *** 45,53 **** else() set(wxLuaBind_adv_Lib_) ! endif (WX_adv OR WX_advd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_aui OR WX_auid OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_aui_Lib --- 48,56 ---- else() set(wxLuaBind_adv_Lib_) ! endif (WXLUA_BINDTO_adv) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_aui) ADD_LIBRARY_FULL( wxLuaBind_aui_Lib *************** *** 66,74 **** else() set(wxLuaBind_aui_Lib_) ! endif (WX_aui OR WX_auid OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_base OR WX_based OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_base_Lib --- 69,77 ---- else() set(wxLuaBind_aui_Lib_) ! endif (WXLUA_BINDTO_aui) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_base) ADD_LIBRARY_FULL( wxLuaBind_base_Lib *************** *** 86,94 **** else() set(wxLuaBind_base_Lib_) ! endif (WX_base OR WX_based OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_core OR WX_cored OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_core_Lib --- 89,97 ---- else() set(wxLuaBind_base_Lib_) ! endif (WXLUA_BINDTO_base) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_core) ADD_LIBRARY_FULL( wxLuaBind_core_Lib *************** *** 107,115 **** else() set(wxLuaBind_core_Lib_) ! endif (WX_core OR WX_cored OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_gl OR WX_gld OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_gl_Lib --- 110,118 ---- else() set(wxLuaBind_core_Lib_) ! endif (WXLUA_BINDTO_core) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_gl) ADD_LIBRARY_FULL( wxLuaBind_gl_Lib *************** *** 128,136 **** else() set(wxLuaBind_gl_Lib_) ! endif (WX_gl OR WX_gld OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_html OR WX_htmld OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_html_Lib --- 131,139 ---- else() set(wxLuaBind_gl_Lib_) ! endif (WXLUA_BINDTO_gl) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_html) ADD_LIBRARY_FULL( wxLuaBind_html_Lib *************** *** 149,157 **** else() set(wxLuaBind_html_Lib_) ! endif (WX_html OR WX_htmld OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_media OR WX_mediad OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_media_Lib --- 152,160 ---- else() set(wxLuaBind_html_Lib_) ! endif (WXLUA_BINDTO_html) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_media) ADD_LIBRARY_FULL( wxLuaBind_media_Lib *************** *** 171,179 **** else() set(wxLuaBind_media_Lib_) ! endif (WX_media OR WX_mediad OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_net OR WX_netd OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_net_Lib --- 174,182 ---- else() set(wxLuaBind_media_Lib_) ! endif (WXLUA_BINDTO_media) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_net) ADD_LIBRARY_FULL( wxLuaBind_net_Lib *************** *** 192,200 **** else() set(wxLuaBind_net_Lib_) ! endif (WX_net OR WX_netd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib --- 195,203 ---- else() set(wxLuaBind_net_Lib_) ! endif (WXLUA_BINDTO_net) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_richtext) ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib *************** *** 213,221 **** else() set(wxLuaBind_richtext_Lib_) ! endif (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_stc OR WX_stcd OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_stc_Lib --- 216,224 ---- else() set(wxLuaBind_richtext_Lib_) ! endif (WXLUA_BINDTO_richtext) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_stc) ADD_LIBRARY_FULL( wxLuaBind_stc_Lib *************** *** 234,242 **** else() set(wxLuaBind_stc_Lib_) ! endif (WX_stc OR WX_stcd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_xml OR WX_xmld OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_xml_Lib --- 237,245 ---- else() set(wxLuaBind_stc_Lib_) ! endif (WXLUA_BINDTO_stc) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_xml) ADD_LIBRARY_FULL( wxLuaBind_xml_Lib *************** *** 255,263 **** else() set(wxLuaBind_xml_Lib_) ! endif (WX_xml OR WX_xmld OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- ! if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib --- 258,266 ---- else() set(wxLuaBind_xml_Lib_) ! endif (WXLUA_BINDTO_xml) # --------------------------------------------------------------------------- ! if (WXLUA_BINDTO_xrc) ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib *************** *** 276,280 **** else() set(wxLuaBind_xrc_Lib_) ! endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- --- 279,283 ---- else() set(wxLuaBind_xrc_Lib_) ! endif (WXLUA_BINDTO_xrc) # --------------------------------------------------------------------------- *************** *** 338,343 **** ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h SOURCES ! ${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ! #${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} LINK_LIBRARIES --- 341,346 ---- ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h SOURCES ! #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ! ${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} LINK_LIBRARIES *************** *** 442,448 **** ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES HEADERS ! ${wxLua_ROOT_DIR}/modules/luamodule/include/*.h SOURCES ! ${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp ${wxLuaBindLib_SOURCE_FILES} ${wxLuaSocketLib_SOURCE_FILES} --- 445,451 ---- ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES HEADERS ! ${wxLua_ROOT_DIR}/modules/luamodule/include/luamoduledefs.h SOURCES ! ${wxLua_ROOT_DIR}/modules/luamodule/src/luamodule.cpp ${wxLuaBindLib_SOURCE_FILES} ${wxLuaSocketLib_SOURCE_FILES} *************** *** 480,529 **** set(LUA_LINK_LIBRARIES m dl readline history ncurses) - #$(MAKE) all MYCFLAGS="" MYLIBS="-fPIC -Wl,-E -ldl -lreadline -lhistory -lncurses" endif() - - - ADD_LIBRARY_FULL( LuaLib HEADERS ! ${wxLua_ROOT_DIR}/modules/lua/src/*.h SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/llex.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/linit.c LINK_LIBRARIES ${LUA_BUILD_AS_DLL} PROPERTIES FOLDER "wxLua/Modules") - if (MSVC60) # Some sort of bug linking to the object files in MSVC6 --- 483,527 ---- set(LUA_LINK_LIBRARIES m dl readline history ncurses) #$(MAKE) all MYCFLAGS="" MYLIBS="-fPIC -Wl,-E -ldl -lreadline -lhistory -lncurses" endif() ADD_LIBRARY_FULL( LuaLib HEADERS ! src/*.h SOURCES ! src/lapi.c ! src/lcode.c ! src/ldebug.c ! src/ldo.c ! src/ldump.c ! src/lfunc.c ! src/lgc.c ! src/llex.c ! src/lmem.c ! src/lobject.c ! src/lopcodes.c ! src/lparser.c ! src/lstate.c ! src/lstring.c ! src/ltable.c ! src/ltm.c ! src/lundump.c ! src/lvm.c ! src/lzio.c ! src/lauxlib.c ! src/lbaselib.c ! src/ldblib.c ! src/liolib.c ! src/lmathlib.c ! src/loslib.c ! src/ltablib.c ! src/lstrlib.c ! src/loadlib.c ! src/linit.c LINK_LIBRARIES ${LUA_BUILD_AS_DLL} PROPERTIES FOLDER "wxLua/Modules") if (MSVC60) # Some sort of bug linking to the object files in MSVC6 *************** *** 539,548 **** endif() - ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES HEADERS "" SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/luac.c ! ${wxLua_ROOT_DIR}/modules/lua/src/print.c #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these #${LuaLib_OBJECTS} # see note above about DLL linking --- 537,545 ---- endif() ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES HEADERS "" SOURCES ! src/luac.c ! src/print.c #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these #${LuaLib_OBJECTS} # see note above about DLL linking *************** *** 550,553 **** --- 547,551 ---- LINK_LIBRARIES # LuaLib # see note above about DLL linking + ${LUA_LINK_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") *************** *** 558,562 **** HEADERS SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/lua.c LINK_LIBRARIES LuaLib --- 556,560 ---- HEADERS SOURCES ! src/lua.c LINK_LIBRARIES LuaLib |
From: John L. <jr...@us...> - 2011-11-10 14:01:17
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv28069/modules Modified Files: CMakeLists.txt Log Message: CMake linux fixes Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CMakeLists.txt 6 Nov 2011 05:12:14 -0000 1.6 --- CMakeLists.txt 10 Nov 2011 14:01:15 -0000 1.7 *************** *** 295,306 **** CACHE INTERNAL "") - else() - - set(wxLuaBind_ALL_LIBS wxLuaBindLib CACHE INTERNAL "") - - endif (wxLuaBind_SEPARATE_LIBS) - - # --------------------------------------------------------------------------- - set(wxLuaBindLib_SOURCES ${wxLuaBind_adv_Lib_SOURCE_FILES} --- 295,298 ---- *************** *** 334,337 **** --- 326,336 ---- set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) + else() + + set(wxLuaBind_ALL_LIBS wxLuaBindLib CACHE INTERNAL "") + + endif (wxLuaBind_SEPARATE_LIBS) + + # --------------------------------------------------------------------------- ADD_LIBRARY_FULL( wxLuaBindLib ALLOW_MISSING_FILES *************** *** 470,474 **** function (wxLua_Modules_Lua_TARGETS) ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ADD_LIBRARY_FULL( LuaLib --- 469,490 ---- function (wxLua_Modules_Lua_TARGETS) ! if (MSVC) ! set( LUA_BUILD_AS_DLL PROPERTIES DEFINE_SYMBOL LUA_BUILD_AS_DLL ) ! ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ! else () ! ! set( LUA_BUILD_AS_DLL ) ! add_definitions( -DLUA_USE_LINUX ) ! ! set(LUA_LINK_LIBRARIES m dl readline history ncurses) ! ! ! #$(MAKE) all MYCFLAGS="" MYLIBS="-fPIC -Wl,-E -ldl -lreadline -lhistory -lncurses" ! endif() ! ! ! ! ADD_LIBRARY_FULL( LuaLib *************** *** 506,510 **** ${wxLua_ROOT_DIR}/modules/lua/src/linit.c LINK_LIBRARIES ! PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" PROPERTIES FOLDER "wxLua/Modules") --- 522,526 ---- ${wxLua_ROOT_DIR}/modules/lua/src/linit.c LINK_LIBRARIES ! ${LUA_BUILD_AS_DLL} PROPERTIES FOLDER "wxLua/Modules") *************** *** 545,548 **** --- 561,565 ---- LINK_LIBRARIES LuaLib + ${LUA_LINK_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") |
From: John L. <jr...@us...> - 2011-11-09 04:30:10
|
Update of /cvsroot/wxlua/wxLua/build In directory vz-cvs-4.sog:/tmp/cvs-serv10137/build Modified Files: CMakeFunctions.txt Log Message: Install the samples and docs with cmake. Index: CMakeFunctions.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/CMakeFunctions.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeFunctions.txt 29 Oct 2011 06:45:18 -0000 1.2 --- CMakeFunctions.txt 9 Nov 2011 04:30:08 -0000 1.3 *************** *** 487,491 **** # Set the install includes to use same dir structure as the source directories #STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! #INSTALL(FILES # ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}") --- 487,491 ---- # Set the install includes to use same dir structure as the source directories #STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! #INSTALL(FILES # ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}") *************** *** 812,823 **** function( TARGET_PRECOMPILED_HEADER target_name ) - # There is some problem that makes MSVC6 recompile the precomp header - # and therefore every source file every build. - if (MSVC60) - MESSAGE(STATUS "* WARNING: Disabling precomplied headers for MSVC6 for ${target_name}, sorry...") - return() - endif() - - # Allow people to en/disable precomp headers to test if it actually works or not. # GCC is a little tricky to get right since you have to compile it exactly the same flags --- 812,815 ---- |
From: John L. <jr...@us...> - 2011-11-08 04:47:28
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory vz-cvs-4.sog:/tmp/cvs-serv1787/bindings/wxwidgets Modified Files: wxadv_grid.i Log Message: Update bindings and docs for 2.8.12 release. Index: wxadv_grid.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxadv_grid.i 11 May 2011 04:24:12 -0000 1.7 --- wxadv_grid.i 8 Nov 2011 04:47:26 -0000 1.8 *************** *** 47,53 **** %if !defined(WXUSINGDLL) ! // Getting the value of the ref count is only possible in non-dll ! // wxWidgets library. ! int GetRef() const // wxLua added function to help track if it needs to be refed %endif --- 47,52 ---- %if !defined(WXUSINGDLL) ! // Getting the value of the ref count is only possible in non-dll wxWidgets library. ! //int GetRef() const // wxLua added function to help track if it needs to be refed %endif |
From: John L. <jr...@us...> - 2011-11-08 04:44:01
|
Update of /cvsroot/wxlua/wxLua/modules/lua In directory vz-cvs-4.sog:/tmp/cvs-serv1598 Added Files: patch-lua-5.1.4-4 Log Message: Apply Lua 5.1.4-4 patch. --- NEW FILE: patch-lua-5.1.4-4 --- # patch-lua-5.1.4-4 created 2011-10-29T14:56:19-0200 # apply to a pristine copy of Lua 5.1.4 with: # wget http://www.lua.org/ftp/lua-5.1.4.tar.gz # tar zxf lua-5.1.4.tar.gz # cd lua-5.1.4/src # wget http://www.lua.org/ftp/patch-lua-5.1.4-4 # patch < patch-lua-5.1.4-4 # use curl -O -R if you don't have wget --- lcode.c 2007/12/28 15:32:23 2.25.1.3 +++ lcode.c 2011/01/31 14:53:16 2.25.1.5 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Code generator for Lua ** See Copyright Notice in lua.h */ @@ -544,10 +544,6 @@ pc = NO_JUMP; /* always true; do nothing */ break; } - case VFALSE: { - pc = luaK_jump(fs); /* always jump */ - break; - } case VJMP: { invertjump(fs, e); pc = e->u.s.info; @@ -572,10 +568,6 @@ pc = NO_JUMP; /* always false; do nothing */ break; } - case VTRUE: { - pc = luaK_jump(fs); /* always jump */ - break; - } case VJMP: { pc = e->u.s.info; break; --- ldblib.c 2008/01/21 13:11:21 1.104.1.3 +++ ldblib.c 2009/08/04 18:50:18 1.104.1.4 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Interface from Lua to its debug API ** See Copyright Notice in lua.h */ @@ -45,6 +45,7 @@ static int db_getfenv (lua_State *L) { + luaL_checkany(L, 1); lua_getfenv(L, 1); return 1; } --- lgc.c 2007/12/27 13:02:25 2.38.1.1 +++ lgc.c 2011/03/18 18:05:38 2.38.1.2 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Garbage Collector ** See Copyright Notice in lua.h */ @@ -627,7 +627,6 @@ } } else { - lua_assert(g->totalbytes >= g->estimate); setthreshold(g); } } --- liolib.c 2008/01/18 17:47:43 2.73.1.3 +++ liolib.c 2010/05/14 15:33:51 2.73.1.4 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ @@ -276,7 +276,10 @@ lua_pushnumber(L, d); return 1; } - else return 0; /* read fails */ + else { + lua_pushnil(L); /* "result" to be removed */ + return 0; /* read fails */ + } } --- llex.c 2007/12/27 13:02:25 2.20.1.1 +++ llex.c 2009/11/23 14:58:22 2.20.1.2 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ @@ -118,8 +118,10 @@ lua_State *L = ls->L; TString *ts = luaS_newlstr(L, str, l); TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ - if (ttisnil(o)) + if (ttisnil(o)) { setbvalue(o, 1); /* make sure `str' will not be collected */ + luaC_checkGC(L); + } return ts; } --- loadlib.c 2008/08/06 13:29:28 1.52.1.3 +++ loadlib.c 2009/09/09 13:17:16 1.52.1.4 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** @@ -639,7 +639,7 @@ lua_pushvalue(L, -1); lua_replace(L, LUA_ENVIRONINDEX); /* create `loaders' table */ - lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); + lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); /* fill it with pre-defined loaders */ for (i=0; loaders[i] != NULL; i++) { lua_pushcfunction(L, loaders[i]); --- lparser.c 2007/12/28 15:32:23 2.42.1.3 +++ lparser.c 2011/10/21 19:31:42 2.42.1.4 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Lua Parser ** See Copyright Notice in lua.h */ @@ -374,9 +374,9 @@ lua_assert(luaG_checkcode(f)); lua_assert(fs->bl == NULL); ls->fs = fs->prev; - L->top -= 2; /* remove table and prototype from the stack */ /* last token read was anchored in defunct function; must reanchor it */ if (fs) anchor_token(ls); + L->top -= 2; /* remove table and prototype from the stack */ } --- lstrlib.c 2008/07/11 17:27:21 1.132.1.4 +++ lstrlib.c 2010/05/14 15:34:19 1.132.1.5 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ @@ -754,6 +754,7 @@ static int str_format (lua_State *L) { + int top = lua_gettop(L); int arg = 1; size_t sfl; const char *strfrmt = luaL_checklstring(L, arg, &sfl); @@ -768,7 +769,8 @@ else { /* format item */ char form[MAX_FORMAT]; /* to store the format (`%...') */ char buff[MAX_ITEM]; /* to store the formatted item */ - arg++; + if (++arg > top) + luaL_argerror(L, arg, "no value"); strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { --- lvm.c 2007/12/28 15:32:23 2.63.1.3 +++ lvm.c 2011/08/17 20:43:11 2.63.1.5 @@ -1,5 +1,5 @@ /* -** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ +** $Id: patch-lua-5.1.4-4,v 1.1 2011/11/08 04:43:58 jrl1 Exp $ ** Lua virtual machine ** See Copyright Notice in lua.h */ @@ -133,6 +133,7 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { int loop; + TValue temp; for (loop = 0; loop < MAXTAGLOOP; loop++) { const TValue *tm; if (ttistable(t)) { /* `t' is a table? */ @@ -141,6 +142,7 @@ if (!ttisnil(oldval) || /* result is no nil? */ (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */ setobj2t(L, oldval, val); + h->flags = 0; luaC_barriert(L, h, val); return; } @@ -152,7 +154,9 @@ callTM(L, tm, t, key, val); return; } - t = tm; /* else repeat with `tm' */ + /* else repeat with `tm' */ + setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ + t = &temp; } luaG_runerror(L, "loop in settable"); } |
From: John L. <jr...@us...> - 2011-11-07 04:41:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory vz-cvs-4.sog:/tmp/cvs-serv20410/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Cleanup docs using Kompozer. Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.192 retrieving revision 1.193 diff -C2 -d -r1.192 -r1.193 *** wxlstate.cpp 20 Oct 2011 03:53:57 -0000 1.192 --- wxlstate.cpp 7 Nov 2011 04:41:56 -0000 1.193 *************** *** 678,682 **** lua_rawget(L, -2); // this must never happen ! if (!lua_isnil(L, -1)) wxFAIL_MSG(wxT("Trying to push userdata for object with same wxLua type twice")); lua_pop(L, 1); // pop nil } --- 678,685 ---- lua_rawget(L, -2); // this must never happen ! if (!lua_isnil(L, -1)) ! { ! wxFAIL_MSG(wxT("Trying to push userdata for object with same wxLua type twice")); ! } lua_pop(L, 1); // pop nil } |
From: John L. <jr...@us...> - 2011-11-06 16:15:52
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan In directory vz-cvs-4.sog:/tmp/cvs-serv14178/apps/wxluacan Added Files: CMakeLists.txt Log Message: Separate the CMakeLists.txt files for the apps too. --- NEW FILE: CMakeLists.txt --- project( wxLua_Apps_wxLuaCan ) wxLua_Apps_wxLuaCan_TARGETS() |
From: John L. <jr...@us...> - 2011-11-06 05:12:17
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind In directory vz-cvs-4.sog:/tmp/cvs-serv10043/wxbind Added Files: CMakeLists.txt Log Message: Use separate CMakeLists.txt file per dir to avoid DLL import/export symbol clashes when the obj files are all put into the same dir. --- NEW FILE: CMakeLists.txt --- project( wxLua_Modules_wxBind ) wxLua_Modules_wxBind_TARGETS() |
From: John L. <jr...@us...> - 2011-11-03 04:23:21
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv32273/modules Modified Files: CMakeLists.txt Log Message: Allow switching between building monolithic wxbind lib or separate ones in CMake. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CMakeLists.txt 2 Nov 2011 04:18:10 -0000 1.4 --- CMakeLists.txt 3 Nov 2011 04:23:19 -0000 1.5 *************** *** 20,83 **** ${wxLua_ROOT_DIR}/modules/lua/src) ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaLib ! HEADERS ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxldefs.h ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlstate.h ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h ! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h ! SOURCES ! ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp ! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp ! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlcallb.cpp ! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp ! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp ! LINK_LIBRARIES ! LuaLib ! ${wxWidgets_LIBRARIES} ! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUA" ! PROPERTIES FOLDER "wxLua/Modules") ! ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaDebugLib ! HEADERS ! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h ! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h ! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h ! SOURCES ! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp ! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp ! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp ! LINK_LIBRARIES ! wxLuaLib ! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" ! PROPERTIES FOLDER "wxLua/Modules") ! ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaSocketLib ! HEADERS ! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h ! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h ! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxlsock.h ! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h ! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h ! SOURCES ! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp ! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp ! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldtarg.cpp ! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp ! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp ! LINK_LIBRARIES ! wxLuaBind_core_Lib ! wxLuaDebugLib ! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET" ! PROPERTIES FOLDER "wxLua/Modules") ! ! # --------------------------------------------------------------------------- if (WX_adv OR WX_advd OR WX_mono OR WX_monod) --- 20,24 ---- ${wxLua_ROOT_DIR}/modules/lua/src) ! # =========================================================================== if (WX_adv OR WX_advd OR WX_mono OR WX_monod) *************** *** 95,100 **** --- 36,46 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_adv_Lib_ wxLuaBind_adv_Lib) + else() + set(wxLuaBind_adv_Lib_) endif (WX_adv OR WX_advd OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_aui OR WX_auid OR WX_mono OR WX_monod) *************** *** 111,116 **** --- 57,67 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_aui_Lib_ wxLuaBind_aui_Lib) + else() + set(wxLuaBind_aui_Lib_) endif (WX_aui OR WX_auid OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_base OR WX_based OR WX_mono OR WX_monod) *************** *** 126,131 **** --- 77,87 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_base_Lib_ wxLuaBind_base_Lib) + else() + set(wxLuaBind_base_Lib_) endif (WX_base OR WX_based OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_core OR WX_cored OR WX_mono OR WX_monod) *************** *** 142,147 **** --- 98,108 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_core_Lib_ wxLuaBind_core_Lib) + else() + set(wxLuaBind_core_Lib_) endif (WX_core OR WX_cored OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_gl OR WX_gld OR WX_mono OR WX_monod) *************** *** 158,163 **** --- 119,129 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_gl_Lib_ wxLuaBind_gl_Lib) + else() + set(wxLuaBind_gl_Lib_) endif (WX_gl OR WX_gld OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_html OR WX_htmld OR WX_mono OR WX_monod) *************** *** 174,179 **** --- 140,150 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_html_Lib_ wxLuaBind_html_Lib) + else() + set(wxLuaBind_html_Lib_) endif (WX_html OR WX_htmld OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_media OR WX_mediad OR WX_mono OR WX_monod) *************** *** 191,196 **** --- 162,172 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_media_Lib_ wxLuaBind_media_Lib) + else() + set(wxLuaBind_media_Lib_) endif (WX_media OR WX_mediad OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_net OR WX_netd OR WX_mono OR WX_monod) *************** *** 207,212 **** --- 183,193 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_net_Lib_ wxLuaBind_net_Lib) + else() + set(wxLuaBind_net_Lib_) endif (WX_net OR WX_netd OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) *************** *** 223,228 **** --- 204,214 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_richtext_Lib_ wxLuaBind_richtext_Lib) + else() + set(wxLuaBind_richtext_Lib_) endif (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_stc OR WX_stcd OR WX_mono OR WX_monod) *************** *** 239,244 **** --- 225,235 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_stc_Lib_ wxLuaBind_stc_Lib) + else() + set(wxLuaBind_stc_Lib_) endif (WX_stc OR WX_stcd OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_xml OR WX_xmld OR WX_mono OR WX_monod) *************** *** 255,260 **** --- 246,256 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_xml_Lib_ wxLuaBind_xml_Lib) + else() + set(wxLuaBind_xml_Lib_) endif (WX_xml OR WX_xmld OR WX_mono OR WX_monod) + # --------------------------------------------------------------------------- + if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) *************** *** 271,306 **** PROPERTIES FOLDER "wxLua/Modules") endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- set(wxLuaBindLib_SOURCES ! ${wxLuaBind_adv_Lib_SOURCE_FILES} ! ${wxLuaBind_aui_Lib_SOURCE_FILES} ! ${wxLuaBind_base_Lib_SOURCE_FILES} ! ${wxLuaBind_core_Lib_SOURCE_FILES} ! ${wxLuaBind_gl_Lib_SOURCE_FILES} ! ${wxLuaBind_html_Lib_SOURCE_FILES} ! ${wxLuaBind_media_Lib_SOURCE_FILES} ! ${wxLuaBind_net_Lib_SOURCE_FILES} ! ${wxLuaBind_richtext_Lib_SOURCE_FILES} ! ${wxLuaBind_stc_Lib_SOURCE_FILES} ! ${wxLuaBind_xml_Lib_SOURCE_FILES} ! ${wxLuaBind_xrc_Lib_SOURCE_FILES}) list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES) set(wxLuaBindLib_OBJECTS ! ${wxLuaBind_adv_Lib_OBJECT_FILES} ! ${wxLuaBind_aui_Lib_OBJECT_FILES} ! ${wxLuaBind_base_Lib_OBJECT_FILES} ! ${wxLuaBind_core_Lib_OBJECT_FILES} ! ${wxLuaBind_gl_Lib_OBJECT_FILES} ! ${wxLuaBind_html_Lib_OBJECT_FILES} ! ${wxLuaBind_media_Lib_OBJECT_FILES} ! ${wxLuaBind_net_Lib_OBJECT_FILES} ! ${wxLuaBind_richtext_Lib_OBJECT_FILES} ! ${wxLuaBind_stc_Lib_OBJECT_FILES} ! ${wxLuaBind_xml_Lib_OBJECT_FILES} ! ${wxLuaBind_xrc_Lib_OBJECT_FILES}) list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS) set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) --- 267,323 ---- PROPERTIES FOLDER "wxLua/Modules") + set(wxLuaBind_xrc_Lib_ wxLuaBind_xrc_Lib) + else() + set(wxLuaBind_xrc_Lib_) endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) # --------------------------------------------------------------------------- + set(wxLuaBind_ALL_LIBS + ${wxLuaBind_adv_Lib_} + ${wxLuaBind_aui_Lib_} + ${wxLuaBind_base_Lib_} + ${wxLuaBind_core_Lib_} + ${wxLuaBind_gl_Lib_} + ${wxLuaBind_html_Lib_} + ${wxLuaBind_media_Lib_} + ${wxLuaBind_net_Lib_} + ${wxLuaBind_richtext_Lib_} + ${wxLuaBind_stc_Lib_} + ${wxLuaBind_xml_Lib_} + ${wxLuaBind_xrc_Lib_}) + + set(wxLuaBind_ALL_LIBS wxLuaBindLib) + + # --------------------------------------------------------------------------- + set(wxLuaBindLib_SOURCES ! ${wxLuaBind_adv_Lib_SOURCE_FILES} ! ${wxLuaBind_aui_Lib_SOURCE_FILES} ! ${wxLuaBind_base_Lib_SOURCE_FILES} ! ${wxLuaBind_core_Lib_SOURCE_FILES} ! ${wxLuaBind_gl_Lib_SOURCE_FILES} ! ${wxLuaBind_html_Lib_SOURCE_FILES} ! ${wxLuaBind_media_Lib_SOURCE_FILES} ! ${wxLuaBind_net_Lib_SOURCE_FILES} ! ${wxLuaBind_richtext_Lib_SOURCE_FILES} ! ${wxLuaBind_stc_Lib_SOURCE_FILES} ! ${wxLuaBind_xml_Lib_SOURCE_FILES} ! ${wxLuaBind_xrc_Lib_SOURCE_FILES}) list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES) set(wxLuaBindLib_OBJECTS ! ${wxLuaBind_adv_Lib_OBJECT_FILES} ! ${wxLuaBind_aui_Lib_OBJECT_FILES} ! ${wxLuaBind_base_Lib_OBJECT_FILES} ! ${wxLuaBind_core_Lib_OBJECT_FILES} ! ${wxLuaBind_gl_Lib_OBJECT_FILES} ! ${wxLuaBind_html_Lib_OBJECT_FILES} ! ${wxLuaBind_media_Lib_OBJECT_FILES} ! ${wxLuaBind_net_Lib_OBJECT_FILES} ! ${wxLuaBind_richtext_Lib_OBJECT_FILES} ! ${wxLuaBind_stc_Lib_OBJECT_FILES} ! ${wxLuaBind_xml_Lib_OBJECT_FILES} ! ${wxLuaBind_xrc_Lib_OBJECT_FILES}) list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS) set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) *************** *** 317,321 **** wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND" ! PROPERTIES LINKER_LANGUAGE CXX PROPERTIES FOLDER "wxLua/Modules") --- 334,338 ---- wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND" ! #PROPERTIES LINKER_LANGUAGE CXX PROPERTIES FOLDER "wxLua/Modules") *************** *** 335,340 **** --- 352,417 ---- # wxLuaBind_xrc_Lib) + # =========================================================================== + + ADD_LIBRARY_FULL( wxLuaLib + HEADERS + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxldefs.h + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlstate.h + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h + ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h + SOURCES + ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp + ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp + ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlcallb.cpp + ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp + ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp + LINK_LIBRARIES + LuaLib + ${wxWidgets_LIBRARIES} + PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUA" + PROPERTIES FOLDER "wxLua/Modules") + + # --------------------------------------------------------------------------- + + ADD_LIBRARY_FULL( wxLuaDebugLib + HEADERS + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h + SOURCES + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp + LINK_LIBRARIES + wxLuaLib + PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" + PROPERTIES FOLDER "wxLua/Modules") + # --------------------------------------------------------------------------- + ADD_LIBRARY_FULL( wxLuaSocketLib + HEADERS + ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h + ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h + ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxlsock.h + ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h + ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h + SOURCES + ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp + ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp + ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldtarg.cpp + ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp + ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp + LINK_LIBRARIES + #wxLuaBind_core_Lib + ${wxLuaBind_ALL_LIBS} # Only need core for wxluatype_wxWindow + wxLuaDebugLib + PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET" + PROPERTIES FOLDER "wxLua/Modules") + + # =========================================================================== + ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES HEADERS *************** *** 359,364 **** PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND") ! ! # --------------------------------------------------------------------------- add_definitions( -D_CRT_SECURE_NO_WARNINGS ) --- 436,440 ---- PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND") ! # =========================================================================== add_definitions( -D_CRT_SECURE_NO_WARNINGS ) |
From: John L. <jr...@us...> - 2011-11-02 04:18:12
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv7666/modules Modified Files: CMakeLists.txt Log Message: Fix build for DLLs Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CMakeLists.txt 31 Oct 2011 03:56:01 -0000 1.3 --- CMakeLists.txt 2 Nov 2011 04:18:10 -0000 1.4 *************** *** 44,47 **** --- 44,63 ---- # --------------------------------------------------------------------------- + ADD_LIBRARY_FULL( wxLuaDebugLib + HEADERS + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h + ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h + SOURCES + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp + ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp + LINK_LIBRARIES + wxLuaLib + PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" + PROPERTIES FOLDER "wxLua/Modules") + + # --------------------------------------------------------------------------- + ADD_LIBRARY_FULL( wxLuaSocketLib HEADERS *************** *** 60,64 **** wxLuaBind_core_Lib wxLuaDebugLib - wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET" PROPERTIES FOLDER "wxLua/Modules") --- 76,79 ---- *************** *** 66,85 **** # --------------------------------------------------------------------------- - ADD_LIBRARY_FULL( wxLuaDebugLib - HEADERS - ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h - ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h - ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h - SOURCES - ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp - ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp - ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp - LINK_LIBRARIES - wxLuaLib - PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" - PROPERTIES FOLDER "wxLua/Modules") - - # --------------------------------------------------------------------------- - if (WX_adv OR WX_advd OR WX_mono OR WX_monod) --- 81,84 ---- *************** *** 312,317 **** ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h SOURCES ! #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ! ${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} LINK_LIBRARIES --- 311,316 ---- ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h SOURCES ! ${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ! #${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} LINK_LIBRARIES *************** *** 322,339 **** ! ! add_dependencies(wxLuaBindLib ! wxLuaBind_adv_Lib ! wxLuaBind_aui_Lib ! wxLuaBind_base_Lib ! wxLuaBind_core_Lib ! wxLuaBind_gl_Lib ! wxLuaBind_html_Lib ! wxLuaBind_media_Lib ! wxLuaBind_net_Lib ! wxLuaBind_richtext_Lib ! wxLuaBind_stc_Lib ! wxLuaBind_xml_Lib ! wxLuaBind_xrc_Lib) # --------------------------------------------------------------------------- --- 321,337 ---- ! #add_dependencies(wxLuaBindLib ! # wxLuaBind_adv_Lib ! # wxLuaBind_aui_Lib ! # wxLuaBind_base_Lib ! # wxLuaBind_core_Lib ! # wxLuaBind_gl_Lib ! # wxLuaBind_html_Lib ! # wxLuaBind_media_Lib ! # wxLuaBind_net_Lib ! # wxLuaBind_richtext_Lib ! # wxLuaBind_stc_Lib ! # wxLuaBind_xml_Lib ! # wxLuaBind_xrc_Lib) # --------------------------------------------------------------------------- *************** *** 353,356 **** --- 351,355 ---- #wxLuaDebugLib #wxLuaLib + LuaLib ${wxWidgets_LIBRARIES} PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_LUAMODULE" |
From: John L. <jr...@us...> - 2011-10-31 03:56:03
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv3836/modules Modified Files: CMakeLists.txt Log Message: Get the Lua module to build using CMake. Bump version to 2.8.12 Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 29 Oct 2011 06:45:18 -0000 1.2 --- CMakeLists.txt 31 Oct 2011 03:56:01 -0000 1.3 *************** *** 15,19 **** # CMake build file for wxLua Library # --------------------------------------------------------------------------- ! include_directories(${wxLua_ROOT_DIR}/ ${wxLua_ROOT_DIR}/modules/ --- 15,19 ---- # CMake build file for wxLua Library # --------------------------------------------------------------------------- ! include_directories(${wxLua_ROOT_DIR}/ ${wxLua_ROOT_DIR}/modules/ *************** *** 21,27 **** # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h --- 21,27 ---- # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h *************** *** 30,34 **** ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp --- 30,34 ---- ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp *************** *** 36,40 **** ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp ! LINK_LIBRARIES LuaLib ${wxWidgets_LIBRARIES} --- 36,40 ---- ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp ! LINK_LIBRARIES LuaLib ${wxWidgets_LIBRARIES} *************** *** 43,49 **** # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaSocketLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h --- 43,49 ---- # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaSocketLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h *************** *** 51,55 **** ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp --- 51,55 ---- ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp *************** *** 57,61 **** ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaDebugLib --- 57,61 ---- ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaDebugLib *************** *** 63,79 **** PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET" PROPERTIES FOLDER "wxLua/Modules") ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaDebugLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" --- 63,79 ---- PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET" PROPERTIES FOLDER "wxLua/Modules") ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaDebugLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG" *************** *** 84,94 **** if (WX_adv OR WX_advd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_adv_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxadv_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxadv_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 84,94 ---- if (WX_adv OR WX_advd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_adv_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxadv_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxadv_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 100,110 **** if (WX_aui OR WX_auid OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_aui_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxaui_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxaui_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 100,110 ---- if (WX_aui OR WX_auid OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_aui_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxaui_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxaui_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 116,126 **** if (WX_base OR WX_based OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_base_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxbase_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxbase_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_BINDWXBASE" --- 116,126 ---- if (WX_base OR WX_based OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_base_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxbase_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxbase_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_BINDWXBASE" *************** *** 131,141 **** if (WX_core OR WX_cored OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_core_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxcore_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxcore_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_base_Lib wxLuaLib --- 131,141 ---- if (WX_core OR WX_cored OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_core_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxcore_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxcore_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_base_Lib wxLuaLib *************** *** 147,157 **** if (WX_gl OR WX_gld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_gl_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxgl_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxgl_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 147,157 ---- if (WX_gl OR WX_gld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_gl_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxgl_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxgl_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 163,173 **** if (WX_html OR WX_htmld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_html_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxhtml_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxhtml_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 163,173 ---- if (WX_html OR WX_htmld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_html_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxhtml_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxhtml_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 179,189 **** if (WX_media OR WX_mediad OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_media_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxmedia_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxmedia_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_net_Lib wxLuaBind_core_Lib --- 179,189 ---- if (WX_media OR WX_mediad OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_media_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxmedia_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxmedia_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_net_Lib wxLuaBind_core_Lib *************** *** 196,206 **** if (WX_net OR WX_netd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_net_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxnet_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxnet_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 196,206 ---- if (WX_net OR WX_netd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_net_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxnet_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxnet_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 212,222 **** if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxrichtext_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxrichtext_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 212,222 ---- if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxrichtext_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxrichtext_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 228,238 **** if (WX_stc OR WX_stcd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_stc_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxstc_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxstc_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 228,238 ---- if (WX_stc OR WX_stcd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_stc_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxstc_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxstc_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 244,254 **** if (WX_xml OR WX_xmld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_xml_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxxml_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxxml_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_base_Lib wxLuaLib --- 244,254 ---- if (WX_xml OR WX_xmld OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_xml_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxxml_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxxml_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_base_Lib wxLuaLib *************** *** 260,270 **** if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxxrc_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxxrc_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib --- 260,270 ---- if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod) ! ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/wxxrc_*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/wxbind/src/wxxrc_*.cpp ${wxLua_ROOT_DIR}/modules/wxbind/src/dummy.cpp ! LINK_LIBRARIES wxLuaBind_core_Lib wxLuaLib *************** *** 276,280 **** # --------------------------------------------------------------------------- ! set(wxLuaBindLib_SOURCES ${wxLuaBind_adv_Lib_SOURCE_FILES} ${wxLuaBind_aui_Lib_SOURCE_FILES} --- 276,280 ---- # --------------------------------------------------------------------------- ! set(wxLuaBindLib_SOURCES ${wxLuaBind_adv_Lib_SOURCE_FILES} ${wxLuaBind_aui_Lib_SOURCE_FILES} *************** *** 289,295 **** ${wxLuaBind_xml_Lib_SOURCE_FILES} ${wxLuaBind_xrc_Lib_SOURCE_FILES}) ! list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES) ! set(wxLuaBindLib_OBJECTS ${wxLuaBind_adv_Lib_OBJECT_FILES} ${wxLuaBind_aui_Lib_OBJECT_FILES} --- 289,295 ---- ${wxLuaBind_xml_Lib_SOURCE_FILES} ${wxLuaBind_xrc_Lib_SOURCE_FILES}) ! list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES) ! set(wxLuaBindLib_OBJECTS ${wxLuaBind_adv_Lib_OBJECT_FILES} ${wxLuaBind_aui_Lib_OBJECT_FILES} *************** *** 304,318 **** ${wxLuaBind_xml_Lib_OBJECT_FILES} ${wxLuaBind_xrc_Lib_OBJECT_FILES}) ! list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS) set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) ! ADD_LIBRARY_FULL( wxLuaBindLib ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h ! SOURCES #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND" --- 304,319 ---- ${wxLuaBind_xml_Lib_OBJECT_FILES} ${wxLuaBind_xrc_Lib_OBJECT_FILES}) ! list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS) set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) ! ! ADD_LIBRARY_FULL( wxLuaBindLib ALLOW_MISSING_FILES ! HEADERS ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h ! SOURCES #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp ${wxLuaBindLib_SOURCES} #${wxLuaBindLib_OBJECTS} ! LINK_LIBRARIES wxLuaLib PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND" *************** *** 320,323 **** --- 321,326 ---- PROPERTIES FOLDER "wxLua/Modules") + + add_dependencies(wxLuaBindLib wxLuaBind_adv_Lib *************** *** 333,389 **** wxLuaBind_xml_Lib wxLuaBind_xrc_Lib) ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaModule ! HEADERS ${wxLua_ROOT_DIR}/modules/luamodule/include/*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp ! LINK_LIBRARIES ! wxLuaBindLib ! wxLuaSocketLib ! wxLuaLib ! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_LUAMODULE" PROPERTIES FOLDER "wxLua/Modules") # --------------------------------------------------------------------------- ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ! ADD_LIBRARY_FULL( LuaLib ! HEADERS ${wxLua_ROOT_DIR}/modules/lua/src/*.h ! SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/llex.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c ${wxLua_ROOT_DIR}/modules/lua/src/linit.c ! LINK_LIBRARIES PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" PROPERTIES FOLDER "wxLua/Modules") --- 336,402 ---- wxLuaBind_xml_Lib wxLuaBind_xrc_Lib) ! # --------------------------------------------------------------------------- ! ! ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES ! HEADERS ${wxLua_ROOT_DIR}/modules/luamodule/include/*.h ! SOURCES ${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp ! ${wxLuaBindLib_SOURCE_FILES} ! ${wxLuaSocketLib_SOURCE_FILES} ! ${wxLuaDebugLib_SOURCE_FILES} ! ${wxLuaLib_SOURCE_FILES} ! LINK_LIBRARIES ! #wxLuaBindLib ! #wxLuaSocketLib ! #wxLuaDebugLib ! #wxLuaLib ! ${wxWidgets_LIBRARIES} ! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_LUAMODULE" PROPERTIES FOLDER "wxLua/Modules") + SET_TARGET_PROPERTIES(wxLuaModule + PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND") + + # --------------------------------------------------------------------------- ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ! ADD_LIBRARY_FULL( LuaLib ! HEADERS ${wxLua_ROOT_DIR}/modules/lua/src/*.h ! SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c ! ${wxLua_ROOT_DIR}/modules/lua/src/llex.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c ! ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c ${wxLua_ROOT_DIR}/modules/lua/src/linit.c ! LINK_LIBRARIES PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" PROPERTIES FOLDER "wxLua/Modules") *************** *** 406,416 **** ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES HEADERS "" ! SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/luac.c ${wxLua_ROOT_DIR}/modules/lua/src/print.c #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these #${LuaLib_OBJECTS} # see note above about DLL linking ${LUAC_SOURCES} ! LINK_LIBRARIES # LuaLib # see note above about DLL linking PROPERTIES FOLDER "wxLua/apps") --- 419,429 ---- ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES HEADERS "" ! SOURCES ! ${wxLua_ROOT_DIR}/modules/lua/src/luac.c ${wxLua_ROOT_DIR}/modules/lua/src/print.c #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these #${LuaLib_OBJECTS} # see note above about DLL linking ${LUAC_SOURCES} ! LINK_LIBRARIES # LuaLib # see note above about DLL linking PROPERTIES FOLDER "wxLua/apps") *************** *** 420,427 **** ADD_EXECUTABLE_FULL( lua ! HEADERS ! SOURCES ${wxLua_ROOT_DIR}/modules/lua/src/lua.c ! LINK_LIBRARIES LuaLib PROPERTIES FOLDER "wxLua/apps") --- 433,440 ---- ADD_EXECUTABLE_FULL( lua ! HEADERS ! SOURCES ${wxLua_ROOT_DIR}/modules/lua/src/lua.c ! LINK_LIBRARIES LuaLib PROPERTIES FOLDER "wxLua/apps") |
From: John L. <jr...@us...> - 2011-10-29 06:45:20
|
Update of /cvsroot/wxlua/wxLua/build In directory vz-cvs-4.sog:/tmp/cvs-serv29908/build Modified Files: CMakeFunctions.txt CMakewxAppLib.cmake Log Message: Build fixes for CMake and dlls. Deselect the old item in the wxLuaStack listctrl when selected from the tree. Index: CMakeFunctions.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/CMakeFunctions.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CMakeFunctions.txt 20 Oct 2011 03:57:04 -0000 1.1 --- CMakeFunctions.txt 29 Oct 2011 06:45:18 -0000 1.2 *************** *** 136,140 **** string(REPLACE ".cpp" ".obj" fname2 ${fname}) string(REPLACE ".c" ".obj" fname2 ${fname2}) ! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.dir/${CMAKE_CFG_INTDIR}/${fname2}") endforeach() else() --- 136,144 ---- string(REPLACE ".cpp" ".obj" fname2 ${fname}) string(REPLACE ".c" ".obj" fname2 ${fname2}) ! if (MSVC60) ! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${fname2}") ! else() ! set(objects ${objects} "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.dir/${CMAKE_CFG_INTDIR}/${fname2}") ! endif() endforeach() else() *************** *** 482,488 **** # Set the install includes to use same dir structure as the source directories ! STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! ! INSTALL(FILES ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}") INSTALL(TARGETS ${target_name} --- 486,492 ---- # Set the install includes to use same dir structure as the source directories ! #STRING(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" PROJ_DIR_TEMP ${CMAKE_CURRENT_SOURCE_DIR}) ! #INSTALL(FILES ! # ${HEADER_FILES} DESTINATION "include/${PROJ_DIR_TEMP}") INSTALL(TARGETS ${target_name} *************** *** 808,811 **** --- 812,823 ---- function( TARGET_PRECOMPILED_HEADER target_name ) + # There is some problem that makes MSVC6 recompile the precomp header + # and therefore every source file every build. + if (MSVC60) + MESSAGE(STATUS "* WARNING: Disabling precomplied headers for MSVC6 for ${target_name}, sorry...") + return() + endif() + + # Allow people to en/disable precomp headers to test if it actually works or not. # GCC is a little tricky to get right since you have to compile it exactly the same flags *************** *** 879,883 **** IF(MSVC) get_filename_component(PCH_BASENAME ${_PCH_HEADER} NAME_WE) ! set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/$(IntDir)/${PCH_BASENAME}.pch") # need to delete this file for clean too, otherwise we can get errors --- 891,896 ---- IF(MSVC) get_filename_component(PCH_BASENAME ${_PCH_HEADER} NAME_WE) ! #set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/$(IntDir)/${PCH_BASENAME}.pch") ! set(PCH_BINARY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PCH_BASENAME}.pch") # need to delete this file for clean too, otherwise we can get errors Index: CMakewxAppLib.cmake =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/CMakewxAppLib.cmake,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CMakewxAppLib.cmake 20 Oct 2011 03:57:04 -0000 1.1 --- CMakewxAppLib.cmake 29 Oct 2011 06:45:18 -0000 1.2 *************** *** 47,51 **** message( STATUS "* " ) message( STATUS "* In the CMake GUI you can set values and press configure a few times since " ) ! message( STATUS "* sometimes once is not enough, once it works, press generate." ) message( STATUS "* " ) message( STATUS "* Usage: cmake -D[OPTION_NAME]=[OPTION_VALUE] /path/to/CMakeLists.txt/" ) --- 47,51 ---- message( STATUS "* " ) message( STATUS "* In the CMake GUI you can set values and press configure a few times since " ) ! message( STATUS "* sometimes once is not enough, after a few configurations, press generate." ) message( STATUS "* " ) message( STATUS "* Usage: cmake -D[OPTION_NAME]=[OPTION_VALUE] /path/to/CMakeLists.txt/" ) *************** *** 142,146 **** # --------------------------------------------------------------------------- ! set( CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install Directory prefix for INSTALL target" FORCE) # --------------------------------------------------------------------------- --- 142,152 ---- # --------------------------------------------------------------------------- ! if (NOT DEFINED BUILD_INSTALL_PREFIX) ! # CMake defaults to C:/Program Files and /usr/local neither of which normal users have permissions to ! set( BUILD_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/install" ) ! endif() ! ! set( BUILD_INSTALL_PREFIX ${BUILD_INSTALL_PREFIX} CACHE PATH "Install Directory prefix for INSTALL target" FORCE) ! set( CMAKE_INSTALL_PREFIX ${BUILD_INSTALL_PREFIX}) # --------------------------------------------------------------------------- *************** *** 148,157 **** # --------------------------------------------------------------------------- ! if (CMAKE_SIZEOF_VOID_P MATCHES 4) set(IS_32_BIT TRUE) set(IS_64_BIT FALSE) ! else() set(IS_32_BIT FALSE) set(IS_64_BIT TRUE) endif() --- 154,165 ---- # --------------------------------------------------------------------------- ! if ((CMAKE_SIZEOF_VOID_P MATCHES 4) OR (CMAKE_CL_64 MATCHES 0)) set(IS_32_BIT TRUE) set(IS_64_BIT FALSE) ! elseif((CMAKE_SIZEOF_VOID_P MATCHES 8) OR (CMAKE_CL_64 MATCHES 1)) set(IS_32_BIT FALSE) set(IS_64_BIT TRUE) + else() + MESSAGE(WARNING "Oops, unable to determine if using 32 or 64 bit compilation.") endif() *************** *** 260,276 **** # ----------------------------------------------------------------------- ! # Use multiprocessor compliation if availiable # In some cases it is nice to turn it off since it can be hard tell where some # pragma warnings come from if multiple files are compiled at once. - if (NOT DEFINED BUILD_USE_MULTIPROCESSOR) - set(BUILD_USE_MULTIPROCESSOR TRUE) - endif() ! set(BUILD_USE_MULTIPROCESSOR ${BUILD_USE_MULTIPROCESSOR} CACHE BOOL "Build in MSVC using multiple processors (TRUE) else single processor (FALSE)" FORCE) ! if (BUILD_USE_MULTIPROCESSOR) ! add_definitions( /MP ) ! endif() elseif (UNIX) # elseif (CMAKE_BUILD_TOOL MATCHES "(gmake)") --- 268,286 ---- # ----------------------------------------------------------------------- ! # Use multiprocessor compliation if MSVC > ver 6 # In some cases it is nice to turn it off since it can be hard tell where some # pragma warnings come from if multiple files are compiled at once. ! if ("${MSVC_VERSION}" GREATER "1200") ! if (NOT DEFINED BUILD_USE_MULTIPROCESSOR) ! set(BUILD_USE_MULTIPROCESSOR TRUE) ! endif() ! set(BUILD_USE_MULTIPROCESSOR ${BUILD_USE_MULTIPROCESSOR} CACHE BOOL "Build in MSVC using multiple processors (TRUE) else single processor (FALSE)" FORCE) + if (BUILD_USE_MULTIPROCESSOR) + add_definitions( /MP ) + endif() + endif() elseif (UNIX) # elseif (CMAKE_BUILD_TOOL MATCHES "(gmake)") *************** *** 452,462 **** foreach( wx_comp ${wxWidgets_COMPONENTS} ) ! set(wx_comp_found FALSE) foreach( wx_comp_lib ${wxWidgets_LIBRARIES} ) get_filename_component(wx_comp_lib_name ${wx_comp_lib} NAME_WE) ! string(REGEX MATCH ${wx_comp_lib_name} ${wx_comp} wx_comp_found) ! if (wx_comp_found) ! string(REGEX MATCH ${wx_comp_lib_name} "wx" wx_comp_found) ! if (wx_comp_found) break() endif() --- 462,480 ---- foreach( wx_comp ${wxWidgets_COMPONENTS} ) ! set(wx_comp_found "-1") ! foreach( wx_comp_lib ${wxWidgets_LIBRARIES} ) + if ("${wx_comp}" STREQUAL "mono") + if (WX_mono OR WX_monod) + set(wx_comp_found "1") + break() + endif() + endif() + get_filename_component(wx_comp_lib_name ${wx_comp_lib} NAME_WE) ! string(FIND ${wx_comp_lib_name} ${wx_comp} wx_comp_found) ! if ("${wx_comp_found}" GREATER "-1") ! string(FIND ${wx_comp_lib_name} "wx" wx_comp_found) ! if ("${wx_comp_found}" GREATER "-1") break() endif() *************** *** 464,469 **** endforeach() ! if (wx_comp_found) ! message(STATUS "* WARNING: Unable to find requested wxWidgets component : ${wx_comp}") endif() endforeach() --- 482,487 ---- endforeach() ! if ("${wx_comp_found}" LESS "0") ! message(" WARNING: Unable to find requested wxWidgets component : ${wx_comp}") endif() endforeach() |
From: John L. <jr...@us...> - 2011-10-20 03:57:06
|
Update of /cvsroot/wxlua/wxLua/apps In directory vz-cvs-4.sog:/tmp/cvs-serv24331/apps Added Files: CMakeLists.txt Log Message: Add CMake build files for wxLua. --- NEW FILE: CMakeLists.txt --- # --------------------------------------------------------------------------- # CMake build file # --------------------------------------------------------------------------- include(../build/CMakeFunctions.txt) # --------------------------------------------------------------------------- # Project name, sets ${wxLuaApps_SOURCE_DIR} and ${wxLuaApps_BINARY_DIR} project( wxLuaApps ) set( wxLua_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ CACHE INTERNAL "Root dir of wxLua" FORCE) # --------------------------------------------------------------------------- # CMake build file for wxLua apps # --------------------------------------------------------------------------- include_directories(${wxLua_ROOT_DIR}/ ${wxLua_ROOT_DIR}/modules/ ${wxLua_ROOT_DIR}/modules/lua/src) ADD_EXECUTABLE_FULL( wxLua WIN32 HEADERS "${wxLua_ROOT_DIR}/apps/wxlua/src/*.h" SOURCES "${wxLua_ROOT_DIR}/apps/wxlua/src/*.cpp" ${wxLua_ROOT_DIR}/apps/wxlua/src/wxlua.rc LINK_LIBRARIES wxLuaBindLib wxLuaSocketLib wxLuaDebugLib wxLuaLib LuaLib ${wxWidgets_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") # --------------------------------------------------------------------------- ADD_EXECUTABLE_FULL( wxLuaCan WIN32 HEADERS "${wxLua_ROOT_DIR}/apps/wxluacan/src/*.h" SOURCES "${wxLua_ROOT_DIR}/apps/wxluacan/src/*.cpp" ${wxLua_ROOT_DIR}/apps/wxluacan/src/cansim.rc LINK_LIBRARIES wxLuaBindLib wxLuaSocketLib wxLuaDebugLib wxLuaLib LuaLib ${wxWidgets_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") # --------------------------------------------------------------------------- include_directories(${wxStEdit_ROOT_DIR}/include ${wxStEdit_SETUP_INCLUDE_PATH}) ADD_EXECUTABLE_FULL( wxLuaEdit WIN32 HEADERS "${wxLua_ROOT_DIR}/apps/wxluaedit/src/*.h" SOURCES "${wxLua_ROOT_DIR}/apps/wxluaedit/src/*.cpp" ${wxLua_ROOT_DIR}/apps/wxluaedit/src/wxluaedit.rc LINK_LIBRARIES wxStEditLib wxLuaBindLib wxLuaSocketLib wxLuaDebugLib wxLuaLib LuaLib ${wxWidgets_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") # --------------------------------------------------------------------------- ADD_EXECUTABLE_FULL( wxLuaFreeze WIN32 HEADERS "${wxLua_ROOT_DIR}/apps/wxluafreeze/src/*.h" SOURCES "${wxLua_ROOT_DIR}/apps/wxluafreeze/src/*.cpp" ${wxLua_ROOT_DIR}/apps/wxluafreeze/src/wxluafreeze.rc LINK_LIBRARIES wxLuaBindLib wxLuaSocketLib wxLuaDebugLib wxLuaLib LuaLib ${wxWidgets_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") |
From: John L. <jr...@us...> - 2011-10-20 03:54:00
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory vz-cvs-4.sog:/tmp/cvs-serv24163/modules/wxluadebug/src Modified Files: wxlstack.cpp Log Message: Fix some warnings about int to to bool. Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxlstack.cpp 10 Jun 2011 03:08:06 -0000 1.37 --- wxlstack.cpp 20 Oct 2011 03:53:57 -0000 1.38 *************** *** 673,677 **** wxLuaDebugItem* debugItem = debugData.Item(n); ! int img = GetItemImage(debugItem); if ((debugItem->GetRef() != LUA_NOREF) || --- 673,677 ---- wxLuaDebugItem* debugItem = debugData.Item(n); ! //int img = GetItemImage(debugItem); if ((debugItem->GetRef() != LUA_NOREF) || |
From: John L. <jr...@us...> - 2011-10-20 03:53:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory vz-cvs-4.sog:/tmp/cvs-serv24163/modules/wxlua/include Modified Files: wxldefs.h Log Message: Fix some warnings about int to to bool. Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wxldefs.h 21 Dec 2009 04:06:13 -0000 1.51 --- wxldefs.h 20 Oct 2011 03:53:57 -0000 1.52 *************** *** 104,108 **** // ---------------------------------------------------------------------------- ! #if wxUSE_UNICODE #define wxLUA_UNICODE_ONLY(x) x #else /* !Unicode */ --- 104,108 ---- // ---------------------------------------------------------------------------- ! #if wxUSE_UNICODE && !wxCHECK_VERSION(2,9,0) #define wxLUA_UNICODE_ONLY(x) x #else /* !Unicode */ |
From: John L. <jr...@us...> - 2011-07-21 03:09:23
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory vz-cvs-4.sog:/tmp/cvs-serv26491/build/bakefiles Modified Files: options.bkl wxluabase.bkl Log Message: Update build and install docs. Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** options.bkl 19 Jan 2008 21:37:09 -0000 1.13 --- options.bkl 21 Jul 2011 03:09:21 -0000 1.14 *************** *** 45,49 **** <values-description>Debug,Release</values-description> <description> ! Builds in debug mode </description> </option> --- 45,49 ---- <values-description>Debug,Release</values-description> <description> ! Builds in debug mode (use same settings as wxWidgets libs) </description> </option> *************** *** 54,58 **** <values-description>,Unicode</values-description> <description> ! Builds in Unicode mode </description> </option> --- 54,58 ---- <values-description>,Unicode</values-description> <description> ! Builds in Unicode mode (use same settings as wxWidgets libs) </description> </option> *************** *** 63,67 **** <values-description>,DLL</values-description> <description> ! Builds in shared mode </description> </option> --- 63,67 ---- <values-description>,DLL</values-description> <description> ! Builds wxLua libs in shared mode </description> </option> *************** *** 141,146 **** <default-value>dynamic</default-value> <description> ! This is an advanced option. Handle with care. ! Version of C runtime library to use. You can change this to static if SHARED=0, but it is highly recommended to not do it if SHARED=1 unless you know what you are doing. --- 141,146 ---- <default-value>dynamic</default-value> <description> ! This is an advanced option, handle with care. ! Sets type of C runtime library to use. You can change this to static if SHARED=0, but it is highly recommended to not do it if SHARED=1 unless you know what you are doing. *************** *** 151,155 **** <default-value>multi</default-value> <description> ! This is an advanced option. Handle with care. The thread model to use: use 'multi' default to allow multi-threading. --- 151,155 ---- <default-value>multi</default-value> <description> ! This is an advanced option, handle with care. The thread model to use: use 'multi' default to allow multi-threading. Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxluabase.bkl 9 Mar 2011 04:12:16 -0000 1.49 --- wxluabase.bkl 21 Jul 2011 03:09:21 -0000 1.50 *************** *** 23,29 **** <!-- wxLua version is strictly tied to the wxWidgets version: the first ! stable release of wxLua wrappers for wx 2.6.2 is named 2.6.2.1; ! other releases which would eventually follow will be named 2.6.2.2, ! 2.6.2.3, etc. So, only the fourth digit of the wxLua version number is defined here. --- 23,29 ---- <!-- wxLua version is strictly tied to the wxWidgets version: the first ! stable release of wxLua wrappers for wx 2.6.2 is named 2.6.2.0; ! other releases which would eventually follow will be named 2.6.2.1, ! 2.6.2.2, etc. So, only the fourth digit of the wxLua version number is defined here. *************** *** 70,78 **** </set> <set var="TARGETING_IDE"> ! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if> <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if> </set> <set var="TARGETING_MAKEFILE"> ! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if> <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if> </set> --- 70,78 ---- </set> <set var="TARGETING_IDE"> ! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if> <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if> </set> <set var="TARGETING_MAKEFILE"> ! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if> <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if> </set> *************** *** 370,374 **** if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME)) </command> ! </modify-target> <!-- the following code is mostly equivalent to a: --- 370,374 ---- if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME)) </command> ! </modify-target> <!-- the following code is mostly equivalent to a: |
From: John L. <jr...@us...> - 2011-06-16 02:01:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory vz-cvs-4.sog:/tmp/cvs-serv1907/apps/wxluafreeze/src Modified Files: readme.txt wxluafreeze.cpp Log Message: nothing important Index: readme.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.txt 13 Jun 2007 00:08:57 -0000 1.3 --- readme.txt 16 Jun 2011 02:01:11 -0000 1.4 *************** *** 18,20 **** 3) Optionally use the program "upx" to compress the executable. The wxLuaFreeze program is ~4.5 Mb in release mode using the MSVC6, but after compression ! it's size is ~1.5 Mbytes, about 1/3 the size! --- 18,20 ---- 3) Optionally use the program "upx" to compress the executable. The wxLuaFreeze program is ~4.5 Mb in release mode using the MSVC6, but after compression ! it's size is ~1.5 Mbytes, about 1/3 the size. Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluafreeze.cpp 24 Nov 2010 07:18:37 -0000 1.20 --- wxluafreeze.cpp 16 Jun 2011 02:01:11 -0000 1.21 *************** *** 123,127 **** // When this function returns wxApp:MainLoop() will be called by wxWidgets ! // and so we want the Lua code wx.wxGetApp:MailLoop() to not // prematurely start it. wxLuaState::sm_wxAppMainLoop_will_run = true; --- 123,127 ---- // When this function returns wxApp:MainLoop() will be called by wxWidgets ! // and so we want the Lua code wx.wxGetApp:MainLoop() to not // prematurely start it. wxLuaState::sm_wxAppMainLoop_will_run = true; *************** *** 144,148 **** OutputPrint(wxString::Format(wxT("Expecting '<wxLuaFreeze:[script length]>' at end of '%s'.\n") wxT("Did you forget to run wxluafreeze.lua to attach your script?\n") ! wxT("You may run wxLua programs by specifying them on the command line."), m_fileName.c_str())); } --- 144,148 ---- OutputPrint(wxString::Format(wxT("Expecting '<wxLuaFreeze:[script length]>' at end of '%s'.\n") wxT("Did you forget to run wxluafreeze.lua to attach your script?\n") ! wxT("You may also run wxLua programs by specifying them on the command line."), m_fileName.c_str())); } |
From: John L. <jr...@us...> - 2011-06-15 02:45:57
|
Update of /cvsroot/wxlua/wxLua/samples In directory vz-cvs-4.sog:/tmp/cvs-serv3662/samples Modified Files: catch.lua choices.wx.lua controls.wx.lua htmlwin.wx.lua mdi.wx.lua picker.wx.lua Log Message: Some cleanup Index: picker.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/picker.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** picker.wx.lua 22 Jan 2008 04:45:39 -0000 1.3 --- picker.wx.lua 15 Jun 2011 02:45:54 -0000 1.4 *************** *** 164,168 **** datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER2, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, ! wx. wxDP_SPIN) else datePicker = wx.wxStaticText(scrollWin, wx.wxID_ANY, "Supported in MSW only") --- 164,168 ---- datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER2, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxDP_SPIN) else datePicker = wx.wxStaticText(scrollWin, wx.wxID_ANY, "Supported in MSW only") Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** controls.wx.lua 21 Dec 2009 04:06:14 -0000 1.21 --- controls.wx.lua 15 Jun 2011 02:45:54 -0000 1.22 *************** *** 87,97 **** ID_STATICBOX = 1036 ID_STATICLINE = 1037 ! ID_TEXTCTRL = 1038 ! ID_TOGGLEBUTTON = 1039 ! ID_TOOLBAR = 1040 ! ID_TOOLBOOK = 1041 ! ID_TREEBOOK = 1042 ! ID_TREECTRL = 1043 ! ID_WINDOW = 1044 -- --------------------------------------------------------------------------- --- 87,98 ---- ID_STATICBOX = 1036 ID_STATICLINE = 1037 ! ID_STATICTEXT = 1038 ! ID_TEXTCTRL = 1039 ! ID_TOGGLEBUTTON = 1040 ! ID_TOOLBAR = 1041 ! ID_TOOLBOOK = 1042 ! ID_TREEBOOK = 1043 ! ID_TREECTRL = 1044 ! ID_WINDOW = 1045 -- --------------------------------------------------------------------------- *************** *** 828,833 **** -- ----------------------------------------------------------------------- do ! local p = wx.wxStaticText(scrollWin, wx.wxID_ANY, "See taskbar for icon") taskbarIcon = wx.wxTaskBarIcon() local icon = wx.wxIcon() --- 829,839 ---- -- ----------------------------------------------------------------------- + control = wx.wxStaticText(scrollWin, ID_STATICTEXT, "Text for the wxStaticText control") + AddControl("wxStaticText", control) + + -- ----------------------------------------------------------------------- + do ! local p = wx.wxStaticText(scrollWin, wx.wxID_ANY, "See OS taskbar for lightbulb icon") taskbarIcon = wx.wxTaskBarIcon() local icon = wx.wxIcon() Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mdi.wx.lua 22 Jan 2008 04:45:39 -0000 1.15 --- mdi.wx.lua 15 Jun 2011 02:45:54 -0000 1.16 *************** *** 32,36 **** dc:DrawRoundedRectangle(20, 20, 280, 280, 20); dc:DrawEllipse(30, 30, 260, 260); ! dc:DrawText("A test string for window Id "..tostring(win:GetId()), 50, 150); dc:delete() -- ALWAYS delete() any wxDCs created when done end --- 32,36 ---- dc:DrawRoundedRectangle(20, 20, 280, 280, 20); dc:DrawEllipse(30, 30, 260, 260); ! dc:DrawText("Test string for window Id "..tostring(win:GetId()), 40, 150); dc:delete() -- ALWAYS delete() any wxDCs created when done end Index: catch.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/catch.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** catch.lua 14 Jun 2011 03:33:29 -0000 1.2 --- catch.lua 15 Jun 2011 02:45:54 -0000 1.3 *************** *** 32,38 **** local wallThickness = 5 ! local joyStick1 = wx.wxJoystick(wx.wxJOYSTICK1) ! local joyStick2 = wx.wxJoystick(wx.wxJOYSTICK2) ! local redrawRequired = true --- 32,37 ---- local wallThickness = 5 ! local joyStick1 = wx.wxJoystick(wx.wxJOYSTICK1) ! local joyStick2 = wx.wxJoystick(wx.wxJOYSTICK2) local redrawRequired = true *************** *** 319,323 **** end -- ensure the event is skipped to allow the frame to close ! event:Skip() end ) --- 318,322 ---- end -- ensure the event is skipped to allow the frame to close ! event:Skip() end ) *************** *** 330,334 **** end ) - -- ----------------------------------------------------------------------- -- Game type menu --- 329,332 ---- *************** *** 373,381 **** frame:Center() ! frame:Show(true) ! if (not joyStick1:IsOk() and joyStick2:IsOk()) then ! wx.wxMessageBox('Only one joystick and joystick id is set to 2\n change id to one or program will not work','Catch') end end --- 371,378 ---- frame:Center() ! frame:Show(true) if (not joyStick1:IsOk() and joyStick2:IsOk()) then ! wx.wxMessageBox('Only one joystick and joystick id is set to 2\n change id to one or program will not work','Catch') end end Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** choices.wx.lua 22 Jan 2008 04:45:39 -0000 1.13 --- choices.wx.lua 15 Jun 2011 02:45:54 -0000 1.14 *************** *** 26,35 **** -- create the hierarchy: frame -> notebook frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices", ! wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) frame:SetStatusText("wxEvents from controls will be displayed here", 0) local notebook = wx.wxNotebook(frame, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxSize(410, 300)) --wx.wxNB_BOTTOM) --- 26,35 ---- -- create the hierarchy: frame -> notebook frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices", ! wx.wxDefaultPosition, wx.wxSize(635, 350)) frame:CreateStatusBar(1) frame:SetStatusText("wxEvents from controls will be displayed here", 0) local notebook = wx.wxNotebook(frame, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxDefaultSize) --wx.wxNB_BOTTOM) Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** htmlwin.wx.lua 22 Jan 2008 04:45:39 -0000 1.15 --- htmlwin.wx.lua 15 Jun 2011 02:45:54 -0000 1.16 *************** *** 29,34 **** </center> <hr> ! <lua text="small widget" ! x=60 y=50> <hr> <lua text="widget with floating width" --- 29,34 ---- </center> <hr> ! <lua text="widget with lots of text in it" ! x=100 y=50> <hr> <lua text="widget with floating width" |
From: John L. <jr...@us...> - 2011-06-14 03:33:31
|
Update of /cvsroot/wxlua/wxLua/samples In directory vz-cvs-4.sog:/tmp/cvs-serv5532/samples Modified Files: catch.lua Log Message: Delete wxBrush after use and only need single status bar field. Index: catch.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/catch.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** catch.lua 9 Nov 2010 05:03:22 -0000 1.1 --- catch.lua 14 Jun 2011 03:33:29 -0000 1.2 *************** *** 231,235 **** self.post = {} for i= 1, 10 + self.maxHoleMoved do ! local post = Occupant:new{bitmap = bitmapPost} repeat until self:Place(post, self:RandomRC()) table.insert(self.post, post) --- 231,235 ---- self.post = {} for i= 1, 10 + self.maxHoleMoved do ! local post = Occupant:new({bitmap = bitmapPost}) repeat until self:Place(post, self:RandomRC()) table.insert(self.post, post) *************** *** 250,255 **** function main() bitmapPost = wx.wxBitmap(xpm('wall')) ! Person = Occupant:new{bitmap = wx.wxBitmap(xpm('Person'))} ! Present = Occupant:new{bitmap = wx.wxBitmap(xpm('Present'))} frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Catch the present", wx.wxDefaultPosition, wx.wxDefaultSize, --- 250,255 ---- function main() bitmapPost = wx.wxBitmap(xpm('wall')) ! Person = Occupant:new({bitmap = wx.wxBitmap(xpm('Person'))}) ! Present = Occupant:new({bitmap = wx.wxBitmap(xpm('Present'))}) frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Catch the present", wx.wxDefaultPosition, wx.wxDefaultSize, *************** *** 283,287 **** if (wx.wxJoystick.GetNumberJoysticks() == 0) then menuBar:EnableTop(2, false) end -- Create the statusbar ! local statusBar = frame:CreateStatusBar(2) frame:SetStatusText("Welcome to Catch.") --- 283,287 ---- if (wx.wxJoystick.GetNumberJoysticks() == 0) then menuBar:EnableTop(2, false) end -- Create the statusbar ! local statusBar = frame:CreateStatusBar(1) frame:SetStatusText("Welcome to Catch.") *************** *** 311,315 **** offScreenBitmap = nil end ! soundTata:delete() if timer then timer:Stop() -- always stop before exiting or deleting it --- 311,316 ---- offScreenBitmap = nil end ! soundTata:delete() ! soundRecycle:delete() if timer then timer:Stop() -- always stop before exiting or deleting it *************** *** 410,418 **** local dc = wx.wxMemoryDC() -- create off screen dc to draw on dc:SelectObject(bmp) -- select our bitmap to draw into ! dc:SetBackground(wx.wxBrush('turquoise', wx.wxSOLID)) dc:Clear() self:Draw(dc) dc:SelectObject(wx.wxNullBitmap) -- always release bitmap ! dc:delete() -- ALWAYS delete() any wxDCs created when done end --- 411,421 ---- local dc = wx.wxMemoryDC() -- create off screen dc to draw on dc:SelectObject(bmp) -- select our bitmap to draw into ! local brush = wx.wxBrush('turquoise', wx.wxSOLID) ! dc:SetBackground(brush) dc:Clear() self:Draw(dc) dc:SelectObject(wx.wxNullBitmap) -- always release bitmap ! dc:delete() -- ALWAYS delete() any wxDCs created when done ! brush:delete() -- ALWAYS delete() all GDI objects end |
From: John L. <jr...@us...> - 2011-06-14 03:04:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory vz-cvs-4.sog:/tmp/cvs-serv30245/modules/wxbind/src Modified Files: wxaui_bind.cpp Log Message: SetArtProvider() takes ownership of the artprovider parameter. Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxaui_bind.cpp 20 Apr 2011 02:38:59 -0000 1.23 --- wxaui_bind.cpp 14 Jun 2011 03:04:03 -0000 1.24 *************** *** 1842,1850 **** static int LUACALL wxLua_wxAuiTabCtrl_SetArtProvider(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetArtProvider[1] = {{ wxLua_wxAuiTabCtrl_SetArtProvider, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetArtProvider }}; ! // void SetArtProvider(wxAuiTabArt* art); static int LUACALL wxLua_wxAuiTabCtrl_SetArtProvider(lua_State *L) { // wxAuiTabArt art wxAuiTabArt * art = (wxAuiTabArt *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiTabArt); // get this wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl); --- 1842,1851 ---- static int LUACALL wxLua_wxAuiTabCtrl_SetArtProvider(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetArtProvider[1] = {{ wxLua_wxAuiTabCtrl_SetArtProvider, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetArtProvider }}; ! // void SetArtProvider(%ungc wxAuiTabArt* art); static int LUACALL wxLua_wxAuiTabCtrl_SetArtProvider(lua_State *L) { // wxAuiTabArt art wxAuiTabArt * art = (wxAuiTabArt *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiTabArt); + if (wxluaO_isgcobject(L, art)) wxluaO_undeletegcobject(L, art); // get this wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl); *************** *** 2487,2495 **** static int LUACALL wxLua_wxAuiNotebook_SetArtProvider(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider[1] = {{ wxLua_wxAuiNotebook_SetArtProvider, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebook_SetArtProvider }}; ! // void SetArtProvider(wxAuiTabArt* art); static int LUACALL wxLua_wxAuiNotebook_SetArtProvider(lua_State *L) { // wxAuiTabArt art wxAuiTabArt * art = (wxAuiTabArt *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiTabArt); // get this wxAuiNotebook * self = (wxAuiNotebook *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebook); --- 2488,2497 ---- static int LUACALL wxLua_wxAuiNotebook_SetArtProvider(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider[1] = {{ wxLua_wxAuiNotebook_SetArtProvider, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebook_SetArtProvider }}; ! // void SetArtProvider(%ungc wxAuiTabArt* art); static int LUACALL wxLua_wxAuiNotebook_SetArtProvider(lua_State *L) { // wxAuiTabArt art wxAuiTabArt * art = (wxAuiTabArt *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiTabArt); + if (wxluaO_isgcobject(L, art)) wxluaO_undeletegcobject(L, art); // get this wxAuiNotebook * self = (wxAuiNotebook *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebook); |
From: John L. <jr...@us...> - 2011-06-10 03:31:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory vz-cvs-4.sog:/tmp/cvs-serv3174/bindings/wxwidgets Modified Files: wxbase_file.i Log Message: Appropriately %gc or %ungc wxFileSystemHandler(s) added to wxFileSystem Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_file.i 10 Jun 2011 03:16:32 -0000 1.8 --- wxbase_file.i 10 Jun 2011 03:31:07 -0000 1.9 *************** *** 987,994 **** // Adds FS handler. // In fact, this class is only front-end to the FS handlers :-) ! static void AddHandler(wxFileSystemHandler *handler); // Removes FS handler ! static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler); // Returns true if there is a handler which can open the given location. --- 987,994 ---- // Adds FS handler. // In fact, this class is only front-end to the FS handlers :-) ! static void AddHandler(%ungc wxFileSystemHandler *handler); // Removes FS handler ! static %gc wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler); // Returns true if there is a handler which can open the given location. |
From: John L. <jr...@us...> - 2011-06-10 03:16:34
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory vz-cvs-4.sog:/tmp/cvs-serv32470/bindings/wxwidgets Modified Files: wxbase_file.i Log Message: Apply patch from bug report "memory leak from wxFileSystem::OpenFile (with patch)" Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxbase_file.i 1 Oct 2009 04:21:00 -0000 1.7 --- wxbase_file.i 10 Jun 2011 03:16:32 -0000 1.8 *************** *** 972,976 **** // (based on ChangePathTo()'s value) and then as an absolute // path. ! wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ); // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting --- 972,976 ---- // (based on ChangePathTo()'s value) and then as an absolute // path. ! %gc wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ); // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting |