fix windows build break due to directory and path changes --continue
This commit is contained in:
parent
5b995c9b44
commit
723bf2b277
@ -60,7 +60,7 @@ installcheck-summary:
|
||||
clean-local:
|
||||
rm -rf *.suo $(CASALIBDIR)
|
||||
rm -rf *.suo $(CASABINDIR)
|
||||
|
||||
rm -rf BUILT
|
||||
maintainer-clean-local:
|
||||
rm -f configure Makefile.in casa-*.tar.gz
|
||||
rm -f aclocal.m4 conf*.sh configure.lineno
|
||||
|
@ -94,41 +94,35 @@
|
||||
Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
|
||||
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
|
||||
/>
|
||||
<Reference
|
||||
Name = "pango-sharp"
|
||||
AssemblyName = "pango-sharp"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "atk-sharp"
|
||||
AssemblyName = "atk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "gdk-sharp"
|
||||
AssemblyName = "gdk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "glade-sharp"
|
||||
AssemblyName = "glade-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "glib-sharp"
|
||||
AssemblyName = "glib-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "gtk-sharp"
|
||||
AssemblyName = "gtk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
/>
|
||||
<Reference
|
||||
Name = "pango-sharp"
|
||||
AssemblyName = "pango-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
|
||||
/>
|
||||
</References>
|
||||
</Build>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<VisualStudioProject>
|
||||
<CSHARP LastOpenVersion = "7.10.3077" >
|
||||
<Build>
|
||||
<Settings ReferencePath = "" >
|
||||
<Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
|
||||
<Config
|
||||
Name = "Debug"
|
||||
EnableASPDebugging = "false"
|
||||
|
@ -83,7 +83,7 @@ $(OBJDIR)/%.o: %.cpp
|
||||
|
||||
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT):
|
||||
@echo [======== Creating symlink $@ ========]
|
||||
ln -f $(CFILES) $(CASAROOT)/c_micasadk
|
||||
ln -f $(CFILES) $(CASAROOT)/micasadk
|
||||
|
||||
$(OBJDIR):
|
||||
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
|
||||
|
@ -109,41 +109,35 @@
|
||||
Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
|
||||
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
|
||||
/>
|
||||
<Reference
|
||||
Name = "atk-sharp"
|
||||
AssemblyName = "atk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
/>
|
||||
<Reference
|
||||
Name = "gdk-sharp"
|
||||
AssemblyName = "gdk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
/>
|
||||
<Reference
|
||||
Name = "glade-sharp"
|
||||
AssemblyName = "glade-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
/>
|
||||
<Reference
|
||||
Name = "glib-sharp"
|
||||
AssemblyName = "glib-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "gtk-sharp"
|
||||
AssemblyName = "gtk-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "pango-sharp"
|
||||
AssemblyName = "pango-sharp"
|
||||
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
|
||||
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "atk-sharp"
|
||||
AssemblyName = "atk-sharp"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "gdk-sharp"
|
||||
AssemblyName = "gdk-sharp"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
|
||||
/>
|
||||
<Reference
|
||||
Name = "glade-sharp"
|
||||
AssemblyName = "glade-sharp"
|
||||
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
|
||||
/>
|
||||
</References>
|
||||
</Build>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<VisualStudioProject>
|
||||
<CSHARP LastOpenVersion = "7.10.3077" >
|
||||
<Build>
|
||||
<Settings ReferencePath = "" >
|
||||
<Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
|
||||
<Config
|
||||
Name = "Debug"
|
||||
EnableASPDebugging = "false"
|
||||
|
@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
|
||||
MODULE_NAME =micasacache
|
||||
MODULE_EXT =dll
|
||||
|
||||
SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln
|
||||
SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
|
||||
|
||||
PROJECT_NAME= micasacache
|
||||
|
||||
|
@ -260,7 +260,7 @@
|
||||
/>
|
||||
<File
|
||||
RelPath = "init\ProjectInstaller.cs"
|
||||
SubType = "Component"
|
||||
SubType = "Code"
|
||||
BuildAction = "Compile"
|
||||
/>
|
||||
<File
|
||||
@ -270,7 +270,7 @@
|
||||
/>
|
||||
<File
|
||||
RelPath = "init\WinSecretStoreClientService.cs"
|
||||
SubType = "Component"
|
||||
SubType = "Code"
|
||||
BuildAction = "Compile"
|
||||
/>
|
||||
<File
|
||||
|
@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
|
||||
MODULE_NAME =micasa
|
||||
MODULE_EXT =dll
|
||||
|
||||
SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln
|
||||
SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
|
||||
|
||||
PROJECT_NAME= micasa
|
||||
|
||||
|
Binary file not shown.
Binary file not shown.
@ -302,13 +302,13 @@
|
||||
{
|
||||
"Name" = "8:Microsoft Visual Studio"
|
||||
"ProductName" = "8:CASA"
|
||||
"ProductCode" = "8:{E87F8885-C799-4C0A-9761-8514A8A09C46}"
|
||||
"PackageCode" = "8:{8D36149E-F746-4006-A4FA-3E6745D36021}"
|
||||
"ProductCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
|
||||
"PackageCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
|
||||
"UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
|
||||
"RestartWWWService" = "11:FALSE"
|
||||
"RemovePreviousVersions" = "11:TRUE"
|
||||
"DetectNewerInstalledVersion" = "11:TRUE"
|
||||
"ProductVersion" = "8:1.6.699"
|
||||
"ProductVersion" = "8:1.7.678"
|
||||
"Manufacturer" = "8:Novell"
|
||||
"ARPHELPTELEPHONE" = "8:"
|
||||
"ARPHELPLINK" = "8:"
|
||||
|
@ -31,7 +31,7 @@ DIST_SUBDIRS =
|
||||
|
||||
EXTRA_DIST = $(SFILES)
|
||||
|
||||
CASAROOT = ../..
|
||||
CASAROOT = ../../../..
|
||||
|
||||
CASALIBDIR = $(CASAROOT)/lib
|
||||
|
||||
@ -109,7 +109,7 @@ clean-local:
|
||||
if [ -d Debug ]; then rm -rf Debug; fi
|
||||
if [ -f build.log ]; then rm -f build.log; fi
|
||||
if [ -d BUILT ]; then rm -rf BUILT; fi
|
||||
|
||||
if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
|
||||
distclean-local:
|
||||
|
||||
maintainer-clean-local:
|
||||
|
Binary file not shown.
@ -1934,8 +1934,8 @@
|
||||
}
|
||||
"Module"
|
||||
{
|
||||
"ModuleSignature" = "8:MergeModule.71E87B6C0C774E9FBADBFDACFC28E60A"
|
||||
"Version" = "8:1.5.0.0"
|
||||
"ModuleSignature" = "8:MergeModule.23882DEA21CB4D9C85AFFC59560C0630"
|
||||
"Version" = "8:1.7.678.0"
|
||||
"Title" = "8:miCASA-msm"
|
||||
"Subject" = "8:"
|
||||
"Author" = "8:Organization"
|
||||
|
Loading…
Reference in New Issue
Block a user