Menu
▾
▴
wxlua-commit — CVS commits of wxLua
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...> - 2006-12-12 21:24:53
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8857/wxLua/apps/wxlua/src Modified Files: Makefile Log Message: Added ability to specify what line ending to use for text files in bin2c Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 15 May 2006 04:48:37 -0000 1.17 --- Makefile 12 Dec 2006 21:24:44 -0000 1.18 *************** *** 77,81 **** editor: ! $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t -n wxLuaEditor -o editor.h $(WXLUA_DIR)/samples/editor.wx.lua wxLuaBindings: --- 77,81 ---- editor: ! $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t -lf -n wxLuaEditor -o editor.h $(WXLUA_DIR)/samples/editor.wx.lua wxLuaBindings: |
|
From: John L. <jr...@us...> - 2006-12-12 21:24:53
|
Update of /cvsroot/wxlua/wxLua/util/bin2c In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8857/wxLua/util/bin2c Modified Files: bin2c.lua Log Message: Added ability to specify what line ending to use for text files in bin2c Index: bin2c.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/bin2c/bin2c.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bin2c.lua 5 Apr 2006 21:29:42 -0000 1.6 --- bin2c.lua 12 Dec 2006 21:24:44 -0000 1.7 *************** *** 10,16 **** ------------------------------------------------------------------------------- -- This program converts a file into a "const unsigned char" buffer and a ! -- size_t length for use in a c/c++ program. It requires lua >= 5.1 to run. -- ! -- It outputs to the console so no files are modified, use pipes to redirect. -- -- See "Usage()" function for usage or just run this with no parameters. --- 10,17 ---- ------------------------------------------------------------------------------- -- This program converts a file into a "const unsigned char" buffer and a ! -- size_t length for use in a C/C++ program. It requires lua >= 5.1 to run. -- ! -- It outputs to the console so no files are modified, use pipes to redirect ! -- or -o command line option to write to a specified file. -- -- See "Usage()" function for usage or just run this with no parameters. *************** *** 18,22 **** -- The program has two modes, binary and text. -- In text mode; each line of the char buffer is each line in the input file. ! -- This will minimize the diffs for small changes in files put in CVS. -- In binary mode (default), the file is dumped 80 cols wide as is. ------------------------------------------------------------------------------- --- 19,23 ---- -- The program has two modes, binary and text. -- In text mode; each line of the char buffer is each line in the input file. ! -- This will minimize the diffs for small changes in files put into CVS. -- In binary mode (default), the file is dumped 80 cols wide as is. ------------------------------------------------------------------------------- *************** *** 35,41 **** end ! -- the contents of the file matches the strings in the fileData table ! -- the table may contain any number of \n per index ! -- returns true for a match or false if not function FileDataIsTableData(filename, fileData) local file_handle = io.open(filename) --- 36,42 ---- end ! -- Do the contents of the file matche the strings in the fileData table? ! -- The table may contain any number of \n per index. ! -- Returns true for an exact match or false if not. function FileDataIsTableData(filename, fileData) local file_handle = io.open(filename) *************** *** 79,83 **** if not outfile then print("Unable to open file for writing '"..filename.."'.") ! return end --- 80,84 ---- if not outfile then print("Unable to open file for writing '"..filename.."'.") ! return false end *************** *** 91,143 **** end ! -- Read a file as binary data, returning the data as a string and length ! -- that includes the terminating null we'll add. function ReadBinaryFile(fileName) local file = assert(io.open(fileName, "rb"), "Invalid input file : '"..tostring(fileName).."'\n") local fileData = file:read("*all") - local len = string.len(fileData) + 1 -- added for terminating null of string io.close(file) ! return fileData, len end ! -- Create the output header function CreateHeader(stringName, fileName, fileSize, outTable) ! table.insert(outTable, "/* Generated by bin2c.lua and should be compiled with your program. */\n") ! table.insert(outTable, "/* Access with : extern const size_t filename_len; */\n") ! table.insert(outTable, "/* extern const unsigned char filename[]; */\n\n") ! table.insert(outTable, "#include <stdio.h> /* for size_t */\n\n") ! table.insert(outTable, string.format("/* Original filename: '%s' */\n", fileName)) ! table.insert(outTable, string.format("extern const size_t %s_len;\n", stringName)) ! table.insert(outTable, string.format("extern const unsigned char %s[];\n\n", stringName)) - table.insert(outTable, string.format("const size_t %s_len = %d;\n", stringName, fileSize-1)) -- exclude ending NULL - table.insert(outTable, string.format("const unsigned char %s[%d] = {\n", stringName, fileSize)) return outTable end -- Dump the data for the text file maintaining the original line structure ! function CreateTextData(fileData, outTable) local CR = string.byte("\r") -- DOS = CRLF, Unix = LF, Mac = CR local LF = string.byte("\n") ! local len = string.len(fileData) local n = 1 local str = "" ! while ( n <= len ) do local byte = string.byte(fileData, n) - str = str..string.format("%3u,", byte) ! -- handle DOS CRLF line endings by adding the LF before new line ! if (byte == CR) and (n < len) then ! local next_byte = string.byte(fileData, n+1) ! if (next_byte == LF) then n = n + 1 ! str = str..string.format("%3u,", next_byte) end end ! if (byte == CR) or (byte == LF) or (n >= len) then table.insert(outTable, str.."\n") str = "" --- 92,173 ---- end ! -- Read a file as binary data, returning the data as a string. function ReadBinaryFile(fileName) local file = assert(io.open(fileName, "rb"), "Invalid input file : '"..tostring(fileName).."'\n") local fileData = file:read("*all") io.close(file) ! return fileData end ! -- Create the output header and prepend to the outTable function CreateHeader(stringName, fileName, fileSize, outTable) ! local headerTable = {} ! table.insert(headerTable, "/* Generated by bin2c.lua and should be compiled with your program. */\n") ! table.insert(headerTable, "/* Access with : */\n") ! table.insert(headerTable, "/* extern const size_t stringname_len; (excludes teminating NULL) */\n") ! table.insert(headerTable, "/* extern const unsigned char stringname[]; */\n\n") ! table.insert(headerTable, "#include <stdio.h> /* for size_t */\n\n") ! ! table.insert(headerTable, string.format("/* Original filename: '%s' */\n", fileName)) ! table.insert(headerTable, string.format("extern const size_t %s_len;\n", stringName)) ! table.insert(headerTable, string.format("extern const unsigned char %s[];\n\n", stringName)) ! ! table.insert(headerTable, string.format("const size_t %s_len = %d;\n", stringName, fileSize)) ! table.insert(headerTable, string.format("const unsigned char %s[%d] = {\n", stringName, fileSize+1)) ! ! -- prepend the header to the outTable in reverse order ! for n = #headerTable, 1, -1 do ! table.insert(outTable, 1, headerTable[n]) ! end return outTable end -- Dump the data for the text file maintaining the original line structure ! function CreateTextData(fileData, outTable, line_ending) local CR = string.byte("\r") -- DOS = CRLF, Unix = LF, Mac = CR local LF = string.byte("\n") ! local file_len = string.len(fileData) ! local len = 0 local n = 1 local str = "" ! if line_ending then ! local switch = { ! cr = string.format("%3u,", CR), ! lf = string.format("%3u,", LF), ! crlf = string.format("%3u,%3u,", CR, LF) } ! ! line_ending = switch[string.sub(line_ending, 2)] -- remove leading '-' ! end ! ! while ( n <= file_len ) do local byte = string.byte(fileData, n) ! if (byte == CR) or (byte == LF) then ! local line_end_str = string.format("%3u,", byte) ! ! -- handle DOS CRLF line endings by adding the LF before new line ! if (byte == CR) and (n < file_len) and (string.byte(fileData, n+1) == LF) then n = n + 1 ! line_end_str = line_end_str..string.format("%3u,", LF) end + + -- replace with user specified line ending + if line_ending ~= nil then + line_end_str = line_ending + end + + str = str..line_end_str + len = len + math.floor(string.len(line_end_str)/4) + else + str = str..string.format("%3u,", byte) + len = len + 1 end ! -- add a real \n to text file, will be appropriate for platform ! if (byte == CR) or (byte == LF) or (n >= file_len) then table.insert(outTable, str.."\n") str = "" *************** *** 147,152 **** end ! table.insert(outTable, " 0 };\n\n") ! return outTable end --- 177,182 ---- end ! table.insert(outTable, " 0 };\n\n") ! return outTable, len end *************** *** 154,160 **** --- 184,192 ---- function CreateBinaryData(fileData, outTable) local count = 0 + local len = 0 local str = "" for n = 1, string.len(fileData) do str = str..string.format("%3u,", string.byte(fileData, n)) + len = len + 1 count = count + 1 if (count == 20) then *************** *** 165,186 **** end ! table.insert(outTable, str.." 0 };\n\n") ! return outTable end -- Print the Usage to the console ! function Usage() ! print("bin2c.lua converts a file to byte arrays for automatic loading with lua_dobuffer or") ! print(" more generally for use by any c/c++ program as a const unsigned char buffer.\n") ! print("The output contains a header and two variables, the data size and the data itself.") ! print(" const size_t inputfile_len; // length of string - 1 (excludes terminating NULL)") ! print(" const unsigned char inputfile[] = { 123, 232, ... , 0 }; ") print("Switches :") ! print(" -b Binary dump for binary files, 80 columns wide (default)") ! print(" -t Text dump where the original line structure is maintained") ! print(" -n Name of the c string to create, else derive name from input file") ! print(" -o Filename to output to, else output to stdout") ! print(" -w when used with -o always overwrite the output file") ! print("Usage : $bin2c.lua [-b or -t] [-n cstringname] [-o outputfile.cpp] [-w] inputfile") end --- 197,227 ---- end ! table.insert(outTable, str.."\n 0 };\n\n") ! return outTable, len end -- Print the Usage to the console ! function Usage() -- | 80 col ! print("bin2c.lua converts a file to const unsigned char byte array for loading with") ! print(" lua_dobuffer or for general use by any C/C++ program.\n") ! print("The output contains two variables, the data size and the data itself.") ! print(" const size_t stringname_len; // string length - 1 (excludes terminating NULL)") ! print(" const unsigned char stringname[] = { 123, 232, ... , 0 }; ") ! print("When converting text files you may want to use the -lf switch since many") ! print(" programs can easily parse Unix line endings and the output will be the same") ! print(" no matter what line endings the original file has. This is useful for") ! print(" files checked out using CVS on both Unix and DOS platforms.") print("Switches :") ! print(" -b Binary dump for binary files, 80 columns wide (default)") ! print(" -t Text dump where the original line structure is maintained") ! print(" -cr Convert line endings to carriage returns CR='\\r' for Mac (use with -t)") ! print(" -lf Convert line endings to line feeds LF='\\n' for Unix (use with -t)") ! print(" -crlf Convert line endings to CRLF='\\r\\n' for DOS (use with -t)") ! print(" -n Name of the c string to create, else derive name from input file") ! print(" -o Filename to output to, else output to stdout") ! print(" -w When used with -o always overwrite the output file") ! print("Usage : ") ! print(" $lua.exe bin2c.lua [-b or -t] [-cr or -lf or -crlf] [-n cstringname]") ! print(" [-o outputfile.c] [-w] inputfile") end *************** *** 188,194 **** function main() - -- check for input arguments for text or binary input file, if none use bin local is_text = false -- -t switch set local is_binary = false -- -b switch set local set_string = false -- -n switch set local stringName = nil -- -n stringName --- 229,235 ---- function main() local is_text = false -- -t switch set local is_binary = false -- -b switch set + local line_ending = nil -- -cr, -lf, -crlf switches local set_string = false -- -n switch set local stringName = nil -- -n stringName *************** *** 198,221 **** local inFileName = nil -- input filename ! local skip_next = false ! ! for n = 1, #arg do ! if not skip_next then ! if (arg[n] == "-t") or (arg[n] == "/t") then is_text = true end ! if (arg[n] == "-b") or (arg[n] == "/b") then is_binary = true end ! if (arg[n] == "-w") or (arg[n] == "/w") then overwrite = true end ! if (arg[n] == "-n") or (arg[n] == "/n") then ! set_string = true ! stringName = arg[n+1] ! skip_next = true ! end ! if (arg[n] == "-o") or (arg[n] == "/o") then ! output_file = true ! outFileName = arg[n+1] ! skip_next = true ! end ! else ! skip_next = false end end --- 239,270 ---- local inFileName = nil -- input filename ! local n = 1 ! while n <= #arg do ! if (arg[n] == "-t") or (arg[n] == "/t") then ! is_text = true ! elseif (arg[n] == "-b") or (arg[n] == "/b") then ! is_binary = true ! elseif (arg[n] == "-cr") or (arg[n] == "/cr") then ! line_ending = (line_ending or "").."-cr" -- to check errors ! elseif (arg[n] == "-lf") or (arg[n] == "/lf") then ! line_ending = (line_ending or "").."-lf" ! elseif (arg[n] == "-crlf") or (arg[n] == "/crlf") then ! line_ending = (line_ending or "").."-crlf" ! elseif (arg[n] == "-w") or (arg[n] == "/w") then ! overwrite = true ! elseif (arg[n] == "-n") or (arg[n] == "/n") then ! set_string = true ! n = n + 1 ! stringName = arg[n] ! elseif (arg[n] == "-o") or (arg[n] == "/o") then ! output_file = true ! n = n + 1 ! outFileName = arg[n] ! elseif n == #arg then ! -- input filename is always the last parameter ! inFileName = arg[n] end + + n = n + 1 end *************** *** 226,253 **** end if (is_text and is_binary) then ! print("Can only use -b or -t flags, not both.\n\n") Usage() return end ! if (set_string and not stringName) then ! print("Missing name of the string to use for -n flag.\n\n") Usage() return end ! if (output_file and not outFileName) then ! print("Missing output filename to use for -o flag.\n\n") Usage() return end ! ! -- input filename is always the last parameter ! inFileName = arg[#arg] ! ! if not inFileName then ! print("Missing input filename.\n\n") Usage() return ! elseif not FileExists(inFileName) then ! print("Invalid or missing input filename : '"..tostring(inFileName).."'\n\n") Usage() return --- 275,306 ---- end if (is_text and is_binary) then ! print("Error: Only use -b or -t flags, not both.\n") Usage() return end ! if (is_binary and line_ending) then ! print("Error: Only use -cr, -lf, -crlf with text file -t flag, not -b binary.\n") Usage() return end ! if not ((line_ending == nil) or (line_ending == "-cr") or ! (line_ending == "-lf") or (line_ending == "-crlf")) then ! print("Error: Only use one of -cr, -lf, -crlf at a time.\n") Usage() return end ! if (set_string and (not stringName)) then ! print("Error: Missing name of the string to use for -n flag.\n") Usage() return ! end ! if (output_file and (not outFileName)) then ! print("Error: Missing output filename to use for -o flag.\n") ! Usage() ! return ! end ! ! if (not inFileName) or (not FileExists(inFileName)) then ! print("Error: Invalid or missing input filename : '"..tostring(inFileName).."'\n") Usage() return *************** *** 274,287 **** end ! local fileData, len = ReadBinaryFile(inFileName) local outTable = {} ! outTable = CreateHeader(stringName, inFileName, len, outTable) if is_text then ! outTable = CreateTextData(fileData, outTable) else -- default is binary ! outTable = CreateBinaryData(fileData, outTable) end if not output_file then for n = 1, #outTable do --- 327,342 ---- end ! local fileData = ReadBinaryFile(inFileName) local outTable = {} ! local len = 0 if is_text then ! outTable, len = CreateTextData(fileData, outTable, line_ending) else -- default is binary ! outTable, len = CreateBinaryData(fileData, outTable) end + outTable = CreateHeader(stringName, inFileName, len, outTable) + if not output_file then for n = 1, #outTable do |
|
From: Francesco M. <fr...@us...> - 2006-12-12 18:31:01
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2338/build/bakefiles Modified Files: wxluabase.bkl Log Message: updated WX_VERSION to 28 now that wx2.8 has been released Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxluabase.bkl 11 Dec 2006 00:08:19 -0000 1.26 --- wxluabase.bkl 12 Dec 2006 18:30:54 -0000 1.27 *************** *** 41,45 **** if you want to use other versions, you'll have to specify it using the WX_VERSION option --> ! <set var="WX_VERSION_DEFAULT">26</set> <!-- these variables needs to be carefully set by someone who --- 41,45 ---- if you want to use other versions, you'll have to specify it using the WX_VERSION option --> ! <set var="WX_VERSION_DEFAULT">28</set> <!-- these variables needs to be carefully set by someone who |
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:53:53
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked with fixed bakefile: WX_DEBUG and WX_UNICODE options should now disappear Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** makefile.vc 11 Dec 2006 00:08:19 -0000 1.36 --- makefile.vc 12 Dec 2006 14:53:47 -0000 1.37 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 107,117 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 98,107 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 133,145 **** __apps___depname = sub_apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 123,135 ---- __apps___depname = sub_apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.bcc 11 Dec 2006 00:08:19 -0000 1.33 --- makefile.bcc 12 Dec 2006 14:53:47 -0000 1.34 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 157,161 **** -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ - -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ --- 147,150 ---- *************** *** 168,183 **** ### Conditionally set variables: ### - !if "$(BUILD)" == "debug" - WX_DEBUG = 1 - !endif - !if "$(BUILD)" == "release" - WX_DEBUG = 0 - !endif - !if "$(UNICODE)" == "0" - WX_UNICODE = 0 - !endif - !if "$(UNICODE)" == "1" - WX_UNICODE = 1 - !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = static --- 157,160 ---- *************** *** 195,207 **** __apps___depname = apps !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 172,184 ---- __apps___depname = apps !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** makefile.wat 11 Dec 2006 00:08:19 -0000 1.35 --- makefile.wat 12 Dec 2006 14:53:47 -0000 1.36 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 138,156 **** !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### --- 129,147 ---- !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ### Variables: ### *************** *** 159,169 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 150,159 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** makefile.gcc 11 Dec 2006 00:08:19 -0000 1.34 --- makefile.gcc 12 Dec 2006 14:53:47 -0000 1.35 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 44,47 ---- *************** *** 97,107 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 91,100 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 123,141 **** __apps___depname = apps endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif --- 116,134 ---- __apps___depname = apps endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif |
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:53:52
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/apps Modified Files: Makefile.in Log Message: rebaked with fixed bakefile: WX_DEBUG and WX_UNICODE options should now disappear Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Makefile.in 10 Dec 2006 00:47:21 -0000 1.45 --- Makefile.in 12 Dec 2006 14:53:47 -0000 1.46 *************** *** 253,257 **** app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp --- 253,257 ---- app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp *************** *** 262,266 **** app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp --- 262,266 ---- app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp *************** *** 280,284 **** app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp --- 280,284 ---- app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp *************** *** 286,290 **** app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --- 286,290 ---- app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) |
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:53:51
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked with fixed bakefile: WX_DEBUG and WX_UNICODE options should now disappear Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.vc 11 Dec 2006 00:08:18 -0000 1.54 --- makefile.vc 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 156,160 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 147,151 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 211,224 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_dll !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif --- 202,215 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_dll !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif *************** *** 283,382 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib --- 274,373 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib *************** *** 385,397 **** __WXLIBPATH_FILENAMES = \lib\vc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 376,388 ---- __WXLIBPATH_FILENAMES = \lib\vc_dll !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif *************** *** 476,480 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 467,471 ---- msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 494,498 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 485,489 ---- msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.bcc 11 Dec 2006 00:08:18 -0000 1.54 --- makefile.bcc 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 185,189 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 175,179 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 240,253 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif --- 230,243 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif *************** *** 276,375 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 266,365 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib *************** *** 384,396 **** ____BUILD_4 = -v- !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 374,386 ---- ____BUILD_4 = -v- !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif *************** *** 481,485 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 471,475 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 490,494 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 480,484 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 508,512 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 498,502 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i..\..\..\modules\wxbind\setup $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 514,517 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 504,507 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.wat 11 Dec 2006 00:08:19 -0000 1.55 --- makefile.wat 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 111,115 **** WX3RDPARTYLIBPOSTFIX = ! !ifeq WX_DEBUG 1 WX3RDPARTYLIBPOSTFIX = d !endif --- 102,106 ---- WX3RDPARTYLIBPOSTFIX = ! !ifeq BUILD debug WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 218,457 **** !endif __WXLIB_XRC_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif __WXLIB_BASE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq WX_UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq WX_DEBUG 1 __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif --- 209,448 ---- !endif __WXLIB_XRC_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif __WXLIB_BASE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq BUILD debug __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif *************** *** 471,489 **** !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### --- 462,480 ---- !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ### Variables: ### *************** *** 634,638 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp --- 625,629 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp *************** *** 643,647 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp --- 634,638 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp *************** *** 661,665 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp --- 652,656 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. -i=..\..\..\modules\wxbind\setup $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 667,670 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< --- 658,661 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.gcc 11 Dec 2006 00:08:18 -0000 1.55 --- makefile.gcc 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 44,47 ---- *************** *** 135,139 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) WX3RDPARTYLIBPOSTFIX = d endif --- 129,133 ---- ### Conditionally set variables: ### ! ifeq ($(BUILD),debug) WX3RDPARTYLIBPOSTFIX = d endif *************** *** 196,209 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\gcc$(WXLIBPOSTFIX)_dll endif ! ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p_10 = --define _UNICODE endif ! ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p_10 = --define __WXDEBUG__ endif --- 190,203 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\gcc$(WXLIBPOSTFIX)_dll endif ! ifeq ($(UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(UNICODE),1) __WXUNICODE_DEFINE_p_10 = --define _UNICODE endif ! ifeq ($(BUILD),debug) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(BUILD),debug) __WXDEBUG_DEFINE_p_10 = --define __WXDEBUG__ endif *************** *** 238,462 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud endif endif --- 232,456 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d ! endif ! endif ! endif ! ifeq ($(BUILD),debug) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud ! endif ! endif ! endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif *************** *** 474,492 **** ____BUILD_8 = endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif --- 468,486 ---- ____BUILD_8 = endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif *************** *** 547,551 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 541,545 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 556,560 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp --- 550,554 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp *************** *** 574,578 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp --- 568,572 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. --include-dir ../../../modules/wxbind/setup mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp *************** *** 580,584 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean --- 574,578 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean |
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:53:51
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked with fixed bakefile: WX_DEBUG and WX_UNICODE options should now disappear Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.vc 11 Dec 2006 00:08:20 -0000 1.54 --- makefile.vc 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 394,398 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 385,389 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 454,484 **** __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif !if "$(SHARED)" == "0" ____SHARED = --- 445,475 ---- __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif !if "$(SHARED)" == "0" ____SHARED = *************** *** 529,628 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib --- 520,619 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.bcc 11 Dec 2006 00:08:19 -0000 1.55 --- makefile.bcc 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 391,395 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 381,385 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 451,481 **** __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif !if "$(SHARED)" == "0" ____SHARED = --- 441,471 ---- __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib ! !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif !if "$(SHARED)" == "0" ____SHARED = *************** *** 496,595 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 486,585 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.wat 11 Dec 2006 00:08:21 -0000 1.54 --- makefile.wat 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 102,106 **** WX3RDPARTYLIBPOSTFIX = ! !ifeq WX_DEBUG 1 WX3RDPARTYLIBPOSTFIX = d !endif --- 93,97 ---- WX3RDPARTYLIBPOSTFIX = ! !ifeq BUILD debug WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 191,246 **** !endif __WXLIB_MEDIA_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq WX_UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq WX_DEBUG 1 __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ____SHARED = !ifeq SHARED 0 --- 182,237 ---- !endif __WXLIB_MEDIA_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq BUILD debug __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ____SHARED = !ifeq SHARED 0 *************** *** 286,516 **** !endif __WXLIB_BASE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif __WXLIB_XRC_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif --- 277,507 ---- !endif __WXLIB_BASE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif __WXLIB_XRC_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.gcc 11 Dec 2006 00:08:19 -0000 1.55 --- makefile.gcc 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 44,47 ---- *************** *** 331,335 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) WX3RDPARTYLIBPOSTFIX = d endif --- 325,329 ---- ### Conditionally set variables: ### ! ifeq ($(BUILD),debug) WX3RDPARTYLIBPOSTFIX = d endif *************** *** 405,457 **** endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)_media endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)u_media endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)ud_media endif endif endif ! ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif ifeq ($(SHARED),0) ____SHARED = --- 399,451 ---- endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)ud_media endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)_media endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)u_media endif endif endif ! ifeq ($(UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(BUILD),debug) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif ifeq ($(SHARED),0) ____SHARED = *************** *** 478,705 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif ifeq ($(WX_SHARED),0) __WXLIBPATH_FILENAMES = \lib\gcc_lib --- 472,699 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) + __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc + endif + endif + endif ifeq ($(WX_SHARED),0) __WXLIBPATH_FILENAMES = \lib\gcc_lib |
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:52:40
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10927 Modified Files: wxhacks.bkl wxlua.bkl Log Message: fixed option renaming part of bakefiles: the WX_DEBUG and WX_UNICODE var definitions must go before the wxpresets Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxhacks.bkl 10 Dec 2006 00:47:22 -0000 1.17 --- wxhacks.bkl 12 Dec 2006 14:52:36 -0000 1.18 *************** *** 55,58 **** --- 55,95 ---- + + <!-- Rename WX_DEBUG and WX_UNICODE options to BUILD and UNICODE respectively + + VERY IMPORTANT: this block of code needs to go _before_ including wxpresets + otherwise WX_DEBUG and WX_UNICODE options will still be + declared by wxpresets resulting in a mess. + --> + + <if cond="FORMAT!='autoconf' and FORMAT!='msvc6prj'"> + + <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> + <set var="WX_DEBUG"> + <if cond="BUILD=='debug'">1</if> + <if cond="BUILD=='release'">0</if> + </set> + + <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> + <set var="WX_UNICODE"> + <if cond="UNICODE=='1'">1</if> + <if cond="UNICODE=='0'">0</if> + </set> + + <echo>defined stuff: $(isdefined('WX_DEBUG'))</echo> + </if> + + <!-- Unlike DEBUG and UNICODE options, you can build your program as shared --> + <!-- against a static build of wxWidgets. SHARED and WX_SHARED options --> + <!-- allows you to do it. --> + <!-- E.g.: --> + <!-- nmake -fmakefile.vc SHARED=0 WX_SHARED=1 --> + <!-- ./configure - -disable-shared - -with-wxshared --> + <!-- builds in static mode against a shared build of wxWidgets. --> + <!-- Thus we won't define WX_SHARED to a simple redirection to SHARED; we --> + <!-- will allow wxpresets to define it as another, indipendent option. --> + + + <!-- This bakefile provides a lot of wxWidgets-specific settings --> <include file="presets/wx.bkl" once="1"/> *************** *** 227,258 **** - <!-- Rename WX_DEBUG and WX_UNICODE options to BUILD and UNICODE respectively --> - - <if cond="FORMAT!='autoconf' and FORMAT!='msvc6prj'"> - - <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> - <set var="WX_DEBUG"> - <if cond="BUILD=='debug'">1</if> - <if cond="BUILD=='release'">0</if> - </set> - - <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> - <set var="WX_UNICODE"> - <if cond="UNICODE=='1'">1</if> - <if cond="UNICODE=='0'">0</if> - </set> - </if> - - <!-- Unlike DEBUG and UNICODE options, you can build your program as shared --> - <!-- against a static build of wxWidgets. This option allows you to do it. --> - <!-- E.g.: --> - <!-- nmake -fmakefile.vc SHARED=0 WX_SHARED=1 --> - <!-- ./configure - -disable-shared - -with-wxshared --> - <!-- builds in static mode against a shared build of wxWidgets. --> - <!-- Thus we won't define WX_SHARED to a simple redirection to SHARED; we --> - <!-- will allow wxpresets to define it as another, indipendent option. --> - - - <!-- Combine with 'wx' or 'wx-lib' templates (which are defined in wxpresets) --- 264,267 ---- Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxlua.bkl 11 Dec 2006 00:08:19 -0000 1.28 --- wxlua.bkl 12 Dec 2006 14:52:36 -0000 1.29 *************** *** 182,186 **** <!-- uses UPX to compress the final EXEs ! (which should have been compiled with WX_DEBUG=0 !) --> <command>cd ..\..\bin</command> <command>upx -9 --force *.exe</command> --- 182,186 ---- <!-- uses UPX to compress the final EXEs ! (which should have been compiled with BUILD=release !) --> <command>cd ..\..\bin</command> <command>upx -9 --force *.exe</command> |
|
From: John L. <jr...@us...> - 2006-12-12 07:10:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxbind.h 7 Dec 2006 06:32:42 -0000 1.43 --- wxbind.h 12 Dec 2006 07:09:39 -0000 1.44 *************** *** 1422,2587 **** #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxExtHelpController_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxExtHelpController_methodCount; #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToolBarSimple_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolBarSimple_methodCount; #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) [...2303 lines suppressed...] extern WXDLLIMPEXP_DATA_WXBIND(int) wxStreamBase_methodCount; #endif // wxUSE_STREAMS #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPasswordEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPasswordEntryDialog_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTextEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTextEntryDialog_methodCount; #endif // wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizard_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount; #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard |
|
From: John L. <jr...@us...> - 2006-12-12 07:10:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wx_rules.lua 11 Dec 2006 23:25:03 -0000 1.25 --- wx_rules.lua 12 Dec 2006 07:09:39 -0000 1.26 *************** *** 272,285 **** wxLuaState wxLS(wxlState); wxCHECK_RET(wxLS.Ok(), wxT("Invalid wxLuaState")); - // register wxNull if (registerTypes) ! { ! wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull = wxLS.tnewtag(); ! } ! wxLua_lua_push_wxLuaNull(wxLS.GetLuaState()); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull); ! lua_rawset(wxLS.GetLuaState(), luaTable); ]] --- 272,286 ---- wxLuaState wxLS(wxlState); wxCHECK_RET(wxLS.Ok(), wxT("Invalid wxLuaState")); + lua_State* L = wxLS.GetLuaState(); if (registerTypes) ! wxLS.GetLuaStateData()->m_wxluatag_NULL = wxLS.tnewtag(); ! lua_pushlstring(L, "wxNull", 6); // backwards compatibility ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxluatag_NULL); ! lua_rawset(L, luaTable); ! lua_pushlstring(L, "NULL", 4); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxluatag_NULL); ! lua_rawset(L, luaTable); ]] |
|
From: John L. <jr...@us...> - 2006-12-12 07:10:12
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/bindings Modified Files: genwxbind.lua Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** genwxbind.lua 7 Dec 2006 06:32:41 -0000 1.86 --- genwxbind.lua 12 Dec 2006 07:09:38 -0000 1.87 *************** *** 3865,3869 **** { ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition --- 3865,3869 ---- { ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition *************** *** 4313,4317 **** table.insert(fileData, " wxCHECK_MSG(wxlState.Ok(), false, wxT(\"Invalid wxLuaState\"));\n") table.insert(fileData, "\n") ! table.insert(fileData, " wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered);\n") table.insert(fileData, " wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_cpp_namespace.."\")));\n") table.insert(fileData, "\n") --- 4313,4317 ---- table.insert(fileData, " wxCHECK_MSG(wxlState.Ok(), false, wxT(\"Invalid wxLuaState\"));\n") table.insert(fileData, "\n") ! table.insert(fileData, " wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered);\n") table.insert(fileData, " wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_cpp_namespace.."\")));\n") table.insert(fileData, "\n") *************** *** 4320,4324 **** table.insert(fileData, " return false;\n") table.insert(fileData, "\n") ! table.insert(fileData, " wxlState.GetLuaStateData()->m_bindings.Append(new "..hook_cpp_binding_classname.."());\n") table.insert(fileData, "\n") table.insert(fileData, " return true;\n") --- 4320,4324 ---- table.insert(fileData, " return false;\n") table.insert(fileData, "\n") ! table.insert(fileData, " wxlState.GetLuaStateData()->m_bindingList.Append(new "..hook_cpp_binding_classname.."());\n") table.insert(fileData, "\n") table.insert(fileData, " return true;\n") *************** *** 4796,4800 **** end ! table.insert(fileData, "static WXLUAMETHOD s_"..MakeClassVar(ObjectName).."_methods[] = {\n") for condition, BindTableList in pairs_sort(BindTable) do --- 4796,4800 ---- end ! table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n") for condition, BindTableList in pairs_sort(BindTable) do *************** *** 4819,4828 **** table.insert(fileData, "};\n\n") ! if comment_cpp_binding_code then ! table.insert(fileData, "// Extern accessor to class method map\n") ! end ! ! table.insert(fileData, "WXLUAMETHOD* "..MakeVar(ObjectName).."_methods = s_"..MakeClassVar(ObjectName).."_methods;\n") ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof(s_"..MakeClassVar(ObjectName).."_methods)/sizeof(s_"..MakeClassVar(ObjectName).."_methods[0]);\n") if object.Condition then --- 4819,4824 ---- table.insert(fileData, "};\n\n") ! -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof("..MakeClassVar(ObjectName).."_methods[0]);\n") if object.Condition then |
|
From: John L. <jr...@us...> - 2006-12-12 07:10:11
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** editor.h 11 Dec 2006 07:03:29 -0000 1.31 --- editor.h 12 Dec 2006 07:09:37 -0000 1.32 *************** *** 9,2112 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 80125; ! const unsigned char wxLuaEditor[80126] = { ! 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 13, 10, ! 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 13, 10, ! 45, 45, 32, 80,117,114,112,111,115,101, 58, 32, 32, 32, 32, 32,119,120, 76,117, 97, 32, 73, 68, 69, 13, 10, ! 45, 45, 32, 65,117,116,104,111,114, 58, 32, 32, 32, 32, 32, 32, 74, 32, 87,105,110,119,111,111,100, 13, 10, ! 45, 45, 32, 67,114,101, 97,116,101,100, 58, 32, 32, 32, 32, 32, 77, 97,114, 99,104, 32, 50, 48, 48, 50, 13, 10, ! 45, 45, 32, 67,111,112,121,114,105,103,104,116, 58, 32, 32, 32, 40, 99, 41, 32, 50, 48, 48, 50, 45, 53, 32, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 46, 32, 65,108,108, 32,114,105,103,104,116,115, 32,114,101,115,101,114,118,101,100, 46, 13, 10, [...4179 lines suppressed...] ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 78, 97,109,101, 32,126, 61, 32, 34, 45, 45, 34, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,110,105,108, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, ! 32, 32, 32, 32,101,108,115,101, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34,117,110,116,105,116,108,101,100, 46,108,117, 97, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 101,108,115,101, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34,117,110,116,105,116,108,101,100, 46,108,117, 97, 34, 41, 10, ! 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 10, ! 101,110,100, 10, ! 10, ! 45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 10, ! 102,114, 97,109,101, 58, 83,104,111,119, 40,116,114,117,101, 41, 10, 0 }; |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** xml.cpp 9 Jun 2006 22:51:34 -0000 1.14 --- xml.cpp 12 Dec 2006 07:09:41 -0000 1.15 *************** *** 485,489 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXmlNode_methods[] = { { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, --- 485,489 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXmlNode_methods[] = { { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, *************** *** 530,536 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXmlNode_methods = s_wxXmlNode_methods; ! int wxXmlNode_methodCount = sizeof(s_wxXmlNode_methods)/sizeof(s_wxXmlNode_methods[0]); #endif // wxLUA_USE_wxXMLResource --- 530,534 ---- }; ! int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]); #endif // wxLUA_USE_wxXMLResource *************** *** 697,701 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXmlProperty_methods[] = { { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, 0 } }, { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, { 0 } }, --- 695,699 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXmlProperty_methods[] = { { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, 0 } }, { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, { 0 } }, *************** *** 716,722 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXmlProperty_methods = s_wxXmlProperty_methods; ! int wxXmlProperty_methodCount = sizeof(s_wxXmlProperty_methods)/sizeof(s_wxXmlProperty_methods[0]); #endif // wxLUA_USE_wxXMLResource --- 714,718 ---- }; ! int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]); #endif // wxLUA_USE_wxXMLResource *************** *** 936,940 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXmlDocument_methods[] = { { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, --- 932,936 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXmlDocument_methods[] = { { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, *************** *** 958,964 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXmlDocument_methods = s_wxXmlDocument_methods; ! int wxXmlDocument_methodCount = sizeof(s_wxXmlDocument_methods)/sizeof(s_wxXmlDocument_methods[0]); #endif // wxLUA_USE_wxXMLResource --- 954,958 ---- }; ! int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]); #endif // wxLUA_USE_wxXMLResource *************** *** 982,992 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXmlResourceHandler_methods[] = { { LuaDelete, "wxXmlResourceHandler", wxLua_wxXmlResourceHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXmlResourceHandler_methods = s_wxXmlResourceHandler_methods; ! int wxXmlResourceHandler_methodCount = sizeof(s_wxXmlResourceHandler_methods)/sizeof(s_wxXmlResourceHandler_methods[0]); #endif // wxLUA_USE_wxXMLResource --- 976,984 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXmlResourceHandler_methods[] = { { LuaDelete, "wxXmlResourceHandler", wxLua_wxXmlResourceHandler_destructor, 0, 0, {0} }, }; ! int wxXmlResourceHandler_methodCount = sizeof(wxXmlResourceHandler_methods)/sizeof(wxXmlResourceHandler_methods[0]); #endif // wxLUA_USE_wxXMLResource *************** *** 1565,1569 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXmlResource_methods[] = { #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) --- 1557,1561 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXmlResource_methods[] = { #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) *************** *** 1624,1630 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXmlResource_methods = s_wxXmlResource_methods; ! int wxXmlResource_methodCount = sizeof(s_wxXmlResource_methods)/sizeof(s_wxXmlResource_methods[0]); #endif // wxLUA_USE_wxXMLResource --- 1616,1620 ---- }; ! int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]); #endif // wxLUA_USE_wxXMLResource Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** defsutil.cpp 9 Jun 2006 22:51:31 -0000 1.18 --- defsutil.cpp 12 Dec 2006 07:09:39 -0000 1.19 *************** *** 308,312 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxProcess_methods[] = { #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) --- 308,312 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxProcess_methods[] = { #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 336,342 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; ! int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); #endif // wxLUA_USE_wxProcess --- 336,340 ---- }; ! int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]); #endif // wxLUA_USE_wxProcess *************** *** 671,675 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxMouseState_methods[] = { { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, { 0 } }, { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, { 0 } }, --- 669,673 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxMouseState_methods[] = { { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, { 0 } }, { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, { 0 } }, *************** *** 696,702 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxMouseState_methods = s_wxMouseState_methods; ! int wxMouseState_methodCount = sizeof(s_wxMouseState_methods)/sizeof(s_wxMouseState_methods[0]); #endif // wxCHECK_VERSION(2,7,0) --- 694,698 ---- }; ! int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]); #endif // wxCHECK_VERSION(2,7,0) *************** *** 766,770 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxBusyCursor_methods[] = { #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) --- 762,766 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxBusyCursor_methods[] = { #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) *************** *** 776,782 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; ! int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); #endif // wxLUA_USE_wxBusyCursor --- 772,776 ---- }; ! int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]); #endif // wxLUA_USE_wxBusyCursor *************** *** 841,845 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxBusyInfo_methods[] = { { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 } }, { LuaDelete, "wxBusyInfo", wxLua_wxBusyInfo_destructor, 0, 0, {0} }, --- 835,839 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxBusyInfo_methods[] = { { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 } }, { LuaDelete, "wxBusyInfo", wxLua_wxBusyInfo_destructor, 0, 0, {0} }, *************** *** 847,853 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; ! int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 841,845 ---- }; ! int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]); #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxlua.cpp 6 Nov 2006 06:11:44 -0000 1.21 --- wxlua.cpp 12 Dec 2006 07:09:41 -0000 1.22 *************** *** 63,74 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaState_methods[] = { { LuaDelete, "wxLuaState", wxLua_wxLuaState_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaState_methods = s_wxLuaState_methods; ! int wxLuaState_methodCount = sizeof(s_wxLuaState_methods)/sizeof(s_wxLuaState_methods[0]); // ------------------------------------------------------------------------------------------------- --- 63,72 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaState_methods[] = { { LuaDelete, "wxLuaState", wxLua_wxLuaState_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, {0} }, }; ! int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 202,206 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaObject_methods[] = { { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, { 0 } }, { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, { &s_wxluaarg_Number, 0 } }, --- 200,204 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaObject_methods[] = { { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, { 0 } }, { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, { &s_wxluaarg_Number, 0 } }, *************** *** 216,222 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaObject_methods = s_wxLuaObject_methods; ! int wxLuaObject_methodCount = sizeof(s_wxLuaObject_methods)/sizeof(s_wxLuaObject_methods[0]); --- 214,218 ---- }; ! int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaObject_methods[0]); *************** *** 318,322 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaPrintout_methods[] = { { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 } }, { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, { 0 } }, --- 314,318 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaPrintout_methods[] = { { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 } }, { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, { 0 } }, *************** *** 326,332 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaPrintout_methods = s_wxLuaPrintout_methods; ! int wxLuaPrintout_methodCount = sizeof(s_wxLuaPrintout_methods)/sizeof(s_wxLuaPrintout_methods[0]); #endif // wxLUA_USE_wxLuaPrintout --- 322,326 ---- }; ! int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]); #endif // wxLUA_USE_wxLuaPrintout *************** *** 385,389 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) --- 379,383 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) *************** *** 394,400 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaHtmlWindow_methods = s_wxLuaHtmlWindow_methods; ! int wxLuaHtmlWindow_methodCount = sizeof(s_wxLuaHtmlWindow_methods)/sizeof(s_wxLuaHtmlWindow_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow --- 388,392 ---- }; ! int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 503,507 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaHtmlWinTagEvent_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) --- 495,499 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) *************** *** 520,526 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods = s_wxLuaHtmlWinTagEvent_methods; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(s_wxLuaHtmlWinTagEvent_methods)/sizeof(s_wxLuaHtmlWinTagEvent_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow --- 512,516 ---- }; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(wxLuaHtmlWinTagEvent_methods)/sizeof(wxLuaHtmlWinTagEvent_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 590,594 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaTreeItemData_methods[] = { { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, { 0 } }, --- 580,584 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaTreeItemData_methods[] = { { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, { 0 } }, *************** *** 599,605 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaTreeItemData_methods = s_wxLuaTreeItemData_methods; ! int wxLuaTreeItemData_methodCount = sizeof(s_wxLuaTreeItemData_methods)/sizeof(s_wxLuaTreeItemData_methods[0]); #endif // wxLUA_USE_wxTreeCtrl --- 589,593 ---- }; ! int wxLuaTreeItemData_methodCount = sizeof(wxLuaTreeItemData_methods)/sizeof(wxLuaTreeItemData_methods[0]); #endif // wxLUA_USE_wxTreeCtrl Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** image.cpp 7 Dec 2006 06:32:43 -0000 1.18 --- image.cpp 12 Dec 2006 07:09:39 -0000 1.19 *************** *** 1424,1428 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxImage_methods[] = { #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) --- 1424,1428 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxImage_methods[] = { #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) *************** *** 1522,1528 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxImage_methods = s_wxImage_methods; ! int wxImage_methodCount = sizeof(s_wxImage_methods)/sizeof(s_wxImage_methods[0]); #endif // wxLUA_USE_wxImage --- 1522,1526 ---- }; ! int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]); #endif // wxLUA_USE_wxImage *************** *** 1747,1751 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxImageHandler_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) --- 1745,1749 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxImageHandler_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) *************** *** 1775,1781 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxImageHandler_methods = s_wxImageHandler_methods; ! int wxImageHandler_methodCount = sizeof(s_wxImageHandler_methods)/sizeof(s_wxImageHandler_methods[0]); #endif // wxLUA_USE_wxImage --- 1773,1777 ---- }; ! int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]); #endif // wxLUA_USE_wxImage *************** *** 1815,1826 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxBMPHandler_methods[] = { { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxBMPHandler", wxLua_wxBMPHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxBMPHandler_methods = s_wxBMPHandler_methods; ! int wxBMPHandler_methodCount = sizeof(s_wxBMPHandler_methods)/sizeof(s_wxBMPHandler_methods[0]); #endif // wxLUA_USE_wxImage --- 1811,1820 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxBMPHandler_methods[] = { { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxBMPHandler", wxLua_wxBMPHandler_destructor, 0, 0, {0} }, }; ! int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]); #endif // wxLUA_USE_wxImage *************** *** 1860,1871 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxICOHandler_methods[] = { { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxICOHandler", wxLua_wxICOHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxICOHandler_methods = s_wxICOHandler_methods; ! int wxICOHandler_methodCount = sizeof(s_wxICOHandler_methods)/sizeof(s_wxICOHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) --- 1854,1863 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxICOHandler_methods[] = { { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxICOHandler", wxLua_wxICOHandler_destructor, 0, 0, {0} }, }; ! int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1905,1916 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxCURHandler_methods[] = { { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxCURHandler", wxLua_wxCURHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxCURHandler_methods = s_wxCURHandler_methods; ! int wxCURHandler_methodCount = sizeof(s_wxCURHandler_methods)/sizeof(s_wxCURHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) --- 1897,1906 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxCURHandler_methods[] = { { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxCURHandler", wxLua_wxCURHandler_destructor, 0, 0, {0} }, }; ! int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1950,1961 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxANIHandler_methods[] = { { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxANIHandler", wxLua_wxANIHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxANIHandler_methods = s_wxANIHandler_methods; ! int wxANIHandler_methodCount = sizeof(s_wxANIHandler_methods)/sizeof(s_wxANIHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) --- 1940,1949 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxANIHandler_methods[] = { { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxANIHandler", wxLua_wxANIHandler_destructor, 0, 0, {0} }, }; ! int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1995,2006 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxIFFHandler_methods[] = { { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxIFFHandler", wxLua_wxIFFHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxIFFHandler_methods = s_wxIFFHandler_methods; ! int wxIFFHandler_methodCount = sizeof(s_wxIFFHandler_methods)/sizeof(s_wxIFFHandler_methods[0]); #endif // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) --- 1983,1992 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxIFFHandler_methods[] = { { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxIFFHandler", wxLua_wxIFFHandler_destructor, 0, 0, {0} }, }; ! int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]); #endif // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) *************** *** 2040,2051 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGIFHandler_methods[] = { { LuaConstructor, "wxGIFHandler", wxLua_wxGIFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGIFHandler", wxLua_wxGIFHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGIFHandler_methods = s_wxGIFHandler_methods; ! int wxGIFHandler_methodCount = sizeof(s_wxGIFHandler_methods)/sizeof(s_wxGIFHandler_methods[0]); #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage) --- 2026,2035 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGIFHandler_methods[] = { { LuaConstructor, "wxGIFHandler", wxLua_wxGIFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGIFHandler", wxLua_wxGIFHandler_destructor, 0, 0, {0} }, }; ! int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]); #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage) *************** *** 2085,2096 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxJPEGHandler_methods[] = { { LuaConstructor, "wxJPEGHandler", wxLua_wxJPEGHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxJPEGHandler", wxLua_wxJPEGHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxJPEGHandler_methods = s_wxJPEGHandler_methods; ! int wxJPEGHandler_methodCount = sizeof(s_wxJPEGHandler_methods)/sizeof(s_wxJPEGHandler_methods[0]); #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) --- 2069,2078 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxJPEGHandler_methods[] = { { LuaConstructor, "wxJPEGHandler", wxLua_wxJPEGHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxJPEGHandler", wxLua_wxJPEGHandler_destructor, 0, 0, {0} }, }; ! int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]); #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) *************** *** 2130,2141 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxPCXHandler_methods[] = { { LuaConstructor, "wxPCXHandler", wxLua_wxPCXHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPCXHandler", wxLua_wxPCXHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxPCXHandler_methods = s_wxPCXHandler_methods; ! int wxPCXHandler_methodCount = sizeof(s_wxPCXHandler_methods)/sizeof(s_wxPCXHandler_methods[0]); #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage) --- 2112,2121 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxPCXHandler_methods[] = { { LuaConstructor, "wxPCXHandler", wxLua_wxPCXHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPCXHandler", wxLua_wxPCXHandler_destructor, 0, 0, {0} }, }; ! int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]); #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage) *************** *** 2175,2186 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxPNGHandler_methods[] = { { LuaConstructor, "wxPNGHandler", wxLua_wxPNGHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPNGHandler", wxLua_wxPNGHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxPNGHandler_methods = s_wxPNGHandler_methods; ! int wxPNGHandler_methodCount = sizeof(s_wxPNGHandler_methods)/sizeof(s_wxPNGHandler_methods[0]); #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) --- 2155,2164 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxPNGHandler_methods[] = { { LuaConstructor, "wxPNGHandler", wxLua_wxPNGHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPNGHandler", wxLua_wxPNGHandler_destructor, 0, 0, {0} }, }; ! int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]); #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) *************** *** 2220,2231 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxPNMHandler_methods[] = { { LuaConstructor, "wxPNMHandler", wxLua_wxPNMHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPNMHandler", wxLua_wxPNMHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxPNMHandler_methods = s_wxPNMHandler_methods; ! int wxPNMHandler_methodCount = sizeof(s_wxPNMHandler_methods)/sizeof(s_wxPNMHandler_methods[0]); #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage) --- 2198,2207 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxPNMHandler_methods[] = { { LuaConstructor, "wxPNMHandler", wxLua_wxPNMHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxPNMHandler", wxLua_wxPNMHandler_destructor, 0, 0, {0} }, }; ! int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]); #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage) *************** *** 2265,2276 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxTIFFHandler_methods[] = { { LuaConstructor, "wxTIFFHandler", wxLua_wxTIFFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxTIFFHandler", wxLua_wxTIFFHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxTIFFHandler_methods = s_wxTIFFHandler_methods; ! int wxTIFFHandler_methodCount = sizeof(s_wxTIFFHandler_methods)/sizeof(s_wxTIFFHandler_methods[0]); #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) --- 2241,2250 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxTIFFHandler_methods[] = { { LuaConstructor, "wxTIFFHandler", wxLua_wxTIFFHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxTIFFHandler", wxLua_wxTIFFHandler_destructor, 0, 0, {0} }, }; ! int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]); #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) *************** *** 2310,2321 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxXPMHandler_methods[] = { { LuaConstructor, "wxXPMHandler", wxLua_wxXPMHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxXPMHandler", wxLua_wxXPMHandler_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxXPMHandler_methods = s_wxXPMHandler_methods; ! int wxXPMHandler_methodCount = sizeof(s_wxXPMHandler_methods)/sizeof(s_wxXPMHandler_methods[0]); #endif // wxLUA_USE_wxImage --- 2284,2293 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxXPMHandler_methods[] = { { LuaConstructor, "wxXPMHandler", wxLua_wxXPMHandler_constructor, 0, 0, { 0 } }, { LuaDelete, "wxXPMHandler", wxLua_wxXPMHandler_destructor, 0, 0, {0} }, }; ! int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]); #endif // wxLUA_USE_wxImage *************** *** 2421,2425 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxArtProvider_methods[] = { #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) --- 2393,2397 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxArtProvider_methods[] = { #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2440,2446 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxArtProvider_methods = s_wxArtProvider_methods; ! int wxArtProvider_methodCount = sizeof(s_wxArtProvider_methods)/sizeof(s_wxArtProvider_methods[0]); #endif // wxLUA_USE_wxArtProvider --- 2412,2416 ---- }; ! int wxArtProvider_methodCount = sizeof(wxArtProvider_methods)/sizeof(wxArtProvider_methods[0]); #endif // wxLUA_USE_wxArtProvider Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mdi.cpp 7 Dec 2006 06:32:43 -0000 1.17 --- mdi.cpp 12 Dec 2006 07:09:39 -0000 1.18 *************** *** 45,55 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxMDIClientWindow_methods[] = { { LuaDelete, "wxMDIClientWindow", wxLua_wxMDIClientWindow_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxMDIClientWindow_methods = s_wxMDIClientWindow_methods; ! int wxMDIClientWindow_methodCount = sizeof(s_wxMDIClientWindow_methods)/sizeof(s_wxMDIClientWindow_methods[0]); #endif // wxLUA_USE_MDI --- 45,53 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxMDIClientWindow_methods[] = { { LuaDelete, "wxMDIClientWindow", wxLua_wxMDIClientWindow_destructor, 0, 0, {0} }, }; ! int wxMDIClientWindow_methodCount = sizeof(wxMDIClientWindow_methods)/sizeof(wxMDIClientWindow_methods[0]); #endif // wxLUA_USE_MDI *************** *** 332,336 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxMDIParentFrame_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) --- 330,334 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxMDIParentFrame_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) *************** *** 369,375 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxMDIParentFrame_methods = s_wxMDIParentFrame_methods; ! int wxMDIParentFrame_methodCount = sizeof(s_wxMDIParentFrame_methods)/sizeof(s_wxMDIParentFrame_methods[0]); #endif // wxLUA_USE_MDI --- 367,371 ---- }; ! int wxMDIParentFrame_methodCount = sizeof(wxMDIParentFrame_methods)/sizeof(wxMDIParentFrame_methods[0]); #endif // wxLUA_USE_MDI *************** *** 516,520 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxMDIChildFrame_methods[] = { #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) --- 512,516 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxMDIChildFrame_methods[] = { #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) *************** *** 534,540 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxMDIChildFrame_methods = s_wxMDIChildFrame_methods; ! int wxMDIChildFrame_methodCount = sizeof(s_wxMDIChildFrame_methods)/sizeof(s_wxMDIChildFrame_methods[0]); #endif // wxLUA_USE_MDI --- 530,534 ---- }; ! int wxMDIChildFrame_methodCount = sizeof(wxMDIChildFrame_methods)/sizeof(wxMDIChildFrame_methods[0]); #endif // wxLUA_USE_MDI *************** *** 656,660 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxDocChildFrame_methods[] = { #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) --- 650,654 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxDocChildFrame_methods[] = { #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) *************** *** 671,677 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxDocChildFrame_methods = s_wxDocChildFrame_methods; ! int wxDocChildFrame_methodCount = sizeof(s_wxDocChildFrame_methods)/sizeof(s_wxDocChildFrame_methods[0]); #endif // wxLUA_USE_MDI --- 665,669 ---- }; ! int wxDocChildFrame_methodCount = sizeof(wxDocChildFrame_methods)/sizeof(wxDocChildFrame_methods[0]); #endif // wxLUA_USE_MDI *************** *** 1323,1327 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxDocManager_methods[] = { #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) --- 1315,1319 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxDocManager_methods[] = { #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 1402,1408 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxDocManager_methods = s_wxDocManager_methods; ! int wxDocManager_methodCount = sizeof(s_wxDocManager_methods)/sizeof(s_wxDocManager_methods[0]); #endif // wxLUA_USE_MDI --- 1394,1398 ---- }; ! int wxDocManager_methodCount = sizeof(wxDocManager_methods)/sizeof(wxDocManager_methods[0]); #endif // wxLUA_USE_MDI *************** *** 1464,1468 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxDocParentFrame_methods[] = { #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) --- 1454,1458 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxDocParentFrame_methods[] = { #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) *************** *** 1473,1479 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxDocParentFrame_methods = s_wxDocParentFrame_methods; ! int wxDocParentFrame_methodCount = sizeof(s_wxDocParentFrame_methods)/sizeof(s_wxDocParentFrame_methods[0]); #endif // wxLUA_USE_MDI --- 1463,1467 ---- }; ! int wxDocParentFrame_methodCount = sizeof(wxDocParentFrame_methods)/sizeof(wxDocParentFrame_methods[0]); #endif // wxLUA_USE_MDI *************** *** 1823,1827 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxDocTemplate_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) --- 1811,1815 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxDocTemplate_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) *************** *** 1862,1868 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxDocTemplate_methods = s_wxDocTemplate_methods; ! int wxDocTemplate_methodCount = sizeof(s_wxDocTemplate_methods)/sizeof(s_wxDocTemplate_methods[0]); #endif // wxLUA_USE_MDI --- 1850,1854 ---- }; ! int wxDocTemplate_methodCount = sizeof(wxDocTemplate_methods)/sizeof(wxDocTemplate_methods[0]); #endif // wxLUA_USE_MDI *************** *** 2407,2411 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxDocument_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) --- 2393,2397 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxDocument_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) *************** *** 2464,2470 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxDocument_methods = s_wxDocument_methods; ! int wxDocument_methodCount = sizeof(s_wxDocument_methods)/sizeof(s_wxDocument_methods[0]); #endif // wxLUA_USE_MDI --- 2450,2454 ---- }; ! int wxDocument_methodCount = sizeof(wxDocument_methods)/sizeof(wxDocument_methods[0]); #endif // wxLUA_USE_MDI *************** *** 2732,2736 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxView_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) --- 2716,2720 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxView_methods[] = { #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) *************** *** 2769,2775 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxView_methods = s_wxView_methods; ! int wxView_methodCount = sizeof(s_wxView_methods)/sizeof(s_wxView_methods[0]); #endif // wxLUA_USE_MDI --- 2753,2757 ---- }; ! int wxView_methodCount = sizeof(wxView_methods)/sizeof(wxView_methods[0]); #endif // wxLUA_USE_MDI *************** *** 3143,3147 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxCommandProcessor_methods[] = { #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) --- 3125,3129 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxCommandProcessor_methods[] = { #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) *************** *** 3178,3184 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxCommandProcessor_methods = s_wxCommandProcessor_methods; ! int wxCommandProcessor_methodCount = sizeof(s_wxCommandProcessor_methods)/sizeof(s_wxCommandProcessor_methods[0]); #endif // wxLUA_USE_wxCommandProcessor --- 3160,3164 ---- }; ! int wxCommandProcessor_methodCount = sizeof(wxCommandProcessor_methods)/sizeof(wxCommandProcessor_methods[0]); #endif // wxLUA_USE_wxCommandProcessor *************** *** 3262,3266 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxCommand_methods[] = { { LuaMethod, "CanUndo", wxLua_wxCommand_CanUndo, 0, 0, { 0 } }, { LuaMethod, "Do", wxLua_wxCommand_Do, 0, 0, { 0 } }, --- 3242,3246 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxCommand_methods[] = { { LuaMethod, "CanUndo", wxLua_wxCommand_CanUndo, 0, 0, { 0 } }, { LuaMethod, "Do", wxLua_wxCommand_Do, 0, 0, { 0 } }, *************** *** 3270,3276 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxCommand_methods = s_wxCommand_methods; ! int wxCommand_methodCount = sizeof(s_wxCommand_methods)/sizeof(s_wxCommand_methods[0]); #endif // wxLUA_USE_wxCommandProcessor --- 3250,3254 ---- }; ! int wxCommand_methodCount = sizeof(wxCommand_methods)/sizeof(wxCommand_methods[0]); #endif // wxLUA_USE_wxCommandProcessor *************** *** 3481,3485 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxFileHistory_methods[] = { #if (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) --- 3459,3463 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxFileHistory_methods[] = { #if (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) *************** *** 3505,3511 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxFileHistory_methods = s_wxFileHistory_methods; ! int wxFileHistory_methodCount = sizeof(s_wxFileHistory_methods)/sizeof(s_wxFileHistory_methods[0]); #endif // wxLUA_USE_wxFileHistory --- 3483,3487 ---- }; ! int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]); #endif // wxLUA_USE_wxFileHistory Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** config.cpp 9 Jun 2006 22:51:31 -0000 1.20 --- config.cpp 12 Dec 2006 07:09:39 -0000 1.21 *************** *** 719,723 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxConfigBase_methods[] = { { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaConstructor, "wxConfigCreate", wxLua_wxConfigCreate_constructor, 0, 0, { 0 } }, --- 719,723 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxConfigBase_methods[] = { { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaConstructor, "wxConfigCreate", wxLua_wxConfigCreate_constructor, 0, 0, { 0 } }, *************** *** 764,770 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxConfigBase_methods = s_wxConfigBase_methods; ! int wxConfigBase_methodCount = sizeof(s_wxConfigBase_methods)/sizeof(s_wxConfigBase_methods[0]); #endif // wxLUA_USE_wxConfig --- 764,768 ---- }; ! int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]); #endif // wxLUA_USE_wxConfig *************** *** 813,824 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxConfig_methods[] = { { LuaConstructor, "wxConfig", wxLua_wxConfig_constructor, 5, 0, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxConfig", wxLua_wxConfig_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxConfig_methods = s_wxConfig_methods; ! int wxConfig_methodCount = sizeof(s_wxConfig_methods)/sizeof(s_wxConfig_methods[0]); #endif // wxLUA_USE_wxConfig --- 811,820 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxConfig_methods[] = { { LuaConstructor, "wxConfig", wxLua_wxConfig_constructor, 5, 0, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxConfig", wxLua_wxConfig_destructor, 0, 0, {0} }, }; ! int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]); #endif // wxLUA_USE_wxConfig *************** *** 881,885 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxFileConfig_methods[] = { { LuaConstructor, "wxFileConfig", wxLua_wxFileConfig_constructor, 5, 0, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetUmask", wxLua_wxFileConfig_SetUmask, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 877,881 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxFileConfig_methods[] = { { LuaConstructor, "wxFileConfig", wxLua_wxFileConfig_constructor, 5, 0, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetUmask", wxLua_wxFileConfig_SetUmask, 1, 1, { &s_wxluaarg_Number, 0 } }, *************** *** 887,893 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxFileConfig_methods = s_wxFileConfig_methods; ! int wxFileConfig_methodCount = sizeof(s_wxFileConfig_methods)/sizeof(s_wxFileConfig_methods[0]); #endif // wxLUA_USE_wxConfig --- 883,887 ---- }; ! int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]); #endif // wxLUA_USE_wxConfig Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** grid.cpp 7 Dec 2006 06:32:43 -0000 1.18 --- grid.cpp 12 Dec 2006 07:09:39 -0000 1.19 *************** *** 83,87 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellWorker_methods[] = { { LuaMethod, "IncRef", wxLua_wxGridCellWorker_IncRef, 0, 0, { 0 } }, { LuaMethod, "DecRef", wxLua_wxGridCellWorker_DecRef, 0, 0, { 0 } }, --- 83,87 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellWorker_methods[] = { { LuaMethod, "IncRef", wxLua_wxGridCellWorker_IncRef, 0, 0, { 0 } }, { LuaMethod, "DecRef", wxLua_wxGridCellWorker_DecRef, 0, 0, { 0 } }, *************** *** 90,96 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellWorker_methods = s_wxGridCellWorker_methods; ! int wxGridCellWorker_methodCount = sizeof(s_wxGridCellWorker_methods)/sizeof(s_wxGridCellWorker_methods[0]); #endif // wxLUA_USE_wxGrid --- 90,94 ---- }; ! int wxGridCellWorker_methodCount = sizeof(wxGridCellWorker_methods)/sizeof(wxGridCellWorker_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 146,150 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellRenderer_methods[] = { #if ((wxLUA_USE_wxGrid) && (wxLUA_USE_wxDC)) && (wxLUA_USE_wxPointSizeRect) --- 144,148 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellRenderer_methods[] = { #if ((wxLUA_USE_wxGrid) && (wxLUA_USE_wxDC)) && (wxLUA_USE_wxPointSizeRect) *************** *** 155,161 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellRenderer_methods = s_wxGridCellRenderer_methods; ! int wxGridCellRenderer_methodCount = sizeof(s_wxGridCellRenderer_methods)/sizeof(s_wxGridCellRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 153,157 ---- }; ! int wxGridCellRenderer_methodCount = sizeof(wxGridCellRenderer_methods)/sizeof(wxGridCellRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 192,203 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellStringRenderer_methods[] = { { LuaConstructor, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellStringRenderer_methods = s_wxGridCellStringRenderer_methods; ! int wxGridCellStringRenderer_methodCount = sizeof(s_wxGridCellStringRenderer_methods)/sizeof(s_wxGridCellStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 188,197 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellStringRenderer_methods[] = { { LuaConstructor, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellStringRenderer_methodCount = sizeof(wxGridCellStringRenderer_methods)/sizeof(wxGridCellStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 234,245 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellNumberRenderer_methods[] = { { LuaConstructor, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellNumberRenderer_methods = s_wxGridCellNumberRenderer_methods; ! int wxGridCellNumberRenderer_methodCount = sizeof(s_wxGridCellNumberRenderer_methods)/sizeof(s_wxGridCellNumberRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 228,237 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellNumberRenderer_methods[] = { { LuaConstructor, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellNumberRenderer_methodCount = sizeof(wxGridCellNumberRenderer_methods)/sizeof(wxGridCellNumberRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 340,344 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellFloatRenderer_methods[] = { { LuaConstructor, "wxGridCellFloatRenderer", wxLua_wxGridCellFloatRenderer_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetWidth", wxLua_wxGridCellFloatRenderer_GetWidth, 0, 0, { 0 } }, --- 332,336 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellFloatRenderer_methods[] = { { LuaConstructor, "wxGridCellFloatRenderer", wxLua_wxGridCellFloatRenderer_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetWidth", wxLua_wxGridCellFloatRenderer_GetWidth, 0, 0, { 0 } }, *************** *** 353,359 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellFloatRenderer_methods = s_wxGridCellFloatRenderer_methods; ! int wxGridCellFloatRenderer_methodCount = sizeof(s_wxGridCellFloatRenderer_methods)/sizeof(s_wxGridCellFloatRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 345,349 ---- }; ! int wxGridCellFloatRenderer_methodCount = sizeof(wxGridCellFloatRenderer_methods)/sizeof(wxGridCellFloatRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 390,401 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellBoolRenderer_methods[] = { { LuaConstructor, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellBoolRenderer_methods = s_wxGridCellBoolRenderer_methods; ! int wxGridCellBoolRenderer_methodCount = sizeof(s_wxGridCellBoolRenderer_methods)/sizeof(s_wxGridCellBoolRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 380,389 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellBoolRenderer_methods[] = { { LuaConstructor, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellBoolRenderer_methodCount = sizeof(wxGridCellBoolRenderer_methods)/sizeof(wxGridCellBoolRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 438,449 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellDateTimeRenderer_methods[] = { { LuaConstructor, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_constructor, 2, 0, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaDelete, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellDateTimeRenderer_methods = s_wxGridCellDateTimeRenderer_methods; ! int wxGridCellDateTimeRenderer_methodCount = sizeof(s_wxGridCellDateTimeRenderer_methods)/sizeof(s_wxGridCellDateTimeRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 426,435 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellDateTimeRenderer_methods[] = { { LuaConstructor, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_constructor, 2, 0, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaDelete, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellDateTimeRenderer_methodCount = sizeof(wxGridCellDateTimeRenderer_methods)/sizeof(wxGridCellDateTimeRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 484,495 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellEnumRenderer_methods[] = { { LuaConstructor, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_constructor, 1, 0, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellEnumRenderer_methods = s_wxGridCellEnumRenderer_methods; ! int wxGridCellEnumRenderer_methodCount = sizeof(s_wxGridCellEnumRenderer_methods)/sizeof(s_wxGridCellEnumRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 470,479 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellEnumRenderer_methods[] = { { LuaConstructor, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_constructor, 1, 0, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellEnumRenderer_methodCount = sizeof(wxGridCellEnumRenderer_methods)/sizeof(wxGridCellEnumRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 526,537 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellAutoWrapStringRenderer_methods[] = { { LuaConstructor, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellAutoWrapStringRenderer_methods = s_wxGridCellAutoWrapStringRenderer_methods; ! int wxGridCellAutoWrapStringRenderer_methodCount = sizeof(s_wxGridCellAutoWrapStringRenderer_methods)/sizeof(s_wxGridCellAutoWrapStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid --- 510,519 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellAutoWrapStringRenderer_methods[] = { { LuaConstructor, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_destructor, 0, 0, {0} }, }; ! int wxGridCellAutoWrapStringRenderer_methodCount = sizeof(wxGridCellAutoWrapStringRenderer_methods)/sizeof(wxGridCellAutoWrapStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 818,822 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellEditor_methods[] = { #if (wxLUA_USE_wxGrid) && (wxLUA_USE_wxPointSizeRect) --- 800,804 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellEditor_methods[] = { #if (wxLUA_USE_wxGrid) && (wxLUA_USE_wxPointSizeRect) *************** *** 843,849 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellEditor_methods = s_wxGridCellEditor_methods; ! int wxGridCellEditor_methodCount = sizeof(s_wxGridCellEditor_methods)/sizeof(s_wxGridCellEditor_methods[0]); #endif // wxLUA_USE_wxGrid --- 825,829 ---- }; ! int wxGridCellEditor_methodCount = sizeof(wxGridCellEditor_methods)/sizeof(wxGridCellEditor_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 880,891 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellTextEditor_methods[] = { { LuaConstructor, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellTextEditor_methods = s_wxGridCellTextEditor_methods; ! int wxGridCellTextEditor_methodCount = sizeof(s_wxGridCellTextEditor_methods)/sizeof(s_wxGridCellTextEditor_methods[0]); #endif // wxLUA_USE_wxGrid --- 860,869 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellTextEditor_methods[] = { { LuaConstructor, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_constructor, 0, 0, { 0 } }, { LuaDelete, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_destructor, 0, 0, {0} }, }; ! int wxGridCellTextEditor_methodCount = sizeof(wxGridCellTextEditor_methods)/sizeof(wxGridCellTextEditor_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 928,939 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellNumberEditor_methods[] = { { LuaConstructor, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellNumberEditor_methods = s_wxGridCellNumberEditor_methods; ! int wxGridCellNumberEditor_methodCount = sizeof(s_wxGridCellNumberEditor_methods)/sizeof(s_wxGridCellNumberEditor_methods[0]); #endif // wxLUA_USE_wxGrid --- 906,915 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellNumberEditor_methods[] = { { LuaConstructor, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_destructor, 0, 0, {0} }, }; ! int wxGridCellNumberEditor_methodCount = sizeof(wxGridCellNumberEditor_methods)/sizeof(wxGridCellNumberEditor_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 976,987 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellFloatEditor_methods[] = { { LuaConstructor, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_destructor, 0, 0, {0} }, }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxGridCellFloatEditor_methods = s_wxGridCellFloatEditor_methods; ! int wxGridCellFloatEditor_methodCount = sizeof(s_wxGridCellFloatEditor_methods)/sizeof(s_wxGridCellFloatEditor_methods[0]); #endif // wxLUA_USE_wxGrid --- 952,961 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxGridCellFloatEditor_methods[] = { { LuaConstructor, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_destructor, 0, 0, {0} }, }; ! int wxGridCellFloatEditor_methodCount = sizeof(wxGridCellFloatEditor_methods)/sizeof(wxGridCellFloatEditor_methods[0]); #endif // wxLUA_USE_wxGrid *************** *** 1018,1029 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxGridCellBoolEditor_methods[] = { { LuaConstructor, "wxGridCellBoolEditor", wxLua_wxGridCellBoolEditor_constructor, 0, 0, { 0 } }, { ... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxlstate.h Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlcallb.h 12 Dec 2006 01:23:40 -0000 1.13 --- wxlcallb.h 12 Dec 2006 07:09:41 -0000 1.14 *************** *** 29,33 **** virtual ~wxLuaCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } --- 29,33 ---- virtual ~wxLuaCallback(); ! void ClearwxLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } *************** *** 76,80 **** virtual ~wxLuaDestroyCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } --- 76,80 ---- virtual ~wxLuaDestroyCallback(); ! void ClearwxLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlbind.h 12 Dec 2006 01:23:40 -0000 1.29 --- wxlbind.h 12 Dec 2006 07:09:41 -0000 1.30 *************** *** 360,368 **** WXLUAMETHOD* m_functionList; ! wxString m_nameSpace; // lua table namespace e.g. "wx" ! bool m_typesRegistered; // Is the binding registered ! int m_startTag; // The first wxLua allocated lua tag ! int m_lastTag; // The last wxLua lua tag of registered classes ! int m_wxLuaTable; // The lua tag for the wxLua private tables static wxLuaBindingList sm_bindingList; --- 360,368 ---- WXLUAMETHOD* m_functionList; ! wxString m_nameSpace; // lua table namespace e.g. "wx" ! bool m_bindings_registered; // Is the binding registered ! int m_startTag; // The first wxLua allocated lua tag ! int m_lastTag; // The last wxLua lua tag of registered classes ! int m_wxLuaTable; // The lua tag for the wxLua private tables static wxLuaBindingList sm_bindingList; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wxlstate.h 12 Dec 2006 01:23:40 -0000 1.55 --- wxlstate.h 12 Dec 2006 07:09:41 -0000 1.56 *************** *** 141,146 **** // Push the "wxLuaReferences" string onto the stack WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_push_wxLuaReferences(lua_State* L); - // push the "wxLuaNull" string onto the stack - WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_push_wxLuaNull(lua_State* L); // Helper functions to get numbers, booleans and strings safer --- 141,144 ---- *************** *** 151,155 **** WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isenumerationtype(lua_State* L, int stack_idx); WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isnumbertype(lua_State* L, int stack_idx); ! // After verifying using wxLua_lua_isXXXtype return the value WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int stack_idx); WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int stack_idx); --- 149,154 ---- WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isenumerationtype(lua_State* L, int stack_idx); WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isnumbertype(lua_State* L, int stack_idx); ! // After verifying using wxLua_lua_isXXXtype return the value, else calls ! // WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int stack_idx); WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int stack_idx); *************** *** 165,172 **** // Return a pointer to the array of wxStrings (you need to delete them) // and returns the number of strings in the array in count. ! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int stack_idx, int& count); // Adds the table at stack index to the wxArrayString // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarraystring(lua_State* L, int stack_idx, wxArrayString& strArray); // Convert the table at stack index to a "new" array of const char* strings. // Return a pointer to the array of strings (you need to delete them) --- 164,171 ---- // Return a pointer to the array of wxStrings (you need to delete them) // and returns the number of strings in the array in count. ! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxStringarray(lua_State* L, int stack_idx, int& count); // Adds the table at stack index to the wxArrayString // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxArrayString(lua_State* L, int stack_idx, wxArrayString& strArray); // Convert the table at stack index to a "new" array of const char* strings. // Return a pointer to the array of strings (you need to delete them) *************** *** 179,190 **** // Adds the table at stack index to the wxArrayInt // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarrayint(lua_State* L, int stack_idx, wxArrayInt& intArray); // Creates a lua table and pushes the strings into it, returns the number of items added // The table is left on the stack ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarraystringtable(lua_State* L, const wxArrayString& strArray); // Creates a lua table and pushes the ints into it, returns the number of items added // The table is left on the stack ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarrayinttable(lua_State* L, const wxArrayInt& intArray); //---------------------------------------------------------------------------- --- 178,189 ---- // Adds the table at stack index to the wxArrayInt // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxArrayInt(lua_State* L, int stack_idx, wxArrayInt& intArray); // Creates a lua table and pushes the strings into it, returns the number of items added // The table is left on the stack ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxArrayStringtable(lua_State* L, const wxArrayString& strArray); // Creates a lua table and pushes the ints into it, returns the number of items added // The table is left on the stack ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxArrayInttable(lua_State* L, const wxArrayInt& intArray); //---------------------------------------------------------------------------- *************** *** 199,211 **** ~wxLuaStateData(); ! wxLuaBindingList m_bindings; // A wxList of generated lua bindings ! // that are loaded into lua on startup - bool m_typesRegistered; // Are the bindings registered into the lua_State int m_wxluatag_wxLuaFunction; // The lua tag for wxLuaFunctions. ! int m_wxluatag_wxLuaNull; // The lua tag for wxLuaNull (for NULL pointers) int m_wxluatag_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table ! int m_wxluatag_wxEventTag; // The lua tag for wxEvents ! int m_wxluatag_wxWindowTag; // The lua tag for wxWindows bool m_callbase_func; // call the base class function instead of derived func --- 198,210 ---- ~wxLuaStateData(); ! wxLuaBindingList m_bindingList; // A wxList of generated lua bindings ! // that are loaded into lua on startup ! bool m_bindings_registered; // Are the bindings registered into the lua_State int m_wxluatag_wxLuaFunction; // The lua tag for wxLuaFunctions. ! int m_wxluatag_NULL; // The lua tag for NULL pointer int m_wxluatag_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table ! int m_wxluatag_wxEvent; // The lua tag for wxEvents ! int m_wxluatag_wxWindow; // The lua tag for wxWindows bool m_callbase_func; // call the base class function instead of derived func *************** *** 227,231 **** bool m_debug_hook_break; // should the lua_State break for next debug_hook ! wxString m_debug_hook_break_msg; // message when the breaking in the debug_hook unsigned long m_last_debug_hook_time; // last time the debug hook was called --- 226,230 ---- bool m_debug_hook_break; // should the lua_State break for next debug_hook ! wxString m_debug_hook_break_msg; // message when breaking in the debug_hook unsigned long m_last_debug_hook_time; // last time the debug hook was called *************** *** 237,243 **** wxEvtHandler *m_evtHandler; // event handler to send wxLuaEvents to wxWindowID m_id; // event id to send the events with - - private: - void Init(); }; --- 236,239 ---- *************** *** 247,253 **** //---------------------------------------------------------------------------- - #include "wx/dynarray.h" - WX_DECLARE_OBJARRAY_WITH_DECL(wxLuaState, wxArrayLuaState, class WXDLLIMPEXP_WXLUA); - #include "wx/hashmap.h" WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL(wxLuaStateRefData *, wxHashMapLuaStateRefData, class WXDLLIMPEXP_WXLUA); --- 243,246 ---- *************** *** 277,281 **** wxLuaStateData* m_wxlStateData; // the data shared for this state bool m_own_stateData; // not a coroutine when true - wxArrayLuaState m_coroutineStates; // a list of all coroutine states // Get the wxLuaStateRefData from the corresponding lua_State --- 270,273 ---- *************** *** 283,290 **** static wxLuaStateRefData* GetLuaStateRefData(lua_State* L); // A mapping between hashmap[lua_State* L] = *wxLuaStateRefData static wxHashMapLuaStateRefData s_wxHashMapLuaStateRefData; - - private: - void Init(); }; --- 275,281 ---- static wxLuaStateRefData* GetLuaStateRefData(lua_State* L); // A mapping between hashmap[lua_State* L] = *wxLuaStateRefData + // Note: The coroutines are not hashed since we cannot know when they + // are deleted. We create wxLuaStates for them on the fly. static wxHashMapLuaStateRefData s_wxHashMapLuaStateRefData; }; *************** *** 376,380 **** // Sends a wxLuaEvent, after checking that this is valid, to the set ! // wxEventHandler (see SetEventHandler) which may be NULL. void SendEvent( wxLuaEvent &event ) const; --- 367,371 ---- // Sends a wxLuaEvent, after checking that this is valid, to the set ! // wxEventHandler with the set id (see SetEventHandler) which may be NULL. void SendEvent( wxLuaEvent &event ) const; *************** *** 393,397 **** // Replacement for lua_pcall that sends a wxEVT_LUA_ERROR on error ! // narg in the number of args to the function to call // if clear then the function is void and no return values, // else nresults is LUA_MULTRET to leave all of them on the stack --- 384,388 ---- // Replacement for lua_pcall that sends a wxEVT_LUA_ERROR on error ! // narg is the number of args to the function to call // if clear then the function is void and no return values, // else nresults is LUA_MULTRET to leave all of them on the stack *************** *** 482,488 **** // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; ! bool GetTypesRegistered() const; // Is the binding registered int GetwxLuaFunctionTag() const; // The lua tag for wxLuaFunction objects. ! int GetLuaNull() const; // The lua tag for wxLuaNull (for NULL pointers) int GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table int GetwxEventTag() const; // The lua tag for wxEvents --- 473,479 ---- // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; ! bool GetBindingsRegistered() const; // Are the binding registered int GetwxLuaFunctionTag() const; // The lua tag for wxLuaFunction objects. ! int GetLuaNULL() const; // The lua tag for NULL pointer int GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table int GetwxEventTag() const; // The lua tag for wxEvents *************** *** 497,518 **** // memory tracking functions (internal use) void AddToTrackedMemoryList(wxObject *pObject); void AddToTrackedMemoryList(long obj_ptr, wxObject *pObject); bool RemoveTrackedMemory(void *pObject, bool fDelete = true); void AddToTrackedWindowList(wxWindow *win); void RemoveTrackedWindow(wxWindow *win); bool IsWindowTracked(wxWindow *win, bool check_parents = true) const; ! // delete all stray wxWindow dervied classes that have been destroyed ! // by wxWidgets (eg. a child window) (for debugging perhaps) void GarbageCollectWindows(bool closeWindows); ! // add or remove a wxEvtHandler used by lua code, see usage in wxLuaCallback void AddTrackedEventHandler(wxEvtHandler* evtHandler); bool RemoveTrackedEventHandler(wxEvtHandler* evtHandler); wxList* GetTrackedEventHandlerList(); ! // add or remove a wxEvtHandler used by lua code, see usage in wxLuaDestroyCallback void AddTrackedDestroyEventHandler(wxEvtHandler* evtHandler); bool RemoveTrackedDestroyEventHandler(wxEvtHandler* evtHandler); --- 488,519 ---- // memory tracking functions (internal use) + // Track this object and delete it when lua calls the gc method for it void AddToTrackedMemoryList(wxObject *pObject); + // Track this object, but hash it on the obj_ptr which may differ from the + // pObject and delete it when lua calls the gc method for it. + // This is used for encapsulated classes that are wrapped in a wxObject. void AddToTrackedMemoryList(long obj_ptr, wxObject *pObject); + // Remove the object from the tracked memory and if fDelete, delete it too. bool RemoveTrackedMemory(void *pObject, bool fDelete = true); + // Add a wxWindow to track and delete when we're closed, only track + // the parent window, no it's children. void AddToTrackedWindowList(wxWindow *win); + // Don't track this window anymore. void RemoveTrackedWindow(wxWindow *win); + // Is this window tracked, if check_parents see if a parent of it is. bool IsWindowTracked(wxWindow *win, bool check_parents = true) const; ! // delete all stray wxWindow derived classes that have been destroyed ! // by wxWidgets (eg. a child window) (not needed, for debugging perhaps?) void GarbageCollectWindows(bool closeWindows); ! // Add or remove a wxEvtHandler used by lua code, see usage in wxLuaCallback void AddTrackedEventHandler(wxEvtHandler* evtHandler); bool RemoveTrackedEventHandler(wxEvtHandler* evtHandler); wxList* GetTrackedEventHandlerList(); ! // Add or remove a wxEvtHandler connected to wxEVT_DESTROY used by lua code, ! // see usage in wxLuaDestroyCallback void AddTrackedDestroyEventHandler(wxEvtHandler* evtHandler); bool RemoveTrackedDestroyEventHandler(wxEvtHandler* evtHandler); *************** *** 619,623 **** // Convert a wxArrayString object to a table of strings, returns number of values ! int PushwxArrayStringTable(wxArrayString &strArray); // Convert a wxArrayInt object to a table of numbers, returns number of values int PushwxArrayIntTable(const wxArrayInt &intArray); --- 620,624 ---- // Convert a wxArrayString object to a table of strings, returns number of values ! int PushwxArrayStringTable(const wxArrayString &strArray); // Convert a wxArrayInt object to a table of numbers, returns number of values int PushwxArrayIntTable(const wxArrayInt &intArray); *************** *** 753,757 **** // Raw lua garbage-collection functions, lua.h ! int lua_GetGCCount(); // ----------------------------------------------------------------------- --- 754,758 ---- // Raw lua garbage-collection functions, lua.h ! int lua_GetGCCount(); // ----------------------------------------------------------------------- *************** *** 798,808 **** wxLUA_UNUSED_NOTUNICODE(int lua_GetInfo(const wxString& what, lua_Debug* ar) { return lua_GetInfo(wx2lua(what), ar); }) const char* lua_GetLocal(const lua_Debug* ar, int n); - wxString lua_GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_GetLocal(ar, n)); } const char* lua_SetLocal(const lua_Debug* ar, int n); - wxString lua_SetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_SetLocal(ar, n)); } const char* lua_GetUpValue(int funcindex, int n); - wxString lua_GetUpValuewxString(int funcindex, int n) { return lua2wx(lua_GetUpValue(funcindex, n)); } const char* lua_SetUpValue(int funcindex, int n); - wxString lua_SetUpValuewxString(int funcindex, int n) { return lua2wx(lua_SetUpValue(funcindex, n)); } int lua_SetHook(lua_Hook func, int mask, int count); --- 799,805 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluasocket_bind.cpp 4 Dec 2006 05:54:41 -0000 1.9 --- wxluasocket_bind.cpp 12 Dec 2006 07:09:42 -0000 1.10 *************** *** 178,182 **** wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluasocket"))); --- 178,182 ---- wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluasocket"))); *************** *** 185,189 **** return false; ! wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxluasocket()); return true; --- 185,189 ---- return false; ! wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxluasocket()); return true; Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxluasocket.cpp 11 Dec 2006 07:03:30 -0000 1.8 --- wxluasocket.cpp 12 Dec 2006 07:09:42 -0000 1.9 *************** *** 374,378 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaDebuggerServer_methods[] = { { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, { 0 } }, --- 374,378 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaDebuggerServer_methods[] = { { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, { 0 } }, *************** *** 399,405 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebuggerServer_methods = s_wxLuaDebuggerServer_methods; ! int wxLuaDebuggerServer_methodCount = sizeof(s_wxLuaDebuggerServer_methods)/sizeof(s_wxLuaDebuggerServer_methods[0]); // ------------------------------------------------------------------------------------------------- --- 399,403 ---- }; ! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 500,504 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaDebuggerEvent_methods[] = { { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, { 0 } }, { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, { 0 } }, --- 498,502 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, { 0 } }, { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, { 0 } }, *************** *** 509,514 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebuggerEvent_methods = s_wxLuaDebuggerEvent_methods; ! int wxLuaDebuggerEvent_methodCount = sizeof(s_wxLuaDebuggerEvent_methods)/sizeof(s_wxLuaDebuggerEvent_methods[0]); --- 507,510 ---- }; ! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]); |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** wxlstate.cpp 12 Dec 2006 01:23:40 -0000 1.83 --- wxlstate.cpp 12 Dec 2006 07:09:41 -0000 1.84 *************** *** 48,60 **** extern int wxLuaClassListCompareByTag(const void *p1, const void *p2); // wxlbind.cpp - // lua registry table - const char wxLuaReferences[] = "wxLuaReferences"; - const char wxLuaNull[] = "wxNull"; - wxLuaState wxNullLuaState(false); - #include "wx/arrimpl.cpp" - WX_DEFINE_OBJARRAY(wxArrayLuaState); [...1112 lines suppressed...] - if (token == path || - !wxFileName::IsCaseSensitive() && token.CmpNoCase(path) == 0) - return; - } - - // append separator - if (!luapath.IsEmpty() && luapath.Last() != wxT(';')) - luapath += wxT(';'); - - // append path - luapath += path; - luapath += wxT(';'); - - lua_PushString(wx2lua(luapath)); - lua_SetGlobal(LUA_PATH); - } - //----------------------------------------------------------------------------- // wxLuaEvent --- 3524,3527 ---- Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxlbind.cpp 12 Dec 2006 01:23:40 -0000 1.45 --- wxlbind.cpp 12 Dec 2006 07:09:41 -0000 1.46 *************** *** 498,502 **** m_objectCount(0), m_objectList(NULL), m_functionCount(0), m_functionList(NULL), ! m_typesRegistered(false), m_startTag(0), m_lastTag(0), --- 498,502 ---- m_objectCount(0), m_objectList(NULL), m_functionCount(0), m_functionList(NULL), ! m_bindings_registered(false), m_startTag(0), m_lastTag(0), *************** *** 539,543 **** wxLuaState wxlState(wxlState_); ! if (!registerTypes && !m_typesRegistered) wxlState.terror("wxLua: First time registration must register types"); --- 539,543 ---- wxLuaState wxlState(wxlState_); ! if (!registerTypes && !m_bindings_registered) wxlState.terror("wxLua: First time registration must register types"); *************** *** 593,597 **** PostRegister(wxlState, registerTypes, tableOffset); ! m_typesRegistered = true; return tableOffset; --- 593,597 ---- PostRegister(wxlState, registerTypes, tableOffset); ! m_bindings_registered = true; return tableOffset; Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxlcallb.cpp 12 Dec 2006 01:23:40 -0000 1.21 --- wxlcallb.cpp 12 Dec 2006 07:09:41 -0000 1.22 *************** *** 78,82 **** // Disconnect all callbacks associated with this window's evthandler ! theCallback->ClearLuaState(); wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); --- 78,82 ---- // Disconnect all callbacks associated with this window's evthandler ! theCallback->ClearwxLuaState(); wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); *************** *** 94,98 **** wxlState.GetTrackedEventHandlerList()->Erase(pc_node); ! pCallback->ClearLuaState(); } else --- 94,98 ---- wxlState.GetTrackedEventHandlerList()->Erase(pc_node); ! pCallback->ClearwxLuaState(); } else |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxstc_bind.cpp 4 Dec 2006 05:54:41 -0000 1.14 --- wxstc_bind.cpp 12 Dec 2006 07:09:41 -0000 1.15 *************** *** 1498,1502 **** wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxstc"))); --- 1498,1502 ---- wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); ! wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxstc"))); *************** *** 1505,1509 **** return false; ! wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxstc()); return true; --- 1505,1509 ---- return false; ! wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxstc()); return true; Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** stc.cpp 11 Oct 2006 03:24:02 -0000 1.17 --- stc.cpp 12 Dec 2006 07:09:41 -0000 1.18 *************** *** 6583,6587 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxStyledTextCtrl_methods[] = { #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) --- 6583,6587 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxStyledTextCtrl_methods[] = { #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) *************** *** 7178,7184 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxStyledTextCtrl_methods = s_wxStyledTextCtrl_methods; ! int wxStyledTextCtrl_methodCount = sizeof(s_wxStyledTextCtrl_methods)/sizeof(s_wxStyledTextCtrl_methods[0]); // ------------------------------------------------------------------------------------------------- --- 7178,7182 ---- }; ! int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]); // ------------------------------------------------------------------------------------------------- *************** *** 7869,7873 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxStyledTextEvent_methods[] = { { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 7867,7871 ---- // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxStyledTextEvent_methods[] = { { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, *************** *** 7965,7970 **** }; ! // Extern accessor to class method map ! WXLUAMETHOD* wxStyledTextEvent_methods = s_wxStyledTextEvent_methods; ! int wxStyledTextEvent_methodCount = sizeof(s_wxStyledTextEvent_methods)/sizeof(s_wxStyledTextEvent_methods[0]); --- 7963,7966 ---- }; ! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxStyledTextEvent_methods[0]); |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluasocket_bind.h 15 Sep 2006 00:10:56 -0000 1.6 --- wxluasocket_bind.h 12 Dec 2006 07:09:41 -0000 1.7 *************** *** 66,72 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerEvent_methods; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerServer_methods; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; --- 66,72 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; |
|
From: John L. <jr...@us...> - 2006-12-12 07:09:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18786/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: lots of little cleanups Add wx.NULL to replace wx.wxNull (which still exists) to be more C like Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static More variable/function name changes to make the code more readable Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxbind.h 28 Aug 2006 05:26:20 -0000 1.12 --- wxbind.h 12 Dec 2006 07:09:41 -0000 1.13 *************** *** 61,67 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD* wxStyledTextCtrl_methods; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD* wxStyledTextEvent_methods; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; --- 61,67 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: remove all #pragma interface since they are no longer needed Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxldtarg.cpp 8 Dec 2006 06:16:17 -0000 1.31 --- wxldtarg.cpp 12 Dec 2006 01:23:40 -0000 1.32 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxldtarg.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** dservice.cpp 5 Oct 2006 05:10:47 -0000 1.28 --- dservice.cpp 12 Dec 2006 01:23:40 -0000 1.29 *************** *** 15,22 **** // wxWidgets Socket Sample - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dservice.h" - #endif - #include "wx/wxprec.h" --- 15,18 ---- Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxldserv.cpp 11 Dec 2006 07:03:30 -0000 1.33 --- wxldserv.cpp 12 Dec 2006 01:23:40 -0000 1.34 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxldserv.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- *************** *** 585,589 **** void wxLuaDebuggerBase::OnEndDebugeeProcess(wxProcessEvent& event) { ! // The process's OnTerminate will null m_debuggeeProcess, // but if in destructor it's already NULL and don't send event. if (m_debuggeeProcess != NULL) --- 581,585 ---- void wxLuaDebuggerBase::OnEndDebugeeProcess(wxProcessEvent& event) { ! // The process's OnTerminate will null m_debuggeeProcess, // but if in destructor it's already NULL and don't send event. if (m_debuggeeProcess != NULL) *************** *** 603,607 **** m_debuggeeProcess->Kill(m_debuggeeProcessID, wxSIGKILL); } ! if (m_debuggeeProcess != NULL) { --- 599,603 ---- m_debuggeeProcess->Kill(m_debuggeeProcessID, wxSIGKILL); } ! if (m_debuggeeProcess != NULL) { *************** *** 693,697 **** m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess); ! if (m_debuggeeProcessID < 1) KillDebuggee(); --- 689,693 ---- m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess); ! if (m_debuggeeProcessID < 1) KillDebuggee(); Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxlsock.cpp 5 Dec 2006 23:38:28 -0000 1.22 --- wxlsock.cpp 12 Dec 2006 01:23:41 -0000 1.23 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlsock.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxluasocket/include Modified Files: dservice.h wxldserv.h wxldtarg.h wxlsock.h Log Message: remove all #pragma interface since they are no longer needed Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxldserv.h 11 Dec 2006 07:03:30 -0000 1.27 --- wxldserv.h 12 Dec 2006 01:23:40 -0000 1.28 *************** *** 10,17 **** #define WX_LUA_DEBUG_SERVER_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxldserv.h" - #endif - #include "wx/process.h" #include "wx/thread.h" --- 10,13 ---- Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlsock.h 5 Oct 2006 05:10:47 -0000 1.19 --- wxlsock.h 12 Dec 2006 01:23:40 -0000 1.20 *************** *** 11,18 **** #define WX_LUA_SOCKET_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlsock.h" - #endif - #include "wxluasocket/include/wxluasocketdefs.h" --- 11,14 ---- Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxldtarg.h 3 Oct 2006 19:52:16 -0000 1.20 --- wxldtarg.h 12 Dec 2006 01:23:40 -0000 1.21 *************** *** 11,18 **** #define LUA_DEBUG_TARGET_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxldtarg.h" - #endif - #include "wx/thread.h" #include "wxluasocket/include/wxluasocketdefs.h" --- 11,14 ---- Index: dservice.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** dservice.h 4 Oct 2006 22:07:23 -0000 1.20 --- dservice.h 12 Dec 2006 01:23:40 -0000 1.21 *************** *** 31,38 **** #define WX_LUA_DEBUGGERSERVICE_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dservice.h" - #endif - #include "wxluasocket/include/wxluasocketdefs.h" --- 31,34 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp staktree.cpp wxldebug.cpp Log Message: remove all #pragma interface since they are no longer needed Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** splttree.cpp 8 Aug 2006 22:54:38 -0000 1.14 --- splttree.cpp 12 Dec 2006 01:23:40 -0000 1.15 *************** *** 20,26 **** // headers // ---------------------------------------------------------------------------- - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "splttree.h" - #endif // For compilers that support precompilation, includes "wx/wx.h". --- 20,23 ---- *************** *** 234,238 **** // In case we're using the generic tree control. ! void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc) { #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) --- 231,241 ---- // In case we're using the generic tree control. ! void wxRemotelyScrolledTreeCtrl::PrepareDC( ! #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) ! wxDC& dc ! #else ! wxDC& WXUNUSED(dc) ! #endif ! ) { #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) *************** *** 253,260 **** // dc.SetUserScale( win->GetScaleX(), win->GetScaleY() ); } - #else - # ifdef UNREFERENCED_PARAMETER - // UNREFERENCED_PARAMETER(dc); can't set dc = dc; - # endif #endif } --- 256,259 ---- Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxldebug.cpp 11 Dec 2006 23:25:05 -0000 1.24 --- wxldebug.cpp 12 Dec 2006 01:23:40 -0000 1.25 *************** *** 2,15 **** // Name: wxLuaDebug.cpp // Purpose: Debugging I/O functions for wxLua ! // Author: J. Winwood // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// - // Ray Gilbert - - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxldebug.h" - #endif #include "wx/wxprec.h" --- 2,10 ---- // Name: wxLuaDebug.cpp // Purpose: Debugging I/O functions for wxLua ! // Author: J. Winwood, Ray Gilbert // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** staktree.cpp 4 Oct 2006 05:55:02 -0000 1.32 --- staktree.cpp 12 Dec 2006 01:23:40 -0000 1.33 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "staktree.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxluadebug/include Modified Files: splttree.h staktree.h wxldebug.h Log Message: remove all #pragma interface since they are no longer needed Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** staktree.h 3 Oct 2006 05:12:45 -0000 1.14 --- staktree.h 12 Dec 2006 01:23:40 -0000 1.15 *************** *** 11,18 **** #define _WX_LUA_STACKTREE_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "staktree.h" - #endif - #include "wxluadebug/include/wxluadebugdefs.h" #include "wxluadebug/include/splttree.h" --- 11,14 ---- Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxldebug.h 5 Oct 2006 05:10:47 -0000 1.29 --- wxldebug.h 12 Dec 2006 01:23:40 -0000 1.30 *************** *** 10,17 **** #define WX_LUA_DEBUG_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxldebug.h" - #endif - #include "wx/dynarray.h" #include "wx/treectrl.h" // for wxTreeItemData --- 10,13 ---- Index: splttree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** splttree.h 4 Sep 2006 18:07:55 -0000 1.9 --- splttree.h 12 Dec 2006 01:23:40 -0000 1.10 *************** *** 16,23 **** #define _WX_SPLITTREE_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "splttree.h" - #endif - #include "wxluadebug/include/wxluadebugdefs.h" #include "wx/treectrl.h" --- 16,19 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: remove all #pragma interface since they are no longer needed Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** wxlstate.cpp 11 Dec 2006 23:25:05 -0000 1.82 --- wxlstate.cpp 12 Dec 2006 01:23:40 -0000 1.83 *************** *** 1,4 **** ///////////////////////////////////////////////////////////////////////////// ! // Purpose: Interface to wxLua // Author: Ray Gilbert, John Labenski, J Winwood // Created: 14/11/2001 --- 1,4 ---- ///////////////////////////////////////////////////////////////////////////// ! // Purpose: wxWidgets interface to lua // Author: Ray Gilbert, John Labenski, J Winwood // Created: 14/11/2001 *************** *** 24,31 **** **************************************************************************** */ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlstate.h" - #endif - // For compilers that support precompilation, includes "wx/wx.h" #include "wx/wxprec.h" --- 24,27 ---- *************** *** 579,583 **** wxString* LUACALL wxLua_lua_getwxstringarray(lua_State *L, int stack_idx, int &count) { ! wxString *strArray = NULL; wxArrayString wxarrString; count = 0; --- 575,579 ---- wxString* LUACALL wxLua_lua_getwxstringarray(lua_State *L, int stack_idx, int &count) { ! wxString *strArray = NULL; wxArrayString wxarrString; count = 0; *************** *** 657,661 **** int * LUACALL wxLua_lua_getintarray(lua_State *L, int stack_idx, int &count) { ! int *intArray = NULL; wxArrayInt wxarrInt; count = 0; --- 653,657 ---- int * LUACALL wxLua_lua_getintarray(lua_State *L, int stack_idx, int &count) { ! int *intArray = NULL; wxArrayInt wxarrInt; count = 0; *************** *** 2051,2055 **** if (M_WXLSTATEDATA->m_wxlStateData->m_unusedReferenceIndexes.GetCount() > 0) { ! // Use an available, but previously used and removed index from the // wxLuaReferences registry table so the index doesn't grow too large. // see tremove. --- 2047,2051 ---- if (M_WXLSTATEDATA->m_wxlStateData->m_unusedReferenceIndexes.GetCount() > 0) { ! // Use an available, but previously used and removed index from the // wxLuaReferences registry table so the index doesn't grow too large. // see tremove. *************** *** 2107,2111 **** // ensure ref index in range of table ! if ((wxlref_index > 0) && (wxlref_index <= table_count)) { lua_pushnil(L); // push nil as value --- 2103,2107 ---- // ensure ref index in range of table ! if ((wxlref_index > 0) && (wxlref_index <= table_count)) { lua_pushnil(L); // push nil as value Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wxlbind.cpp 11 Dec 2006 23:25:05 -0000 1.44 --- wxlbind.cpp 12 Dec 2006 01:23:40 -0000 1.45 *************** *** 7,14 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlbind.h" - #endif - #include "wx/wxprec.h" --- 7,10 ---- *************** *** 65,69 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) { --- 61,65 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) { *************** *** 81,85 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) { --- 77,81 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) { Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlcallb.cpp 7 Dec 2006 01:22:02 -0000 1.20 --- wxlcallb.cpp 12 Dec 2006 01:23:40 -0000 1.21 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlcallb.h" - #endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" --- 8,11 ---- *************** *** 34,38 **** wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pEvtHandler ) : wxEvtHandler(), m_wxlState(state), --- 30,34 ---- wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pEvtHandler ) : wxEvtHandler(), m_wxlState(state), |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxlstate.h Log Message: remove all #pragma interface since they are no longer needed Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlcallb.h 7 Dec 2006 01:22:02 -0000 1.12 --- wxlcallb.h 12 Dec 2006 01:23:40 -0000 1.13 *************** *** 10,17 **** #define _WXLCALLB_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlcallb.h" - #endif - #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" --- 10,13 ---- *************** *** 28,32 **** // if only one event Id is needed set lastId = wxID_ANY wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pHandler ); --- 24,28 ---- // if only one event Id is needed set lastId = wxID_ANY wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pHandler ); Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxlbind.h 11 Dec 2006 23:25:05 -0000 1.28 --- wxlbind.h 12 Dec 2006 01:23:40 -0000 1.29 *************** *** 10,17 **** #define _WXLBIND_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlbind.h" - #endif - #include "wxlua/include/wxldefs.h" --- 10,13 ---- Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** wxlstate.h 11 Dec 2006 23:25:05 -0000 1.54 --- wxlstate.h 12 Dec 2006 01:23:40 -0000 1.55 *************** *** 1,4 **** ///////////////////////////////////////////////////////////////////////////// ! // Purpose: Interface to wxLua // Author: Ray Gilbert, John Labenski, J Winwood // Created: 14/11/2001 --- 1,4 ---- ///////////////////////////////////////////////////////////////////////////// ! // Purpose: wxWidgets interface to lua // Author: Ray Gilbert, John Labenski, J Winwood // Created: 14/11/2001 *************** *** 27,34 **** #define _WXLSTATE_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlstate.h" - #endif - extern "C" { --- 27,30 ---- *************** *** 109,119 **** // ---------------------------------------------------------------------------- ! // Create a reference to the object at stack index in the // wxLuaReferences registry table, returns the table index. //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tinsert(lua_State* L, int stack_idx); ! // Remove a reference to the object at the index in the // wxLuaReferences registry table, returns success. //WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference); ! // Push onto the top of the stack the object at the index in the // wxLuaReferences registry table, returns success. WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int wxlref_index); --- 105,115 ---- // ---------------------------------------------------------------------------- ! // Create a reference to the object at stack index in the // wxLuaReferences registry table, returns the table index. //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tinsert(lua_State* L, int stack_idx); ! // Remove a reference to the object at the index in the // wxLuaReferences registry table, returns success. //WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference); ! // Push onto the top of the stack the object at the index in the // wxLuaReferences registry table, returns success. WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int wxlref_index); *************** *** 134,138 **** //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewtag(lua_State* L); // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences // registry table and return its index into the ref table. //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool weak_keys, bool weak_values); --- 130,134 ---- //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewtag(lua_State* L); // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences // registry table and return its index into the ref table. //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool weak_keys, bool weak_values); *************** *** 224,228 **** // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle ! wxArrayInt m_unusedReferenceIndexes; // array of unused (available) table indicies in the // wxLuaReferences registry table --- 220,224 ---- // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle ! wxArrayInt m_unusedReferenceIndexes; // array of unused (available) table indicies in the // wxLuaReferences registry table *************** *** 526,536 **** // wxLua lua Registry Table Functions ! // Create a reference to the object at stack index in the // wxLuaReferences registry table, returns the table index. int tinsert(int stack_idx); ! // Remove a reference to the object at the index in the // wxLuaReferences registry table, returns success. bool tremove(int wxlref_index); ! // Push onto the top of the stack the object at the index in the // wxLuaReferences registry table, returns success. bool tget(int wxlref_index); --- 522,532 ---- // wxLua lua Registry Table Functions ! // Create a reference to the object at stack index in the // wxLuaReferences registry table, returns the table index. int tinsert(int stack_idx); ! // Remove a reference to the object at the index in the // wxLuaReferences registry table, returns success. bool tremove(int wxlref_index); ! // Push onto the top of the stack the object at the index in the // wxLuaReferences registry table, returns success. bool tget(int wxlref_index); *************** *** 552,556 **** int tnewtag(); // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences // registry table and return its index into the ref table. int tnewweaktag(bool weak_keys, bool weak_values); --- 548,552 ---- int tnewtag(); // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences // registry table and return its index into the ref table. int tnewweaktag(bool weak_keys, bool weak_values); |
