Permalink
Browse files

mk

  • Loading branch information...
1 parent 9abdef9 commit 62146eba928d1748748bb2cb267fb637542938ac @SuperV1234 committed Mar 24, 2013
Showing with 12 additions and 12 deletions.
  1. +2 −2 SSVOpenHexagon.mk
  2. +10 −10 SSVOpenHexagon.project
View
@@ -38,12 +38,12 @@ MakeDirCommand :=makedir
RcCmpOptions :=
RcCompilerName :=windres
LinkOptions :=
-IncludePath := $(IncludeSwitch). $(IncludeSwitch)./include/ $(IncludeSwitch)../SSVStart/include/ $(IncludeSwitch)../SSVUtils/include/ $(IncludeSwitch)../SSVUtilsJson/include/ $(IncludeSwitch)../SSVEntitySystem/include/ $(IncludeSwitch)../SSVLuaWrapper/include/ $(IncludeSwitch)../SSVMenuSystem/include/ $(IncludeSwitch)../SFML/include $(IncludeSwitch)../jsoncpp/include $(IncludeSwitch)C:/lua/include
+IncludePath := $(IncludeSwitch). $(IncludeSwitch)./include/ $(IncludeSwitch)../SSVStart/include/ $(IncludeSwitch)../SSVUtils/include/ $(IncludeSwitch)../SSVUtilsJson/include/ $(IncludeSwitch)../SSVEntitySystem/include/ $(IncludeSwitch)../SSVLuaWrapper/include/ $(IncludeSwitch)../SSVMenuSystem/include/ $(IncludeSwitch)../SFML/include $(IncludeSwitch)../jsoncpp/include $(IncludeSwitch)../lua/include
IncludePCH :=
RcIncludePath :=
Libs := $(LibrarySwitch)SSVUtils-s $(LibrarySwitch)SSVUtilsJson-s $(LibrarySwitch)SSVStart-s $(LibrarySwitch)SSVEntitySystem-s $(LibrarySwitch)SSVLuaWrapper-s $(LibrarySwitch)SSVMenuSystem-s $(LibrarySwitch)sfml-window $(LibrarySwitch)sfml-graphics $(LibrarySwitch)sfml-system $(LibrarySwitch)sfml-audio $(LibrarySwitch)sfml-network $(LibrarySwitch)lua51 $(LibrarySwitch)json_mingw_libmt
ArLibs := "SSVUtils-s" "SSVUtilsJson-s" "SSVStart-s" "SSVEntitySystem-s" "SSVLuaWrapper-s" "SSVMenuSystem-s" "sfml-window" "sfml-graphics" "sfml-system" "sfml-audio" "sfml-network" "lua51" "json_mingw_libmt"
-LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)../SSVUtils/lib/ $(LibraryPathSwitch)../SSVUtilsJson/lib/ $(LibraryPathSwitch)../SSVStart/lib/ $(LibraryPathSwitch)../SSVEntitySystem/lib/ $(LibraryPathSwitch)../SSVLuaWrapper/lib/ $(LibraryPathSwitch)../SSVMenuSystem/lib/ $(LibraryPathSwitch)../SFML/build2/lib/ $(LibraryPathSwitch)../lua $(LibraryPathSwitch)../jsoncpp/libs/mingw/
+LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)../SSVUtils/lib/ $(LibraryPathSwitch)../SSVUtilsJson/lib/ $(LibraryPathSwitch)../SSVStart/lib/ $(LibraryPathSwitch)../SSVEntitySystem/lib/ $(LibraryPathSwitch)../SSVLuaWrapper/lib/ $(LibraryPathSwitch)../SSVMenuSystem/lib/ $(LibraryPathSwitch)../SFML/build2/lib/ $(LibraryPathSwitch)../lua/ $(LibraryPathSwitch)../jsoncpp/libs/mingw/
##
## Common variables
View
@@ -8,13 +8,13 @@
<Reconciliation>
<Regexes/>
<Excludepaths>
- <Path>..\OHWorkspace\SSVOpenHexagon\cmake\</Path>
- <Path>..\OHWorkspace\SSVOpenHexagon\DocsMarkdown\</Path>
- <Path>..\OHWorkspace\SSVOpenHexagon\SSVEntitySystem\</Path>
- <Path>..\OHWorkspace\SSVOpenHexagon\SSVLuaWrapper\</Path>
- <Path>..\OHWorkspace\SSVOpenHexagon\SSVMenuSystem\</Path>
- <Path>..\OHWorkspace\SSVOpenHexagon\SSVStart\</Path>
<Path>..\OHWorkspace\SSVOpenHexagon\Unix\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\SSVStart\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\SSVMenuSystem\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\SSVLuaWrapper\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\SSVEntitySystem\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\DocsMarkdown\</Path>
+ <Path>..\OHWorkspace\SSVOpenHexagon\cmake\</Path>
</Excludepaths>
<Ignorefiles/>
<Extensions>
@@ -24,8 +24,6 @@
</Reconciliation>
<Description/>
<Dependencies/>
- <Dependencies Name="Debug"/>
- <Dependencies Name="Release"/>
<VirtualDirectory Name="src"/>
<VirtualDirectory Name="include">
<File Name="include/SSVOpenHexagon/Compatibility/Compatibility.h"/>
@@ -70,6 +68,8 @@
<File Name="src/SSVOpenHexagon/Utils/FPSWatcher.cpp"/>
<File Name="src/SSVOpenHexagon/Utils/Utils.cpp"/>
</VirtualDirectory>
+ <Dependencies Name="Debug"/>
+ <Dependencies Name="Release"/>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="">
@@ -151,7 +151,7 @@
<IncludePath Value="../SSVMenuSystem/include/"/>
<IncludePath Value="../SFML/include"/>
<IncludePath Value="../jsoncpp/include"/>
- <IncludePath Value="C:/lua/include"/>
+ <IncludePath Value="../lua/include"/>
</Compiler>
<Linker Options="" Required="yes">
<LibraryPath Value="../SSVUtils/lib/"/>
@@ -161,7 +161,7 @@
<LibraryPath Value="../SSVLuaWrapper/lib/"/>
<LibraryPath Value="../SSVMenuSystem/lib/"/>
<LibraryPath Value="../SFML/build2/lib/"/>
- <LibraryPath Value="../lua"/>
+ <LibraryPath Value="../lua/"/>
<LibraryPath Value="../jsoncpp/libs/mingw/"/>
<Library Value="SSVUtils-s"/>
<Library Value="SSVUtilsJson-s"/>

0 comments on commit 62146eb

Please sign in to comment.