diff options
| Commit | c724876f8a8ff9aadb3d8a929d4410514f5df93a (patch) | |
|---|---|---|
| Author | 2021-09-20 22:14:28 +0300 | |
| Committer | 2021-09-20 22:14:28 +0300 | |
| Files | bf98d09b02a91db4180d12a136a4aa17f7cf6b97 /gctest/solution | |
| IPL-c724876f8a8ff9aadb3d8a929d4410514f5df93a.tar IPL-c724876f8a8ff9aadb3d8a929d4410514f5df93a.tar.gz IPL-c724876f8a8ff9aadb3d8a929d4410514f5df93a.zip | ||
| Parent | 107e06f9403d0ad26a04a099b45c2d746ef08c6f (diff) | |
Regenerate project files
6 files changed, 80 insertions, 80 deletions
| -rw-r--r-- | gctest/solution/dummy_gc.make | 48 | ||||
| -rw-r--r-- | gctest/solution/dummy_gc.vcxproj | 16 | ||||
| -rw-r--r-- | gctest/solution/leak_gc.make | 48 | ||||
| -rw-r--r-- | gctest/solution/leak_gc.vcxproj | 16 | ||||
| -rw-r--r-- | gctest/solution/test_bench.make | 16 | ||||
| -rw-r--r-- | gctest/solution/test_bench.vcxproj | 16 |
diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make index fd8997d..e430d1c 100644 --- a/gctest/solution/dummy_gc.make +++ b/gctest/solution/dummy_gc.make @@ -43,9 +43,9 @@ endif MAKEFILE = dummy_gc.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/dummy_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/dummy_gc.exe + OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/dummy_gc + TARGETDIR = ../../JSImpl/build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,9 +75,9 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/dummy_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/dummy_gc.exe + OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/dummy_gc + TARGETDIR = ../../JSImpl/build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,9 +107,9 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/dummy_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/dummy_gc.exe + OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/dummy_gc + TARGETDIR = ../../JSImpl/build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,9 +139,9 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/dummy_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/dummy_gc.exe + OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/dummy_gc + TARGETDIR = ../../JSImpl/build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj index db98b09..5ca36a1 100644 --- a/gctest/solution/dummy_gc.vcxproj +++ b/gctest/solution/dummy_gc.vcxproj @@ -75,29 +75,29 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>
<TargetName>dummy_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>
<TargetName>dummy_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x32\Release\dummy_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\</IntDir>
<TargetName>dummy_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x64\Release\dummy_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\dummy_gc\</IntDir>
<TargetName>dummy_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>false</LinkIncremental>
diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make index c29f8ea..2cb1381 100644 --- a/gctest/solution/leak_gc.make +++ b/gctest/solution/leak_gc.make @@ -43,9 +43,9 @@ endif MAKEFILE = leak_gc.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/leak_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/leak_gc.exe + OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/leak_gc + TARGETDIR = ../../JSImpl/build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,9 +75,9 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/leak_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/leak_gc.exe + OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/leak_gc + TARGETDIR = ../../JSImpl/build/bin/Release + TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,9 +107,9 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/leak_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/leak_gc.exe + OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/leak_gc + TARGETDIR = ../../JSImpl/build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,9 +139,9 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/leak_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/leak_gc.exe + OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/leak_gc + TARGETDIR = ../../JSImpl/build/bin/Release + TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj index bf4ea47..cccba6f 100644 --- a/gctest/solution/leak_gc.vcxproj +++ b/gctest/solution/leak_gc.vcxproj @@ -75,29 +75,29 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x32\Debug\leak_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\</IntDir>
<TargetName>leak_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x64\Debug\leak_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\leak_gc\</IntDir>
<TargetName>leak_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x32\Release\leak_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\</IntDir>
<TargetName>leak_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x64\Release\leak_gc\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\leak_gc\</IntDir>
<TargetName>leak_gc</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>false</LinkIncremental>
diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make index 9229102..9a503a5 100644 --- a/gctest/solution/test_bench.make +++ b/gctest/solution/test_bench.make @@ -43,8 +43,8 @@ endif MAKEFILE = test_bench.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/test_bench - TARGETDIR = ../build/bin/Debug + OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/test_bench + TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -76,8 +76,8 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/test_bench - TARGETDIR = ../build/bin/Release + OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/test_bench + TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -109,8 +109,8 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/test_bench - TARGETDIR = ../build/bin/Debug + OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/test_bench + TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -142,8 +142,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/test_bench - TARGETDIR = ../build/bin/Release + OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/test_bench + TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj index 3c6a9b1..6ea8e11 100644 --- a/gctest/solution/test_bench.vcxproj +++ b/gctest/solution/test_bench.vcxproj @@ -75,26 +75,26 @@ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x32\Debug\test_bench\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\</IntDir>
<TargetName>test_bench</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\build\bin\Debug\</OutDir>
- <IntDir>..\build\obj\Debug\x64\Debug\test_bench\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\test_bench\</IntDir>
<TargetName>test_bench</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x32\Release\test_bench\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\test_bench\</IntDir>
<TargetName>test_bench</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\build\bin\Release\</OutDir>
- <IntDir>..\build\obj\Release\x64\Release\test_bench\</IntDir>
+ <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>
+ <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\test_bench\</IntDir>
<TargetName>test_bench</TargetName>
<TargetExt>.lib</TargetExt>
</PropertyGroup>
|
