Fixed Windows MinGW building
This commit is contained in:
+3
-2
@@ -11,6 +11,7 @@ RM := rm -rf
|
||||
-include src/window/subdir.mk
|
||||
-include src/voxels/subdir.mk
|
||||
-include src/physics/subdir.mk
|
||||
-include src/objects/subdir.mk
|
||||
-include src/loaders/subdir.mk
|
||||
-include src/lighting/subdir.mk
|
||||
-include src/graphics/subdir.mk
|
||||
@@ -58,14 +59,14 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART
|
||||
# All Target
|
||||
all: main-build
|
||||
|
||||
# Main-build Target
|
||||
# Main-build Target -std=c++0x
|
||||
main-build: VOXEL_ENGINE.exe
|
||||
|
||||
# Tool invocations
|
||||
VOXEL_ENGINE.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS)
|
||||
@echo 'Building target: $@'
|
||||
@echo 'Invoking: MinGW C++ Linker'
|
||||
g++ -o "VOXEL_ENGINE.exe" $(OBJS) $(USER_OBJS) $(LIBS) -static-libgcc -static-libstdc++
|
||||
g++ -lpthread -o "VOXEL_ENGINE.exe" $(OBJS) $(USER_OBJS) $(LIBS) -static-libgcc -static-libstdc++
|
||||
@echo 'Finished building target: $@'
|
||||
@echo ' '
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ src/graphics \
|
||||
src/lighting \
|
||||
src/loaders \
|
||||
src/physics \
|
||||
src/objects \
|
||||
src/voxels \
|
||||
src/objects \
|
||||
src/window \
|
||||
|
||||
@@ -6,21 +6,27 @@
|
||||
CPP_SRCS += \
|
||||
../src/voxels/Block.cpp \
|
||||
../src/voxels/Chunk.cpp \
|
||||
../src/voxels/Chunks.cpp \
|
||||
../src/voxels/Chunks.cpp \
|
||||
../src/voxels/ChunksController.cpp \
|
||||
../src/voxels/ChunksLoader.cpp \
|
||||
../src/voxels/WorldGenerator.cpp \
|
||||
../src/voxels/voxel.cpp
|
||||
|
||||
OBJS += \
|
||||
./src/voxels/Block.o \
|
||||
./src/voxels/Chunk.o \
|
||||
./src/voxels/Chunks.o \
|
||||
./src/voxels/Chunks.o \
|
||||
./src/voxels/ChunksController.o \
|
||||
./src/voxels/ChunksLoader.o \
|
||||
./src/voxels/WorldGenerator.o \
|
||||
./src/voxels/voxel.o
|
||||
|
||||
CPP_DEPS += \
|
||||
./src/voxels/Block.d \
|
||||
./src/voxels/Chunk.d \
|
||||
./src/voxels/Chunks.d \
|
||||
./src/voxels/Chunks.d \
|
||||
./src/voxels/ChunksController.d \
|
||||
./src/voxels/ChunksLoader.d \
|
||||
./src/voxels/WorldGenerator.d \
|
||||
./src/voxels/voxel.d
|
||||
|
||||
@@ -29,7 +35,7 @@ CPP_DEPS += \
|
||||
src/voxels/%.o: ../src/voxels/%.cpp src/voxels/subdir.mk
|
||||
@echo 'Building file: $<'
|
||||
@echo 'Invoking: GCC C++ Compiler'
|
||||
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<"
|
||||
g++ -D _WIN32_WINNT=0501 -pthread -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<"
|
||||
@echo 'Finished building: $<'
|
||||
@echo ' '
|
||||
|
||||
|
||||
Reference in New Issue
Block a user