Use local wxWidget DLLs

This commit is contained in:
Simon Rozman 2018-09-01 08:03:06 +02:00
parent b01d3b9f58
commit 8a321137a0
79 changed files with 364 additions and 605 deletions

View File

@ -1 +0,0 @@
System Folder\wxbase30u_net_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30u_net_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxbase30u_vc100.dll

Binary file not shown.

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30u_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxbase30u_xml_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxbase30ud_net_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxbase30ud_vc100.dll

Binary file not shown.

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30ud_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxbase30ud_xml_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30u_adv_vc100.dll

Binary file not shown.

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30u_adv_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30u_aui_vc100.dll

Binary file not shown.

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30u_aui_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30u_core_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30ud_adv_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30ud_adv_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30ud_aui_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30ud_aui_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System Folder\wxmsw30ud_core_vc100.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

View File

@ -1 +0,0 @@
System (64-bit) Folder\wxmsw30ud_core_vc100_x64.dll

View File

@ -1,24 +0,0 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
[splosno]
jezik=0
deli=featZRCola featUpdCheck
[parametri]

9
MSI/ZRCola/wxWidgets/.gitignore vendored Normal file
View File

@ -0,0 +1,9 @@
/*-1.idt
/*-2.idt
/*-2.idtx
/*.Binary-1
/*.Binary-2
/*.Icon-1
/*.Icon-2
/*.lst
/*.msm

View File

@ -0,0 +1,89 @@
#
# Copyright 1991-2017 Amebis
#
# This file is part of ZRCola.
#
# ZRCola is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ZRCola is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
#
!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
!IF "$(PLAT)" == "x64"
WXWIDGETS_PLAT=_x64
!ELSE
WXWIDGETS_PLAT=
!ENDIF
!IF "$(CFG)" == "Debug"
WXWIDGETS_CFG=ud
!ELSE
WXWIDGETS_CFG=u
!ENDIF
######################################################################
# Component
All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
Component ComponentId Directory_ Attributes Condition KeyPath
s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID)
Component Component
!IF "$(PLAT)" == "Win32"
compwxbase.dll.Win32 {86B11E59-4F0A-45F7-A4F6-B4813A5F8A39} ZRCOLABINDIR 0 filewxbase.dll.Win32
compwxbase_net.dll.Win32 {7E138C1C-20CF-4FB5-9504-7F3DD4DC5E54} ZRCOLABINDIR 0 filewxbase_net.dll.Win32
compwxbase_xml.dll.Win32 {B8175665-7408-4D9A-9341-D2933E7D5BC6} ZRCOLABINDIR 0 filewxbase_xml.dll.Win32
compwxmsw_core.dll.Win32 {EEE366E4-F151-4E43-9760-1E925906D292} ZRCOLABINDIR 0 filewxwxmsw_core.dll.Win32
compwxmsw_adv.dll.Win32 {C18CD779-BC33-4AD2-8E73-25B6AEDB7A40} ZRCOLABINDIR 0 filewxmsw_adv.dll.Win32
compwxmsw_aui.dll.Win32 {BB9D5874-A26B-4143-8329-59EDD6E09B1C} ZRCOLABINDIR 0 filewxmsw_aui.dll.Win32
!ENDIF
!IF "$(PLAT)" == "x64"
compwxbase.dll.x64 {AD46C6EF-EF2E-4DC7-8BBB-255F9881C9C6} ZRCOLABINDIR 256 filewxbase.dll.x64
compwxbase_net.dll.x64 {DE55D199-B90D-4F59-AB5A-08408D8276C2} ZRCOLABINDIR 256 filewxbase_net.dll.x64
compwxbase_xml.dll.x64 {13B4FB42-8446-4B64-BBE8-130E87DEAB9A} ZRCOLABINDIR 256 filewxbase_xml.dll.x64
compwxmsw_core.dll.x64 {9E2A25DD-0726-44C2-97CD-6AD74BAFE4DC} ZRCOLABINDIR 256 filewxwxmsw_core.dll.x64
compwxmsw_adv.dll.x64 {C0B70F8C-9885-4188-84E0-2C57A67F32FB} ZRCOLABINDIR 256 filewxmsw_adv.dll.x64
compwxmsw_aui.dll.x64 {ED92B13B-A964-43DC-BB8A-0E47C4AEE31C} ZRCOLABINDIR 256 filewxmsw_aui.dll.x64
!ENDIF
<<NOKEEP
######################################################################
# File
All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
File Component_ FileName FileSize Version Language Attributes Sequence
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2
File File
filewxbase.dll.$(PLAT) compwxbase.dll.$(PLAT) WXBASE~1.DLL|wxbase30$(WXWIDGETS_CFG)_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxbase_net.dll.$(PLAT) compwxbase_net.dll.$(PLAT) WXBASE~2.DLL|wxbase30$(WXWIDGETS_CFG)_net_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxbase_xml.dll.$(PLAT) compwxbase_xml.dll.$(PLAT) WXBASE~3.DLL|wxbase30$(WXWIDGETS_CFG)_xml_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxwxmsw_core.dll.$(PLAT) compwxmsw_core.dll.$(PLAT) WXMSW3~1.DLL|wxmsw30$(WXWIDGETS_CFG)_core_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxmsw_adv.dll.$(PLAT) compwxmsw_adv.dll.$(PLAT) WXMSW3~2.DLL|wxmsw30$(WXWIDGETS_CFG)_adv_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxmsw_aui.dll.$(PLAT) compwxmsw_aui.dll.$(PLAT) WXMSW3~3.DLL|wxmsw30$(WXWIDGETS_CFG)_aui_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1
<<NOKEEP
######################################################################
# Build MSM module!
######################################################################
!INCLUDE "..\..\MSIBuild\MSM.mak"

Binary file not shown.

263
Makefile
View File

@ -59,6 +59,54 @@ Clean ::
-if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\ZRCola32.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf"
-if exist "$(OUTPUT_DIR)\ZRCola32D.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf"
-if exist "$(OUTPUT_DIR)\ZRCola64.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf"
@ -172,6 +220,7 @@ Publish :: \
Register :: \
RegisterSettings \
InstallFonts \
InstallwxWidgets \
RegisterShortcuts
Unregister :: \
@ -210,6 +259,68 @@ InstallFonts :: \
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Bold Italic (TrueType)" /t REG_SZ /d "ZRCola_BI.otf" $(REG_FLAGS) > NUL
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola" /t REG_SZ /d "ZRCola" $(REG_FLAGS) > NUL
InstallwxWidgets :: \
InstallwxWidgets_Debug_Win32 \
InstallwxWidgets_Release_Win32 \
InstallwxWidgets_Debug_x64 \
InstallwxWidgets_Release_x64
InstallwxWidgets_Debug_Win32 :: \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb"
InstallwxWidgets_Release_Win32 :: \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb"
InstallwxWidgets_Debug_x64 :: \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb"
InstallwxWidgets_Release_x64 :: \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb"
UninstallFonts::
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola (TrueType)" $(REG_FLAGS) > NUL
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola Italic (TrueType)" $(REG_FLAGS) > NUL
@ -285,6 +396,150 @@ Localization :: \
"$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_net_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_net_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_net_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_net_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_net_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_net_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_net_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_net_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_xml_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_xml_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_xml_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_xml_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_xml_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_xml_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_xml_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_xml_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_core_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_core_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_core_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_core_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_core_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_core_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_core_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_core_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_adv_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_adv_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_adv_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_adv_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_adv_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_adv_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_adv_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_adv_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_aui_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_aui_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_aui_vc100.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_aui_vc100.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_aui_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_aui_vc100_x64.pdb"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_aui_vc100_x64.dll"
copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_aui_vc100_x64.pdb"
copy /y $** $@ > NUL
######################################################################
# Shortcut creation
@ -320,25 +575,25 @@ Localization :: \
"$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" :: Localization
"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" :: Localization InstallwxWidgets
"$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" :: Localization
"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" :: Localization InstallwxWidgets_Release_Win32
"$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
"$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
"$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
"$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" :: Localization
"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" :: Localization InstallwxWidgets_Release_x64
"$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
"$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
"$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" :: Localization
"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" :: Localization InstallwxWidgets_Debug_x64
"$(OUTPUT_DIR)\Win32.Release\libZRCola10u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \

@ -1 +1 @@
Subproject commit c9e24ccca9249b22b0231f5d32dc391a03fd9d04
Subproject commit c160d4b9ebe586a199ae879c18aeb6f3ccfb0539

View File

@ -245,6 +245,12 @@ featZRCola complibZRCola.dll.$(PLAT)
featZRCola complibZRColaUI.dll.$(PLAT)
featZRCola compwxExtend.dll.$(PLAT)
featZRCola compUpdater.dll.$(PLAT)
featZRCola compwxbase.dll.$(PLAT)
featZRCola compwxbase_net.dll.$(PLAT)
featZRCola compwxbase_xml.dll.$(PLAT)
featZRCola compwxmsw_core.dll.$(PLAT)
featZRCola compwxmsw_adv.dll.$(PLAT)
featZRCola compwxmsw_aui.dll.$(PLAT)
featZRCola compLocalizationRepositoryPath
featZRCola compLanguage
featZRCola compDatabasePath

Binary file not shown.