Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jp #26

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Jp #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1464678
fixed a killing timer bug
Aug 2, 2018
3b865ce
progress of the challenges
Aug 16, 2018
a34aec7
silver challenge #2
Aug 16, 2018
cd609dd
remove build
Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ include(cmake/Sources.cmake)
include(cmake/Resources.cmake)

#SDL2
include(cmake/SDL.cmake)
#include(cmake/SDL.cmake)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't include changes in this file yet.


#GML
include(cmake/GLM.cmake)

#Cocoa
include(cmake/MacOS.cmake)
#include(cmake/MacOS.cmake)

#Set C++
include(cmake/CPP.cmake)
Expand All @@ -50,13 +50,13 @@ PrintLine()
HeaderMessage("Adding Sources To Project")
SOURCES_TO_COMPILE(${ProjectName})

PrintLine()
HeaderMessage("SDL2 Libraries Linkage Addition")
SDL_LINK(${ProjectName})
#PrintLine()
#HeaderMessage("SDL2 Libraries Linkage Addition")
#SDL_LINK(${ProjectName})

PrintLine()
HeaderMessage("Cocoa Frameworks Linkage Addition")
COCOA_LINK(${ProjectName})
#PrintLine()
#HeaderMessage("Cocoa Frameworks Linkage Addition")
#COCOA_LINK(${ProjectName})

PrintLine()
HeaderMessage("Standard Linkage Addition")
Expand Down
4 changes: 2 additions & 2 deletions cmake/Sources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ endfunction()


function(LINK_STANDARD_LIBRARIES PROJECT_NAME)
target_link_libraries(${ProjectName} "-liconv" "-lm")
endfunction()
target_link_libraries(${ProjectName} "-lSDL2" "-lSDL2_image" "-lm")
endfunction()
4 changes: 2 additions & 2 deletions src/Sprite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define __SHIP__

#include <set>
#include <SDL2_image/SDL_image.h>
#include <SDL2/SDL_image.h>

#include <ECS/Component/entityinformationcomponent.h>
#include <ECS/Component/texturecomponent.h>
Expand All @@ -27,4 +27,4 @@ namespace GTech{
}


#endif /* __SHIP__ */
#endif /* __SHIP__ */
Loading