Permalink
Browse files

Fixed paths

  • Loading branch information...
1 parent 164425c commit 44c5de8361fbae40a4e1b32da165acf9611c0e93 (no author) committed Apr 4, 2009
View
@@ -1 +1 @@
-DIRS=cfixctl
+DIRS=src
View
@@ -49,19 +49,35 @@ version:
rcstamp cfixctl\cfixhost\cfixhost.rc $(VERSION)
i386chk: version
+ copy $(CFIX_TREE)\bin\chk\i386\cfix.dll bin\chk\i386
+ copy $(CFIX_TREE)\bin\chk\i386\cfixkl.dll bin\chk\i386
+ copy $(CFIX_TREE)\bin\chk\i386\cdiag.dll bin\chk\i386
+
cmd /C ddkbuild -WNETW2K checked . -cZ
- msbuild managed\Cfix.Control\Cfix.Control.sln /t:rebuild /p:Configuration=Release
- msbuild managed\Cfix.Addin\Cfix.Addin.sln /t:rebuild /p:Configuration=Release
+ msbuild src\Cfix.Control\Cfix.Control.sln /t:rebuild /p:Configuration=Release
+ msbuild src\Cfix.Addin\Cfix.Addin.sln /t:rebuild /p:Configuration=Release
i386fre: version
+ copy $(CFIX_TREE)\bin\fre\i386\cfix.dll bin\fre\i386
+ copy $(CFIX_TREE)\bin\fre\i386\cfixkl.dll bin\fre\i386
+ copy $(CFIX_TREE)\bin\fre\i386\cdiag.dll bin\fre\i386
+
cmd /C ddkbuild -WNETW2K free . -cZ
- msbuild managed\Cfix.Control\Cfix.Control.sln /t:rebuild /p:Configuration=Release
- msbuild managed\Cfix.Addin\Cfix.Addin.sln /t:rebuild /p:Configuration=Release
+ msbuild src\Cfix.Control\Cfix.Control.sln /t:rebuild /p:Configuration=Release
+ msbuild src\Cfix.Addin\Cfix.Addin.sln /t:rebuild /p:Configuration=Release
amd64chk: version
+ copy $(CFIX_TREE)\bin\chk\amd64\cfix.dll bin\chk\amd64
+ copy $(CFIX_TREE)\bin\chk\amd64\cfixkl.dll bin\chk\amd64
+ copy $(CFIX_TREE)\bin\chk\amd64\cdiag.dll bin\chk\amd64
+
cmd /C ddkbuild -WLHNETA64 checked . -cZ
amd64fre: version
+ copy $(CFIX_TREE)\bin\fre\amd64\cfix.dll bin\fre\amd64
+ copy $(CFIX_TREE)\bin\fre\amd64\cfixkl.dll bin\fre\amd64
+ copy $(CFIX_TREE)\bin\fre\amd64\cdiag.dll bin\fre\amd64
+
cmd /C ddkbuild -WLHNETA64 free . -cZ
chk: i386chk amd64chk
@@ -95,10 +111,6 @@ __cfixtests:
testi386chk:
echo i386 checked
- copy $(CFIX_TREE)\bin\chk\i386\cfix.dll bin\chk\i386
- copy $(CFIX_TREE)\bin\chk\i386\cfixkl.dll bin\chk\i386
- copy $(CFIX_TREE)\bin\chk\i386\cdiag.dll bin\chk\i386
-
cd bin\chk\i386
$(MAKE) -f ..\..\..\makefile.cfix CFIX_CMD=$(CFIX_TREE)\bin\chk\i386\cfix32.exe __cfixtests
cd ..\..\..
@@ -108,10 +120,6 @@ testi386chk:
testi386fre:
echo i386 free
- copy $(CFIX_TREE)\bin\fre\i386\cfix.dll bin\fre\i386
- copy $(CFIX_TREE)\bin\fre\i386\cfixkl.dll bin\fre\i386
- copy $(CFIX_TREE)\bin\fre\i386\cdiag.dll bin\fre\i386
-
cd bin\fre\i386
$(MAKE) -f ..\..\..\makefile.cfix CFIX_CMD=$(CFIX_TREE)\bin\fre\i386\cfix32.exe __cfixtests
cd ..\..\..
@@ -121,21 +129,13 @@ testi386fre:
testamd64chk:
echo amd64 checked
- copy $(CFIX_TREE)\bin\chk\amd64\cfix.dll bin\chk\amd64
- copy $(CFIX_TREE)\bin\chk\amd64\cfixkl.dll bin\chk\amd64
- copy $(CFIX_TREE)\bin\chk\amd64\cdiag.dll bin\chk\amd64
-
cd bin\chk\amd64
$(MAKE) -f ..\..\..\makefile.cfix CFIX_CMD=$(CFIX_TREE)\bin\chk\amd64\cfix64.exe __cfixtests
cd ..\..\..
testamd64fre:
echo amd64 free
- copy $(CFIX_TREE)\bin\fre\amd64\cfix.dll bin\fre\amd64
- copy $(CFIX_TREE)\bin\fre\amd64\cfixkl.dll bin\fre\amd64
- copy $(CFIX_TREE)\bin\fre\amd64\cdiag.dll bin\fre\amd64
-
cd bin\fre\amd64
$(MAKE) -f ..\..\..\makefile.cfix CFIX_CMD=$(CFIX_TREE)\bin\fre\amd64\cfix64.exe __cfixtests
cd ..\..\..
@@ -15,56 +15,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cfix.Control.TreeView", "..
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {052333CA-B105-48D5-8821-0802729438F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {052333CA-B105-48D5-8821-0802729438F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{052333CA-B105-48D5-8821-0802729438F4}.Debug|x86.ActiveCfg = Debug|x86
{052333CA-B105-48D5-8821-0802729438F4}.Debug|x86.Build.0 = Debug|x86
- {052333CA-B105-48D5-8821-0802729438F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {052333CA-B105-48D5-8821-0802729438F4}.Release|Any CPU.Build.0 = Release|Any CPU
{052333CA-B105-48D5-8821-0802729438F4}.Release|x86.ActiveCfg = Release|x86
{052333CA-B105-48D5-8821-0802729438F4}.Release|x86.Build.0 = Release|x86
- {C48FD013-1C86-4C95-B4BA-126C8749E008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C48FD013-1C86-4C95-B4BA-126C8749E008}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C48FD013-1C86-4C95-B4BA-126C8749E008}.Debug|x86.ActiveCfg = Debug|x86
{C48FD013-1C86-4C95-B4BA-126C8749E008}.Debug|x86.Build.0 = Debug|x86
- {C48FD013-1C86-4C95-B4BA-126C8749E008}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C48FD013-1C86-4C95-B4BA-126C8749E008}.Release|Any CPU.Build.0 = Release|Any CPU
{C48FD013-1C86-4C95-B4BA-126C8749E008}.Release|x86.ActiveCfg = Release|x86
{C48FD013-1C86-4C95-B4BA-126C8749E008}.Release|x86.Build.0 = Release|x86
- {FD67630D-9595-452C-8097-A1F34E321FCC}.Debug|Any CPU.ActiveCfg = Debug|x86
{FD67630D-9595-452C-8097-A1F34E321FCC}.Debug|x86.ActiveCfg = Debug|x86
{FD67630D-9595-452C-8097-A1F34E321FCC}.Debug|x86.Build.0 = Debug|x86
- {FD67630D-9595-452C-8097-A1F34E321FCC}.Release|Any CPU.ActiveCfg = Release|x86
{FD67630D-9595-452C-8097-A1F34E321FCC}.Release|x86.ActiveCfg = Release|x86
{FD67630D-9595-452C-8097-A1F34E321FCC}.Release|x86.Build.0 = Release|x86
- {136167B9-CDDB-42AB-8826-D299596B0CE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {136167B9-CDDB-42AB-8826-D299596B0CE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{136167B9-CDDB-42AB-8826-D299596B0CE7}.Debug|x86.ActiveCfg = Debug|x86
{136167B9-CDDB-42AB-8826-D299596B0CE7}.Debug|x86.Build.0 = Debug|x86
- {136167B9-CDDB-42AB-8826-D299596B0CE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {136167B9-CDDB-42AB-8826-D299596B0CE7}.Release|Any CPU.Build.0 = Release|Any CPU
{136167B9-CDDB-42AB-8826-D299596B0CE7}.Release|x86.ActiveCfg = Release|x86
{136167B9-CDDB-42AB-8826-D299596B0CE7}.Release|x86.Build.0 = Release|x86
- {43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Debug|x86.ActiveCfg = Debug|x86
{43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Debug|x86.Build.0 = Debug|x86
- {43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Release|Any CPU.Build.0 = Release|Any CPU
{43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Release|x86.ActiveCfg = Release|x86
{43932BBA-0D20-45F1-B716-F0C4BCAF36F9}.Release|x86.Build.0 = Release|x86
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x86.ActiveCfg = Debug|x86
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x86.Build.0 = Debug|x86
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x86.ActiveCfg = Release|x86
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x86.Build.0 = Release|x86
EndGlobalSection
Binary file not shown.
@@ -11,8 +11,8 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0863C80F-B68A-457E-9F08-F0C814438266}.Debug|Win32.ActiveCfg = Debug|Win32
- {0863C80F-B68A-457E-9F08-F0C814438266}.Debug|Win32.Build.0 = Debug|Win32
+ {0863C80F-B68A-457E-9F08-F0C814438266}.Debug|Win32.ActiveCfg = Release|Win32
+ {0863C80F-B68A-457E-9F08-F0C814438266}.Debug|Win32.Build.0 = Release|Win32
{0863C80F-B68A-457E-9F08-F0C814438266}.Debug|x64.ActiveCfg = Debug|x64
{0863C80F-B68A-457E-9F08-F0C814438266}.Debug|x64.Build.0 = Debug|x64
{0863C80F-B68A-457E-9F08-F0C814438266}.Release|Win32.ActiveCfg = Release|Win32
@@ -22,7 +22,7 @@ BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
MSC_WARNING_LEVEL=/W4 /Wp64
-INCLUDES=$(SDKBASE)\Include;..\..\..\include;$(SDK_INC_PATH)\..\mfc42;$(CFIX_TREE)\include
+INCLUDES=$(SDKBASE)\Include;..\..\..\..\include;$(SDK_INC_PATH)\..\mfc42;$(CFIX_TREE)\include
C_DEFINES=/D_UNICODE /DUNICODE
@@ -57,16 +57,16 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cdiag.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixutil.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixkl.lib \
- $(MAKEDIR)\..\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl_uuid.lib
+ $(MAKEDIR)\..\..\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl_uuid.lib
TARGETNAME=cfixctl
-TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
-PASS0_HEADERDIR=..\..\..\include
+PASS0_HEADERDIR=..\..\..\..\include
PASS0_SOURCEDIR=.
-PASS0_CLIENTDIR=..\..\..\include
-PASS0_SERVERDIR=..\..\..\include
+PASS0_CLIENTDIR=..\..\..\..\include
+PASS0_SERVERDIR=..\..\..\..\include
SOURCES=\
..\cfixctl.idl \
@@ -21,13 +21,13 @@
BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
TARGETNAME=cfixctl_uuid
-TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=LIBRARY
-PASS0_HEADERDIR=..\..\..\include
+PASS0_HEADERDIR=..\..\..\..\include
PASS0_SOURCEDIR=..
-PASS0_CLIENTDIR=..\..\..\include
-PASS0_SERVERDIR=..\..\..\include
+PASS0_CLIENTDIR=..\..\..\..\include
+PASS0_SERVERDIR=..\..\..\..\include
SOURCES=\
..\cfixctl.idl \
@@ -22,7 +22,7 @@ BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
MSC_WARNING_LEVEL=/W4 /WX /Wp64
-INCLUDES=..\..\include;$(SDK_INC_PATH)\..\mfc42
+INCLUDES=..\..\..\include;$(SDK_INC_PATH)\..\mfc42
!if "$(TARGET_DIRECTORY)"=="i386"
USER_C_FLAGS=/D_UNICODE /DUNICODE /analyze
@@ -49,7 +49,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\shlwapi.lib \
$(TARGETPATH)\$(TARGET_DIRECTORY)\cfixctl.lib \
$(TARGETPATH)\$(TARGET_DIRECTORY)\cfixctl_uuid.lib
-TARGETPATH=..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=PROGRAM
SOURCES=\
cfixhost.rc \
@@ -22,7 +22,7 @@ BSCMAKE_FLAGS=$(BSCMAKE_FLAGS) /n
MSC_WARNING_LEVEL=/W4 /Wp64
-INCLUDES=$(SDKBASE)\Include;..\..\include;$(CFIX_TREE)\include
+INCLUDES=$(SDKBASE)\Include;..\..\..\include;$(CFIX_TREE)\include
C_DEFINES=/D_UNICODE /DUNICODE /EHa
@@ -47,14 +47,14 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(SDK_LIB_PATH)\ole32.lib \
$(SDK_LIB_PATH)\oleaut32.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfix.lib \
- $(MAKEDIR)\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl.lib \
- $(MAKEDIR)\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl_uuid.lib
+ $(MAKEDIR)\..\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl.lib \
+ $(MAKEDIR)\..\..\..\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfixctl_uuid.lib
TARGETNAME=testctl
-TARGETPATH=..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
-PASS0_HEADERDIR=..\..\include
+PASS0_HEADERDIR=..\..\..\include
PASS0_SOURCEDIR=obj$(BUILD_ALT_DIR)\$(TARGET_DIRECTORY)
SOURCES=\
@@ -23,7 +23,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfix.lib
TARGETNAME=testlib10
-TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
SOURCES=\
@@ -23,7 +23,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfix.lib
TARGETNAME=testlib11
-TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
SOURCES=\
@@ -23,7 +23,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
$(CFIX_TREE)\bin\$(DDKBUILDENV)\$(TARGET_DIRECTORY)\cfix.lib
TARGETNAME=testslow
-TARGETPATH=..\..\..\bin\$(DDKBUILDENV)
+TARGETPATH=..\..\..\..\bin\$(DDKBUILDENV)
TARGETTYPE=DYNLINK
SOURCES=\

0 comments on commit 44c5de8

Please sign in to comment.