Skip to content

Commit

Permalink
Correct compilation on Linux / Ubuntu.
Browse files Browse the repository at this point in the history
  • Loading branch information
unknownbrackets committed May 5, 2017
1 parent 98a143d commit 003de65
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -3,7 +3,7 @@ CXX = g++

CFLAGS = -W -Wall -Wextra -O2 -Wno-implicit-function-declaration
CXXFLAGS = -W -Wall -Wextra -std=c++11 -O2 -Izopfli/src -I7zip \
-Wno-unused-parameter
-Wno-unused-parameter -pthread

SRC_CXX_SRC = $(wildcard src/*.cpp)
SRC_CXX_OBJ = $(SRC_CXX_SRC:.cpp=.o)
Expand All @@ -24,7 +24,7 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
$(CC) -c $(CFLAGS) -o $@ $<

maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a
$(CXX) -lz -luv -llz4 -o $@ $(CXXFLAGS) $^
$(CXX) -o $@ $(CXXFLAGS) $^ -luv -llz4 -lz

7zip/7zip.a:
$(MAKE) -C 7zip 7zip.a
Expand Down
7 changes: 4 additions & 3 deletions cli/cli.cpp
@@ -1,8 +1,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <algorithm>
#include <vector>
#include <cstring>
#include <cstdio>
#include <cstdlib>
#include <string>
#include <vector>
#include "winargs.h"
#include "winglob.h"
#include "../src/compress.h"
Expand Down
1 change: 1 addition & 0 deletions src/input.cpp
@@ -1,3 +1,4 @@
#include <cstring>
#include "input.h"
#include "buffer_pool.h"
#include "cso.h"
Expand Down
1 change: 1 addition & 0 deletions src/output.cpp
@@ -1,3 +1,4 @@
#include <cstring>
#include "output.h"
#include "buffer_pool.h"
#include "compress.h"
Expand Down
1 change: 1 addition & 0 deletions src/sector.cpp
@@ -1,3 +1,4 @@
#include <cstring>
#include "sector.h"
#include "compress.h"
#include "cso.h"
Expand Down

0 comments on commit 003de65

Please sign in to comment.