diff options
| author | dec05eba <dec05eba@protonmail.com> | 2018-07-22 12:27:43 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:32 +0200 |
| commit | 531d05df58bcb20e051c6ebe77c6583322b84dcb (patch) | |
| tree | 7e3c8022e34de1201917fda2c69c1b5104af0231 | |
| parent | 9f8a0848351f35e80e9efb73427f27687daa9500 (diff) | |
Change packages.json location to gitlab
| -rw-r--r-- | .vscode/launch.json | 16 | ||||
| -rw-r--r-- | backend/ninja/Ninja.cpp | 5 | ||||
| -rw-r--r-- | src/Package.cpp | 2 |
3 files changed, 4 insertions, 19 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index e91a145..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Debug", - "type": "gdb", - "request": "launch", - "target": "./sibs-build/debug/sibs", - "cwd": "${workspaceRoot}", - "arguments": "build /home/dec05eba/git/sfml-ui-flat/depends/gen-sfml-ui" - } - ] -}
\ No newline at end of file diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index 227a179..871234c 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -478,17 +478,18 @@ namespace backend defines += " "; defines += getDefineFlag(config.getCompiler(), definePair.first, definePair.second); } - + +#if OS_TYPE == OS_TYPE_WINDOWS switch (SYSTEM_PLATFORM) { case PLATFORM_WIN64: defines += " /DWIN64 /D_WIN64"; + // fallthrough case PLATFORM_WIN32: defines += " /DWIN32 /D_WIN32"; break; } -#if OS_TYPE == OS_TYPE_WINDOWS switch(libraryType) { case LibraryType::EXECUTABLE: diff --git a/src/Package.cpp b/src/Package.cpp index 5969ac5..9ba26cd 100644 --- a/src/Package.cpp +++ b/src/Package.cpp @@ -123,7 +123,7 @@ namespace sibs Result<string> Package::getPackageUrl(const char *packageName, const char *packageVersion, const char *platform) { - Result<Document*> packageList = Package::getPackageList("https://raw.githubusercontent.com/DEC05EBA/sibs_packages/master/packages.json"); + Result<Document*> packageList = Package::getPackageList("https://gitlab.com/DEC05EBA/sibs_packages/raw/master/packages.json"); if(!packageList) return Result<string>::Err(packageList); |