-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed icc builds, updated test gcc builds
- Loading branch information
1 parent
90b0970
commit 93b29e8
Showing
51 changed files
with
260 additions
and
1,842 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,76 @@ | ||
| ################################################################################ | ||
| # Automatically-generated file. Do not edit! | ||
| ################################################################################ | ||
|
|
||
| -include ../makefile.init | ||
|
|
||
| RM := rm -rf | ||
|
|
||
| # All of the sources participating in the build are defined here | ||
| -include sources.mk | ||
| -include Tests/Source/subdir.mk | ||
| -include Tests/subdir.mk | ||
| -include PackingGeneration/Parallelism/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/PostProcessing/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/EnergyServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/DistanceServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/LubachevsckyStillinger/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/InitialGenerators/Source/subdir.mk | ||
| -include PackingGeneration/Generation/Model/Source/subdir.mk | ||
| -include PackingGeneration/Generation/Geometries/Source/subdir.mk | ||
| -include PackingGeneration/Generation/subdir.mk | ||
| -include PackingGeneration/Execution/Source/subdir.mk | ||
| -include PackingGeneration/Core/Source/subdir.mk | ||
| -include PackingGeneration/Core/Lattice/Source/subdir.mk | ||
| -include PackingGeneration/Core/Geometry/Source/subdir.mk | ||
| -include Externals/Boost/libs/smart_ptr/src/subdir.mk | ||
| -include subdir.mk | ||
| -include objects.mk | ||
|
|
||
| ifneq ($(MAKECMDGOALS),clean) | ||
| ifneq ($(strip $(C++_DEPS)),) | ||
| -include $(C++_DEPS) | ||
| endif | ||
| ifneq ($(strip $(C_DEPS)),) | ||
| -include $(C_DEPS) | ||
| endif | ||
| ifneq ($(strip $(CC_DEPS)),) | ||
| -include $(CC_DEPS) | ||
| endif | ||
| ifneq ($(strip $(CPP_DEPS)),) | ||
| -include $(CPP_DEPS) | ||
| endif | ||
| ifneq ($(strip $(CXX_DEPS)),) | ||
| -include $(CXX_DEPS) | ||
| endif | ||
| ifneq ($(strip $(C_UPPER_DEPS)),) | ||
| -include $(C_UPPER_DEPS) | ||
| endif | ||
| endif | ||
|
|
||
| -include ../makefile.defs | ||
|
|
||
| # Add inputs and outputs from these tool invocations to the build variables | ||
|
|
||
| # All Target | ||
| all: PackingGeneration.exe | ||
|
|
||
| # Tool invocations | ||
| PackingGeneration.exe: $(OBJS) $(USER_OBJS) | ||
| @echo 'Building target: $@' | ||
| @echo 'Invoking: Cygwin C++ Linker' | ||
| g++ -o "PackingGeneration.exe" $(OBJS) $(USER_OBJS) $(LIBS) | ||
| @echo 'Finished building target: $@' | ||
| @echo ' ' | ||
|
|
||
| # Other Targets | ||
| clean: | ||
| -$(RM) $(C++_DEPS)$(OBJS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) PackingGeneration.exe | ||
| -@echo ' ' | ||
|
|
||
| .PHONY: all clean dependents | ||
| .SECONDARY: | ||
|
|
||
| -include ../makefile.targets | ||
| ################################################################################ | ||
| # Automatically-generated file. Do not edit! | ||
| ################################################################################ | ||
|
|
||
| -include ../makefile.init | ||
|
|
||
| RM := rm -rf | ||
|
|
||
| # All of the sources participating in the build are defined here | ||
| -include sources.mk | ||
| -include Tests/Source/subdir.mk | ||
| -include Tests/subdir.mk | ||
| -include PackingGeneration/Parallelism/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/PostProcessing/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/EnergyServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingServices/DistanceServices/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/LubachevsckyStillinger/Source/subdir.mk | ||
| -include PackingGeneration/Generation/PackingGenerators/InitialGenerators/Source/subdir.mk | ||
| -include PackingGeneration/Generation/Model/Source/subdir.mk | ||
| -include PackingGeneration/Generation/Geometries/Source/subdir.mk | ||
| -include PackingGeneration/Generation/subdir.mk | ||
| -include PackingGeneration/Execution/Source/subdir.mk | ||
| -include PackingGeneration/Core/Source/subdir.mk | ||
| -include PackingGeneration/Core/Lattice/Source/subdir.mk | ||
| -include PackingGeneration/Core/Geometry/Source/subdir.mk | ||
| -include Externals/Boost/libs/smart_ptr/src/subdir.mk | ||
| -include subdir.mk | ||
| -include objects.mk | ||
|
|
||
| ifneq ($(MAKECMDGOALS),clean) | ||
| ifneq ($(strip $(CC_DEPS)),) | ||
| -include $(CC_DEPS) | ||
| endif | ||
| ifneq ($(strip $(C++_DEPS)),) | ||
| -include $(C++_DEPS) | ||
| endif | ||
| ifneq ($(strip $(C_UPPER_DEPS)),) | ||
| -include $(C_UPPER_DEPS) | ||
| endif | ||
| ifneq ($(strip $(CXX_DEPS)),) | ||
| -include $(CXX_DEPS) | ||
| endif | ||
| ifneq ($(strip $(CPP_DEPS)),) | ||
| -include $(CPP_DEPS) | ||
| endif | ||
| ifneq ($(strip $(C_DEPS)),) | ||
| -include $(C_DEPS) | ||
| endif | ||
| endif | ||
|
|
||
| -include ../makefile.defs | ||
|
|
||
| # Add inputs and outputs from these tool invocations to the build variables | ||
|
|
||
| # All Target | ||
| all: PackingGeneration.exe | ||
|
|
||
| # Tool invocations | ||
| PackingGeneration.exe: $(OBJS) $(USER_OBJS) | ||
| @echo 'Building target: $@' | ||
| @echo 'Invoking: Cygwin C++ Linker' | ||
| g++ -o "PackingGeneration.exe" $(OBJS) $(USER_OBJS) $(LIBS) | ||
| @echo 'Finished building target: $@' | ||
| @echo ' ' | ||
|
|
||
| # Other Targets | ||
| clean: | ||
| -$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(CPP_DEPS)$(C_DEPS) PackingGeneration.exe | ||
| -@echo ' ' | ||
|
|
||
| .PHONY: all clean dependents | ||
| .SECONDARY: | ||
|
|
||
| -include ../makefile.targets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| ################################################################################ | ||
| # Automatically-generated file. Do not edit! | ||
| ################################################################################ | ||
|
|
||
| USER_OBJS := | ||
|
|
||
| LIBS := | ||
|
|
||
| ################################################################################ | ||
| # Automatically-generated file. Do not edit! | ||
| ################################################################################ | ||
|
|
||
| USER_OBJS := | ||
|
|
||
| LIBS := | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 0 additions & 27 deletions
27
_ParallelIccDebug/Externals/Boost/libs/smart_ptr/src/subdir.mk
This file was deleted.
Oops, something went wrong.
24 changes: 0 additions & 24 deletions
24
_ParallelIccDebug/PackingGeneration/Core/Geometry/Source/subdir.mk
This file was deleted.
Oops, something went wrong.
36 changes: 0 additions & 36 deletions
36
_ParallelIccDebug/PackingGeneration/Core/Lattice/Source/subdir.mk
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.