Skip to content

Commit

Permalink
Release 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ADRFranklin committed Oct 29, 2019
1 parent 3e6eb79 commit cfe9ba6
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 15 deletions.
3 changes: 2 additions & 1 deletion Dockerfile.linux
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM dockcross/linux-x86:latest
COPY . /work
RUN chmod +x /work/build.sh
RUN cmake .
ENTRYPOINT ["make"]
ENTRYPOINT ["/work/build.sh"]
3 changes: 2 additions & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM dockcross/windows-static-x86:latest
COPY . /work
RUN chmod +x /work/build.sh
RUN cmake -DMXE=true .
ENTRYPOINT ["make"]
ENTRYPOINT ["/work/build.sh"]
22 changes: 12 additions & 10 deletions Taskfile.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
version: '2'
version: "2"

tasks:
build:
deps: [build:linux, build:windows]

build:linux:
cmds:
- rm -rf builds/SKY.so
- mkdir -p builds
- docker build -f Dockerfile.linux -t oscar-broman/sky:linux .
- docker run --volume=$(pwd)/builds:/work/builds oscar-broman/sky:linux
- rm -rf builds/SKY.so
- mkdir -p builds
- docker build -f Dockerfile.linux -t oscar-broman/sky:linux .
- docker run --volume=$(pwd)/builds:/work/builds oscar-broman/sky:linux

build:windows:
cmds:
- rm -rf builds/SKY.dll
- mkdir -p builds
- docker build -f Dockerfile.windows -t oscar-broman/sky:windows .
- docker run --volume=$(pwd)/builds:/work/builds oscar-broman/sky:windows
cmds:
- rm -rf builds/SKY.dll
- mkdir -p builds
- docker build -f Dockerfile.windows -t oscar-broman/sky:windows .
- docker run --volume=$(pwd)/builds:/work/builds oscar-broman/sky:windows
2 changes: 1 addition & 1 deletion lib/cmake-modules
2 changes: 1 addition & 1 deletion lib/subhook
17 changes: 16 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,19 @@ if(MXE)
endif()

set_property(TARGET SKY PROPERTY CXX_STANDARD 14)
set_property(TARGET SKY PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET SKY PROPERTY CXX_STANDARD_REQUIRED ON)

install(TARGETS SKY DESTINATION "./")

set(CPACK_PACKAGE_VERSION ${PLUGIN_VERSION})
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)

if(WIN32)
set(CPACK_GENERATOR ZIP)
set(CPACK_PACKAGE_FILE_NAME "release-windows")
else()
set(CPACK_GENERATOR TGZ)
set(CPACK_PACKAGE_FILE_NAME "release-linux")
endif()

include(CPack)
3 changes: 3 additions & 0 deletions src/Structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
*/

/* -------------------------------------------------------- */
#if defined MAX_OBJECTS
#undef MAX_OBJECTS
#endif

// Defines from SAMPGDK
#define MAX_PLAYER_NAME (24)
Expand Down

0 comments on commit cfe9ba6

Please sign in to comment.